diff --git a/packages/git-fetcher/package.json b/packages/git-fetcher/package.json index 66997c7094..5fedaa854d 100644 --- a/packages/git-fetcher/package.json +++ b/packages/git-fetcher/package.json @@ -9,7 +9,7 @@ ], "scripts": { "test": "npm run tsc && npm run lint && ts-node test --type-check", - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, diff --git a/packages/git-fetcher/test/index.ts b/packages/git-fetcher/test/index.ts index c1c44dcbcd..9e582bbec3 100644 --- a/packages/git-fetcher/test/index.ts +++ b/packages/git-fetcher/test/index.ts @@ -5,8 +5,8 @@ import tempy = require('tempy') test('fetch', async t => { const fetch = createFetcher().git const fetchResult = await fetch({ - repo: 'https://github.com/kevva/is-positive.git', commit: 'c9b30e71d704cd30fa71f2edd1ecc7dcc4985493', + repo: 'https://github.com/kevva/is-positive.git', }, tempy.directory()) t.ok(fetchResult.tempLocation) t.ok(fetchResult.filesIndex['package.json']) diff --git a/packages/git-resolver/package.json b/packages/git-resolver/package.json index 4731a45954..f0587e5184 100644 --- a/packages/git-resolver/package.json +++ b/packages/git-resolver/package.json @@ -11,12 +11,12 @@ "node": ">=8.15" }, "scripts": { - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "rimraf lib && tsc", "test": "npm run tsc && npm run lint && ts-node test --type-check && mos t", "md": "mos", "prepublishOnly": "npm run tsc", - "fix": "tslint -c tslint.json --project . --fix" + "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix" }, "repository": "https://github.com/pnpm/pnpm/blob/master/packages/git-resolver", "keywords": [ diff --git a/packages/git-resolver/test/index.ts b/packages/git-resolver/test/index.ts index e31c6ee50e..4466d7ee64 100644 --- a/packages/git-resolver/test/index.ts +++ b/packages/git-resolver/test/index.ts @@ -1,13 +1,14 @@ -import test = require('tape') +/// import createResolveFromGit from '@pnpm/git-resolver' -const git = require('graceful-git') -import path = require('path') +import git = require('graceful-git') import isWindows = require('is-windows') +import path = require('path') +import test = require('tape') const resolveFromGit = createResolveFromGit({}) test('resolveFromGit() with commit', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative#163360a8d3ae6bee9524541043197ff356f8ed99'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative#163360a8d3ae6bee9524541043197ff356f8ed99' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/163360a8d3ae6bee9524541043197ff356f8ed99', normalizedPref: 'github:zkochan/is-negative#163360a8d3ae6bee9524541043197ff356f8ed99', @@ -20,7 +21,7 @@ test('resolveFromGit() with commit', async (t) => { }) test('resolveFromGit() with no commit', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/1d7e288222b53a0cab90a331f1865220ec29560c', normalizedPref: 'github:zkochan/is-negative', @@ -33,7 +34,7 @@ test('resolveFromGit() with no commit', async (t) => { }) test('resolveFromGit() with branch', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative#canary'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative#canary' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/4c39fbc124cd4944ee51cb082ad49320fab58121', normalizedPref: 'github:zkochan/is-negative#canary', @@ -46,7 +47,7 @@ test('resolveFromGit() with branch', async (t) => { }) test('resolveFromGit() with tag', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative#2.0.1'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative#2.0.1' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/2fa0531ab04e300a24ef4fd7fb3a280eccb7ccc5', normalizedPref: 'github:zkochan/is-negative#2.0.1', @@ -59,7 +60,7 @@ test('resolveFromGit() with tag', async (t) => { }) test('resolveFromGit() with tag (v-prefixed tag)', async (t) => { - const resolveResult = await resolveFromGit({pref: 'andreineculau/npm-publish-git#v0.0.7'}) + const resolveResult = await resolveFromGit({ pref: 'andreineculau/npm-publish-git#v0.0.7' }) t.deepEqual(resolveResult, { id: 'github.com/andreineculau/npm-publish-git/a2f8d94562884e9529cb12c0818312ac87ab7f0b', normalizedPref: 'github:andreineculau/npm-publish-git#v0.0.7', @@ -72,7 +73,7 @@ test('resolveFromGit() with tag (v-prefixed tag)', async (t) => { }) test('resolveFromGit() with strict semver', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative#semver:1.0.0'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative#semver:1.0.0' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/163360a8d3ae6bee9524541043197ff356f8ed99', normalizedPref: 'github:zkochan/is-negative#semver:1.0.0', @@ -85,7 +86,7 @@ test('resolveFromGit() with strict semver', async (t) => { }) test('resolveFromGit() with strict semver (v-prefixed tag)', async (t) => { - const resolveResult = await resolveFromGit({pref: 'andreineculau/npm-publish-git#semver:v0.0.7'}) + const resolveResult = await resolveFromGit({ pref: 'andreineculau/npm-publish-git#semver:v0.0.7' }) t.deepEqual(resolveResult, { id: 'github.com/andreineculau/npm-publish-git/a2f8d94562884e9529cb12c0818312ac87ab7f0b', normalizedPref: 'github:andreineculau/npm-publish-git#semver:v0.0.7', @@ -98,7 +99,7 @@ test('resolveFromGit() with strict semver (v-prefixed tag)', async (t) => { }) test('resolveFromGit() with range semver', async (t) => { - const resolveResult = await resolveFromGit({pref: 'zkochan/is-negative#semver:^1.0.0'}) + const resolveResult = await resolveFromGit({ pref: 'zkochan/is-negative#semver:^1.0.0' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/9a89df745b2ec20ae7445d3d9853ceaeef5b0b72', normalizedPref: 'github:zkochan/is-negative#semver:^1.0.0', @@ -111,7 +112,7 @@ test('resolveFromGit() with range semver', async (t) => { }) test('resolveFromGit() with range semver (v-prefixed tag)', async (t) => { - const resolveResult = await resolveFromGit({pref: 'andreineculau/npm-publish-git#semver:<=v0.0.7'}) + const resolveResult = await resolveFromGit({ pref: 'andreineculau/npm-publish-git#semver:<=v0.0.7' }) t.deepEqual(resolveResult, { id: 'github.com/andreineculau/npm-publish-git/a2f8d94562884e9529cb12c0818312ac87ab7f0b', normalizedPref: 'github:andreineculau/npm-publish-git#semver:<=v0.0.7', @@ -125,7 +126,7 @@ test('resolveFromGit() with range semver (v-prefixed tag)', async (t) => { test('resolveFromGit() fails when ref not found', async (t) => { try { - const r = await resolveFromGit({pref: 'zkochan/is-negative#bad-ref'}) + const r = await resolveFromGit({ pref: 'zkochan/is-negative#bad-ref' }) t.fail() } catch (err) { t.equal(err.message, 'Could not resolve bad-ref to a commit of git://github.com/zkochan/is-negative.git.', 'throws the expected error message') @@ -135,7 +136,7 @@ test('resolveFromGit() fails when ref not found', async (t) => { test('resolveFromGit() fails when semver ref not found', async (t) => { try { - const r = await resolveFromGit({pref: 'zkochan/is-negative#semver:^100.0.0'}) + const r = await resolveFromGit({ pref: 'zkochan/is-negative#semver:^100.0.0' }) t.fail() } catch (err) { t.equal(err.message, 'Could not resolve ^100.0.0 to a commit of git://github.com/zkochan/is-negative.git. Available versions are: 1.0.0, 1.0.1, 2.0.0, 2.0.1, 2.0.2, 2.1.0', 'throws the expected error message') @@ -149,8 +150,8 @@ test('resolveFromGit() with commit from non-github repo', async (t) => { t.end() return } - const localPath = process.cwd(); - const resolveResult = await resolveFromGit({pref: `git+file://${localPath}#988c61e11dc8d9ca0b5580cb15291951812549dc`}) + const localPath = process.cwd() + const resolveResult = await resolveFromGit({ pref: `git+file://${localPath}#988c61e11dc8d9ca0b5580cb15291951812549dc` }) t.deepEqual(resolveResult, { id: `${localPath}/988c61e11dc8d9ca0b5580cb15291951812549dc`, normalizedPref: `git+file://${localPath}#988c61e11dc8d9ca0b5580cb15291951812549dc`, @@ -167,7 +168,7 @@ test('resolveFromGit() with commit from non-github repo', async (t) => { // TODO: make it pass on CI servers test.skip('resolveFromGit() with commit from non-github repo with no commit', async (t) => { const localPath = path.resolve('..', '..') - const result = await git(['rev-parse', 'origin/master'], { retries: 0 }); + const result = await git(['rev-parse', 'origin/master'], { retries: 0 }) const hash = result.stdout.trim() const resolveResult = await resolveFromGit({ pref: `git+file://${localPath}` }) t.deepEqual(resolveResult, { @@ -189,7 +190,7 @@ test('resolveFromGit() bitbucket with commit', async (t) => { t.end() return } - const resolveResult = await resolveFromGit({pref: 'bitbucket:pnpmjs/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc'}) + const resolveResult = await resolveFromGit({ pref: 'bitbucket:pnpmjs/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc' }) t.deepEqual(resolveResult, { id: 'bitbucket.org/pnpmjs/git-resolver/988c61e11dc8d9ca0b5580cb15291951812549dc', normalizedPref: 'bitbucket:pnpmjs/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc', @@ -202,8 +203,8 @@ test('resolveFromGit() bitbucket with commit', async (t) => { }) test('resolveFromGit() bitbucket with no commit', async (t) => { - const resolveResult = await resolveFromGit({pref: 'bitbucket:pnpmjs/git-resolver'}) - const result = await git(['ls-remote', '--refs', 'https://bitbucket.org/pnpmjs/git-resolver.git', 'master'], {retries: 0}); + const resolveResult = await resolveFromGit({ pref: 'bitbucket:pnpmjs/git-resolver' }) + const result = await git(['ls-remote', '--refs', 'https://bitbucket.org/pnpmjs/git-resolver.git', 'master'], { retries: 0 }) const hash = result.stdout.trim().split('\t')[0] t.deepEqual(resolveResult, { id: `bitbucket.org/pnpmjs/git-resolver/${hash}`, @@ -217,8 +218,8 @@ test('resolveFromGit() bitbucket with no commit', async (t) => { }) test('resolveFromGit() bitbucket with branch', async (t) => { - const resolveResult = await resolveFromGit({pref: 'bitbucket:pnpmjs/git-resolver#master'}) - const result = await git(['ls-remote', '--refs', 'https://bitbucket.org/pnpmjs/git-resolver.git', 'master'], {retries: 0}); + const resolveResult = await resolveFromGit({ pref: 'bitbucket:pnpmjs/git-resolver#master' }) + const result = await git(['ls-remote', '--refs', 'https://bitbucket.org/pnpmjs/git-resolver.git', 'master'], { retries: 0 }) const hash = result.stdout.trim().split('\t')[0] t.deepEqual(resolveResult, { id: `bitbucket.org/pnpmjs/git-resolver/${hash}`, @@ -232,7 +233,7 @@ test('resolveFromGit() bitbucket with branch', async (t) => { }) test('resolveFromGit() bitbucket with tag', async (t) => { - const resolveResult = await resolveFromGit({pref: 'bitbucket:pnpmjs/git-resolver#0.3.4'}) + const resolveResult = await resolveFromGit({ pref: 'bitbucket:pnpmjs/git-resolver#0.3.4' }) t.deepEqual(resolveResult, { id: 'bitbucket.org/pnpmjs/git-resolver/87cf6a67064d2ce56e8cd20624769a5512b83ff9', normalizedPref: 'bitbucket:pnpmjs/git-resolver#0.3.4', @@ -245,7 +246,7 @@ test('resolveFromGit() bitbucket with tag', async (t) => { }) test('resolveFromGit() gitlab with commit', async (t) => { - const resolveResult = await resolveFromGit({pref: 'gitlab:pnpm/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc'}) + const resolveResult = await resolveFromGit({ pref: 'gitlab:pnpm/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc' }) t.deepEqual(resolveResult, { id: 'gitlab.com/pnpm/git-resolver/988c61e11dc8d9ca0b5580cb15291951812549dc', normalizedPref: 'gitlab:pnpm/git-resolver#988c61e11dc8d9ca0b5580cb15291951812549dc', @@ -258,8 +259,8 @@ test('resolveFromGit() gitlab with commit', async (t) => { }) test('resolveFromGit() gitlab with no commit', async (t) => { - const resolveResult = await resolveFromGit({pref: 'gitlab:pnpm/git-resolver'}) - const result = await git(['ls-remote', '--refs', 'https://gitlab.com/pnpm/git-resolver.git', 'master'], {retries: 0}); + const resolveResult = await resolveFromGit({ pref: 'gitlab:pnpm/git-resolver' }) + const result = await git(['ls-remote', '--refs', 'https://gitlab.com/pnpm/git-resolver.git', 'master'], { retries: 0 }) const hash = result.stdout.trim().split('\t')[0] t.deepEqual(resolveResult, { id: `gitlab.com/pnpm/git-resolver/${hash}`, @@ -273,8 +274,8 @@ test('resolveFromGit() gitlab with no commit', async (t) => { }) test('resolveFromGit() gitlab with branch', async (t) => { - const resolveResult = await resolveFromGit({pref: 'gitlab:pnpm/git-resolver#master'}) - const result = await git(['ls-remote', '--refs', 'https://gitlab.com/pnpm/git-resolver.git', 'master'], {retries: 0}); + const resolveResult = await resolveFromGit({ pref: 'gitlab:pnpm/git-resolver#master' }) + const result = await git(['ls-remote', '--refs', 'https://gitlab.com/pnpm/git-resolver.git', 'master'], { retries: 0 }) const hash = result.stdout.trim().split('\t')[0] t.deepEqual(resolveResult, { id: `gitlab.com/pnpm/git-resolver/${hash}`, @@ -288,7 +289,7 @@ test('resolveFromGit() gitlab with branch', async (t) => { }) test('resolveFromGit() gitlab with tag', async (t) => { - const resolveResult = await resolveFromGit({pref: 'gitlab:pnpm/git-resolver#0.3.4'}) + const resolveResult = await resolveFromGit({ pref: 'gitlab:pnpm/git-resolver#0.3.4' }) t.deepEqual(resolveResult, { id: 'gitlab.com/pnpm/git-resolver/87cf6a67064d2ce56e8cd20624769a5512b83ff9', normalizedPref: 'gitlab:pnpm/git-resolver#0.3.4', @@ -311,10 +312,10 @@ test('resolveFromGit() normalizes full url', async (t) => { resolvedVia: 'git-repository', }) t.end() -}); +}) test('resolveFromGit() normalizes full url (alternative form)', async (t) => { - const resolveResult = await resolveFromGit({pref: 'git+ssh://git@github.com/zkochan/is-negative.git#2.0.1'}) + const resolveResult = await resolveFromGit({ pref: 'git+ssh://git@github.com/zkochan/is-negative.git#2.0.1' }) t.deepEqual(resolveResult, { id: 'github.com/zkochan/is-negative/2fa0531ab04e300a24ef4fd7fb3a280eccb7ccc5', normalizedPref: 'github:zkochan/is-negative#2.0.1', @@ -324,7 +325,7 @@ test('resolveFromGit() normalizes full url (alternative form)', async (t) => { resolvedVia: 'git-repository', }) t.end() -}); +}) test('resolveFromGit() normalizes full url (alternative form 2)', async (t) => { const resolveResult = await resolveFromGit({ pref: 'https://github.com/zkochan/is-negative.git#2.0.1' }) @@ -337,7 +338,7 @@ test('resolveFromGit() normalizes full url (alternative form 2)', async (t) => { resolvedVia: 'git-repository', }) t.end() -}); +}) // This test relies on implementation detail. // current implementation does not try git ls-remote --refs on pref with full commit hash, this fake repo url will pass. @@ -354,4 +355,4 @@ test('resolveFromGit() private repo with commit hash', async (t) => { resolvedVia: 'git-repository', }) t.end() -}); +}) diff --git a/packages/lifecycle/package.json b/packages/lifecycle/package.json index 18a334e2eb..2d59475ca2 100644 --- a/packages/lifecycle/package.json +++ b/packages/lifecycle/package.json @@ -11,12 +11,12 @@ "node": ">=8.15" }, "scripts": { - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "rimraf lib && tsc", "test": "npm run lint && npm run tsc && ts-node test --type-check && mos t", "md": "mos", "prepublishOnly": "npm run tsc", - "fix": "tslint -c tslint.json --project . --fix" + "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix" }, "repository": "https://github.com/pnpm/pnpm/blob/master/packages/lifecycle", "keywords": [ diff --git a/packages/lifecycle/test/index.ts b/packages/lifecycle/test/index.ts index 2547da5746..972cfb38d8 100644 --- a/packages/lifecycle/test/index.ts +++ b/packages/lifecycle/test/index.ts @@ -1,8 +1,8 @@ -import test = require('tape') -import runLifecycleHook, {runPostinstallHooks} from '@pnpm/lifecycle' +import runLifecycleHook, { runPostinstallHooks } from '@pnpm/lifecycle' +import loadJsonFile = require('load-json-file') import path = require('path') import rimraf = require('rimraf') -import loadJsonFile = require('load-json-file') +import test = require('tape') const fixtures = path.join(__dirname, 'fixtures') const rootNodeModulesDir = path.join(__dirname, '..', 'node_modules') diff --git a/packages/local-resolver/package.json b/packages/local-resolver/package.json index 6490d31969..70aaaa7c2e 100644 --- a/packages/local-resolver/package.json +++ b/packages/local-resolver/package.json @@ -11,12 +11,12 @@ "node": ">=8.15" }, "scripts": { - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "tsc", "test": "npm run tsc && npm run lint && ts-node test --ts-node", "md": "mos", "prepublishOnly": "npm run tsc", - "fix": "tslint -c tslint.json --project . --fix" + "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix" }, "repository": "https://github.com/pnpm/pnpm/blob/master/packages/local-resolver", "keywords": [ diff --git a/packages/local-resolver/test/index.ts b/packages/local-resolver/test/index.ts index da12647e3a..c5fd6a89d7 100644 --- a/packages/local-resolver/test/index.ts +++ b/packages/local-resolver/test/index.ts @@ -1,9 +1,9 @@ +import resolveFromLocal from '@pnpm/local-resolver' import path = require('path') import test = require('tape') -import resolveFromLocal from '@pnpm/local-resolver' test('resolve directory', async t => { - const resolveResult = await resolveFromLocal({pref: '..'}, {prefix: __dirname}) + const resolveResult = await resolveFromLocal({ pref: '..' }, { prefix: __dirname }) t.equal(resolveResult!.id, 'link:..') t.equal(resolveResult!.normalizedPref, 'link:..') t.equal(resolveResult!['package']!.name, '@pnpm/local-resolver') @@ -13,7 +13,7 @@ test('resolve directory', async t => { }) test('resolve directory specified using the file: protocol', async t => { - const resolveResult = await resolveFromLocal({pref: 'file:..'}, {prefix: __dirname}) + const resolveResult = await resolveFromLocal({ pref: 'file:..' }, { prefix: __dirname }) t.equal(resolveResult!.id, 'link:..') t.equal(resolveResult!.normalizedPref, 'link:..') t.equal(resolveResult!['package']!.name, '@pnpm/local-resolver') @@ -23,7 +23,7 @@ test('resolve directory specified using the file: protocol', async t => { }) test('resolve directoty specified using the link: protocol', async t => { - const resolveResult = await resolveFromLocal({pref: 'link:..'}, {prefix: __dirname}) + const resolveResult = await resolveFromLocal({ pref: 'link:..' }, { prefix: __dirname }) t.equal(resolveResult!.id, 'link:..') t.equal(resolveResult!.normalizedPref, 'link:..') t.equal(resolveResult!['package']!.name, '@pnpm/local-resolver') @@ -33,8 +33,8 @@ test('resolve directoty specified using the link: protocol', async t => { }) test('resolve file', async t => { - const wantedDependency = {pref: './pnpm-local-resolver-0.1.1.tgz'} - const resolveResult = await resolveFromLocal(wantedDependency, {prefix: __dirname}) + const wantedDependency = { pref: './pnpm-local-resolver-0.1.1.tgz' } + const resolveResult = await resolveFromLocal(wantedDependency, { prefix: __dirname }) t.deepEqual(resolveResult, { id: 'file:pnpm-local-resolver-0.1.1.tgz', @@ -50,10 +50,10 @@ test('resolve file', async t => { }) test("resolve file when lockfile directory differs from the package's dir", async t => { - const wantedDependency = {pref: './pnpm-local-resolver-0.1.1.tgz'} + const wantedDependency = { pref: './pnpm-local-resolver-0.1.1.tgz' } const resolveResult = await resolveFromLocal(wantedDependency, { - prefix: __dirname, lockfileDirectory: path.join(__dirname, '..'), + prefix: __dirname, }) t.deepEqual(resolveResult, { @@ -70,8 +70,8 @@ test("resolve file when lockfile directory differs from the package's dir", asyn }) test('resolve tarball specified with file: protocol', async t => { - const wantedDependency = {pref: 'file:./pnpm-local-resolver-0.1.1.tgz'} - const resolveResult = await resolveFromLocal(wantedDependency, {prefix: __dirname}) + const wantedDependency = { pref: 'file:./pnpm-local-resolver-0.1.1.tgz' } + const resolveResult = await resolveFromLocal(wantedDependency, { prefix: __dirname }) t.deepEqual(resolveResult, { id: 'file:pnpm-local-resolver-0.1.1.tgz', @@ -86,10 +86,10 @@ test('resolve tarball specified with file: protocol', async t => { t.end() }) -test("fail when resolving tarball specified with the link: protocol", async t => { +test('fail when resolving tarball specified with the link: protocol', async t => { try { - const wantedDependency = {pref: 'link:./pnpm-local-resolver-0.1.1.tgz'} - const resolveResult = await resolveFromLocal(wantedDependency, {prefix: __dirname}) + const wantedDependency = { pref: 'link:./pnpm-local-resolver-0.1.1.tgz' } + const resolveResult = await resolveFromLocal(wantedDependency, { prefix: __dirname }) t.fail() } catch (err) { t.ok(err) @@ -98,10 +98,10 @@ test("fail when resolving tarball specified with the link: protocol", async t => } }) -test("fail when resolving from not existing directory", async t => { +test('fail when resolving from not existing directory', async t => { try { - const wantedDependency = {pref: 'link:./dir-does-not-exist'} - const resolveResult = await resolveFromLocal(wantedDependency, {prefix: __dirname}) + const wantedDependency = { pref: 'link:./dir-does-not-exist' } + const resolveResult = await resolveFromLocal(wantedDependency, { prefix: __dirname }) t.fail() } catch (err) { t.ok(err) @@ -112,7 +112,7 @@ test("fail when resolving from not existing directory", async t => { test('throw error when the path: protocol is used', async t => { try { - await resolveFromLocal({pref: 'path:..'}, {prefix: __dirname}) + await resolveFromLocal({ pref: 'path:..' }, { prefix: __dirname }) t.fail() } catch (err) { t.ok(err) diff --git a/packages/modules-cleaner/package.json b/packages/modules-cleaner/package.json index 65e70554f0..b823f8204a 100644 --- a/packages/modules-cleaner/package.json +++ b/packages/modules-cleaner/package.json @@ -25,7 +25,7 @@ "scripts": { "start": "npm run tsc -- --watch", "test": "npm run tsc && npm run lint", - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, diff --git a/packages/package-is-installable/package.json b/packages/package-is-installable/package.json index b7725060e2..81b5ea496a 100644 --- a/packages/package-is-installable/package.json +++ b/packages/package-is-installable/package.json @@ -25,7 +25,7 @@ "scripts": { "start": "npm run tsc -- --watch", "test": "npm run tsc && npm run lint && ts-node test", - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, diff --git a/packages/tarball-resolver/package.json b/packages/tarball-resolver/package.json index 6cd5e9defb..513c442a17 100644 --- a/packages/tarball-resolver/package.json +++ b/packages/tarball-resolver/package.json @@ -11,7 +11,8 @@ "node": ">=8" }, "scripts": { - "lint": "tslint -c tslint.json --project .", + "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", + "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix", "tsc": "rimraf lib && tsc", "test": "npm run tsc && npm run lint && ts-node test --type-check && mos t", "md": "mos", diff --git a/packages/tarball-resolver/test/index.ts b/packages/tarball-resolver/test/index.ts index fd3de2426c..5b121acfe3 100644 --- a/packages/tarball-resolver/test/index.ts +++ b/packages/tarball-resolver/test/index.ts @@ -1,8 +1,8 @@ -import test = require('tape') import resolveFromTarball from '@pnpm/tarball-resolver' +import test = require('tape') test('tarball from npm registry', async t => { - const resolutionResult = await resolveFromTarball({pref: 'http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz'}) + const resolutionResult = await resolveFromTarball({ pref: 'http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz' }) t.deepEqual(resolutionResult, { id: 'registry.npmjs.org/is-array/-/is-array-1.0.1', @@ -17,7 +17,7 @@ test('tarball from npm registry', async t => { }) test('tarball not from npm registry', async t => { - const resolutionResult = await resolveFromTarball({pref: 'https://github.com/hegemonic/taffydb/tarball/master'}) + const resolutionResult = await resolveFromTarball({ pref: 'https://github.com/hegemonic/taffydb/tarball/master' }) t.deepEqual(resolutionResult, { id: 'github.com/hegemonic/taffydb/tarball/master', @@ -32,7 +32,7 @@ test('tarball not from npm registry', async t => { }) test('tarballs from GitHub (is-negative)', async t => { - const resolutionResult = await resolveFromTarball({pref: 'https://github.com/kevva/is-negative/archive/1d7e288222b53a0cab90a331f1865220ec29560c.tar.gz'}) + const resolutionResult = await resolveFromTarball({ pref: 'https://github.com/kevva/is-negative/archive/1d7e288222b53a0cab90a331f1865220ec29560c.tar.gz' }) t.deepEqual(resolutionResult, { id: 'github.com/kevva/is-negative/archive/1d7e288222b53a0cab90a331f1865220ec29560c.tar.gz',