From d575cf6f5d75cafb4e073063081fcbfa7f7a6149 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 13 May 2018 01:16:56 +0300 Subject: [PATCH] fix: don't depend on supi --- package.json | 2 +- shrinkwrap.yaml | 348 ++++++++-------------------------- src/index.ts | 18 +- src/runDependenciesScripts.ts | 2 +- test/index.ts | 13 +- test/utils/testDefaults.ts | 1 - 6 files changed, 92 insertions(+), 292 deletions(-) diff --git a/package.json b/package.json index 9a6eb4f0ba..f085a3e5a0 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ "@pnpm/package-requester": "^0.9.0", "@pnpm/pkgid-to-filename": "^1.0.0", "@pnpm/types": "^1.7.0", + "@pnpm/utils": "^0.1.0", "@types/ramda": "^0.25.19", "dependency-path": "^1.2.1", "graph-sequencer": "^2.0.0", @@ -103,7 +104,6 @@ "pnpm-shrinkwrap": "^6.4.0", "ramda": "^0.25.0", "read-package-json": "^2.0.13", - "supi": "^0.18.0", "symlink-dir": "^1.1.2", "util.promisify": "^1.0.0" } diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 4e50efbef9..9451f21597 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -6,6 +6,7 @@ dependencies: '@pnpm/package-requester': 0.9.0 '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/types': 1.7.0 + '@pnpm/utils': 0.1.0 '@types/ramda': 0.25.26 dependency-path: 1.2.1 graph-sequencer: 2.0.0 @@ -15,7 +16,6 @@ dependencies: pnpm-shrinkwrap: 6.4.0 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.18.0 symlink-dir: 1.1.2 util.promisify: 1.0.0 devDependencies: @@ -308,7 +308,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.14 + '@types/node': 9.6.15 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -345,33 +345,6 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-LJBbkzlDj6RZF3jZzSIB3jle7h/DVjMHKft32gbMlH6hH4XvqQEfV5cV2pj0nb4TEoShzA6ehBkbEAff3Wp87g== - /@pnpm/headless/0.2.9: - dependencies: - '@pnpm/lifecycle': 2.2.0 - '@pnpm/link-bins': 1.0.2 - '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-requester': 0.8.8 - '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.26 - dependency-path: 1.2.1 - graph-sequencer: 2.0.0 - p-limit: 1.2.0 - package-store: 0.18.1 - path-exists: 3.0.0 - pnpm-shrinkwrap: 6.4.0 - ramda: 0.25.0 - read-package-json: 2.0.13 - supi: 0.17.4 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - dev: false - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-seziRwFYiqDVO8WYSgoeYvTrwAB7AIRt6/x7+jbq3/BSn7AbsUsslE8uTwLeBoYva0wJ31moEee829rlhDYZCA== /@pnpm/lifecycle/2.2.0: dependencies: '@pnpm/types': 1.7.0 @@ -490,7 +463,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.14 + '@types/node': 9.6.15 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 @@ -502,7 +475,7 @@ packages: read-package-json: 2.0.13 rename-overwrite: 1.0.2 rimraf-then: 1.0.1 - symlink-dir: 1.1.2 + symlink-dir: 1.1.3 util.promisify: 1.0.0 write-json-file: 2.3.0 dev: false @@ -620,6 +593,29 @@ packages: /@pnpm/types/1.7.0: resolution: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== + /@pnpm/utils/0.1.0: + dependencies: + '@pnpm/package-bins': 1.0.0 + '@pnpm/types': 1.7.0 + '@types/mz': 0.0.32 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 + dependency-path: 1.2.1 + fs-vacuum: 1.2.10 + mz: 2.7.0 + package-store: 0.18.1 + pnpm-shrinkwrap: 6.4.0 + ramda: 0.25.0 + read-package-json: 2.0.13 + rimraf-then: 1.0.1 + util.promisify: 1.0.0 + dev: false + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-tG+WI5POPLUvcyc8unHceI3F05uvM/GKXw4nmmykx7dY1/vRXtDAyzto6+NClbLGCA5rHVaydSO3C3PcyHrQnw== /@sindresorhus/is/0.7.0: dev: true engines: @@ -633,16 +629,6 @@ packages: resolution: integrity: sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg== tarball: 'http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz' - /@types/byline/4.2.31: - dependencies: - '@types/node': 10.0.6 - dev: false - resolution: - integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= - /@types/common-tags/1.4.0: - dev: false - resolution: - integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/events/1.2.0: dev: true resolution: @@ -690,33 +676,26 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mz/0.0.32: dependencies: - '@types/node': 10.0.6 + '@types/node': 10.0.8 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== /@types/node/10.0.6: resolution: integrity: sha512-2whhQUfDHRBiZ3L54Ulyl1X+fZWbWabxPYRDAsibgOAtE6adwusD15Xv0Bw/D7cPah35Z/wKTdW3iAKsevw1uw== + /@types/node/10.0.8: + resolution: + integrity: sha512-MFFKFv2X4iZy/NFl1m1E8uwE1CR96SGwJjgHma09PLtqOWoj3nqeJHMG+P/EuJGVLvC2I6MdQRQsr4TcRduIow== /@types/node/9.6.14: resolution: integrity: sha512-a0mGovBom+nXeDQkgS13AgHGpN+DLR+qTuRWZA7y9FTEiuTbDlXUwhz4+yShOobZGebmjBcl+tTEirTwBlA2LA== - /@types/nopt/3.0.29: + /@types/node/9.6.15: dev: false resolution: - integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= - /@types/npm/2.0.29: - dependencies: - '@types/node': 10.0.6 - dev: false - resolution: - integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== + integrity: sha512-16zIiQkIZBc1ZpfrOZZZ/6LKDixPiAIZq5q1YE1stxG4Ic1VmQlkNNWGBydqBFcX8eS+m/Dd4z5HzDa+q0b2Xg== /@types/p-queue/2.3.1: dev: false resolution: integrity: sha512-JyO7uMAtkcMMULmsTQ4t/lCC8nxirTtweGG1xAFNNIAoC1RemmeIxq8PiKghuEy99XdbS6Lwx4zpbXUjfeSSAA== - /@types/p-series/1.0.1: - dev: false - resolution: - integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== /@types/path-exists/3.0.0: dev: true resolution: @@ -725,10 +704,10 @@ packages: dev: false resolution: integrity: sha512-/hhvF9xyBNhS+pTHupqpqT885r7ZhOUgeyIi/tiNVuTHSW3vOuV5wVcdB90lNsuwbZuziAXmoYhtYok+RKbJ0Q== - /@types/rc/0.0.1: + /@types/ramda/0.25.28: dev: false resolution: - integrity: sha1-H1uKGzsaxtH+4TfFP6xfoPKK4Nc= + integrity: sha512-H2NDAXtu2NXXBM/GMkASnKX2sVMu3aMlUBP6OHeI22cb+5+Zb74ACQs5ymJo/vaE/iGjLP4UIZdqi67j1nws1A== /@types/retry/0.10.2: dev: true resolution: @@ -806,15 +785,6 @@ packages: requiresBuild: true resolution: integrity: sha512-onS0BpZl/Zj903N60DM58rENRH9qZPWUALc4M808CG7Kv2M6BHz1W4XREg1vivAYaD3z2Hd9O2iEy3SJlALnbg== - /@zkochan/npm-package-arg/1.0.0: - dependencies: - hosted-git-info: 2.6.0 - osenv: 0.1.5 - semver: 5.5.0 - validate-npm-package-name: 3.0.0 - dev: false - resolution: - integrity: sha512-ufMBw0x+4y7uaiPu1uhwMaHaysLB57+EJoo63DGf28FG+TIrYiIIE886qSNXuDqyhqt+PVsRLB9e8+QVGe+Dtg== /JSONStream/1.3.2: dependencies: jsonparse: 1.3.1 @@ -1045,6 +1015,7 @@ packages: dependencies: core-js: 2.5.6 regenerator-runtime: 0.11.1 + dev: true resolution: integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= /balanced-match/1.0.0: @@ -1171,10 +1142,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - /builtins/1.0.3: - dev: false - resolution: - integrity: sha1-y5T662HIaWRR2zZTThQi+U8K7og= /bunyan/1.8.12: dev: true engines: @@ -1348,6 +1315,7 @@ packages: resolution: integrity: sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= /ci-info/1.1.3: + dev: true resolution: integrity: sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg== /cli-cursor/1.0.2: @@ -1413,14 +1381,6 @@ packages: dev: true resolution: integrity: sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== - /common-tags/1.7.2: - dependencies: - babel-runtime: 6.26.0 - dev: false - engines: - node: '>=4.0.0' - resolution: - integrity: sha512-joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ== /compare-func/1.3.2: dependencies: array-ify: 1.0.0 @@ -1530,6 +1490,7 @@ packages: resolution: integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== /core-js/2.5.6: + dev: true resolution: integrity: sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ== /core-util-is/1.0.2: @@ -1585,6 +1546,7 @@ packages: semver: 5.5.0 shebang-command: 1.2.0 which: 1.3.0 + dev: true engines: node: '>=4.8' resolution: @@ -1926,6 +1888,7 @@ packages: p-finally: 1.0.0 signal-exit: 3.0.2 strip-eof: 1.0.0 + dev: true engines: node: '>=4' resolution: @@ -2214,6 +2177,7 @@ packages: resolution: integrity: sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g= /get-stream/3.0.0: + dev: true engines: node: '>=4' resolution: @@ -2604,6 +2568,7 @@ packages: /is-ci/1.1.0: dependencies: ci-info: 1.1.3 + dev: true resolution: integrity: sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg== /is-date-object/1.0.1: @@ -2646,14 +2611,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= - /is-inner-link/2.0.2: - dependencies: - graceful-fs: 4.1.11 - is-subdir: 1.0.2 - resolve-link-target: 1.0.1 - dev: false - resolution: - integrity: sha512-YS9RSUrRbskf/O6nMF5+dvoa8zoIwF2uXnJZN1X+gCEtA1cc3KqgbOmgPjIndHfrLJ8MCRaPoG2KBPTZqhy5ug== /is-obj/1.0.1: dev: true engines: @@ -2693,18 +2650,11 @@ packages: resolution: integrity: sha1-6+oRaaJhTaOSpjdANmw84EnY3/Y= /is-stream/1.1.0: + dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - /is-subdir/1.0.2: - dependencies: - is-windows: 1.0.2 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-2H3vM92ez7TjW6T2e4G7AQVm/1/UA/qikNO0/aIi2SkouUU2wXW2CQ5Owiz8oaaFQpjNl74B5LIjTcM1htr2mQ== /is-symbol/1.0.1: engines: node: '>= 0.4' @@ -3074,13 +3024,13 @@ packages: dev: true resolution: integrity: sha1-eaMOky4hbLoWNUHuN6NgfBLNcoE= - /make-dir/1.2.0: + /make-dir/1.3.0: dependencies: pify: 3.0.0 engines: node: '>=4' resolution: - integrity: sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw== + integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== /make-error/1.3.4: dev: true resolution: @@ -3389,6 +3339,7 @@ packages: resolution: integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= /nice-try/1.0.4: + dev: true resolution: integrity: sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA== /nise/1.3.3: @@ -3528,6 +3479,7 @@ packages: /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 + dev: true engines: node: '>=4' resolution: @@ -3666,6 +3618,7 @@ packages: resolution: integrity: sha1-Yp0xcVAgnI/VCLoTdxPvS7kg6ds= /p-finally/1.0.0: + dev: true engines: node: '>=4' resolution: @@ -3747,8 +3700,8 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.14 - '@types/ramda': 0.25.26 + '@types/node': 9.6.15 + '@types/ramda': 0.25.28 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -3855,6 +3808,7 @@ packages: /path-absolute/1.0.0: dependencies: os-homedir: 1.0.2 + dev: true resolution: integrity: sha512-s0wa8oTU0s+jtq9C/xfNIRDp/8s6E2oeRvsATw1b6EZ1GNKxUCapwyBKdSzVm/2wkARh4KnyxTt3avOP4MwvnQ== /path-exists/2.1.0: @@ -3880,6 +3834,7 @@ packages: resolution: integrity: sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= /path-key/2.0.1: + dev: true engines: node: '>=4' resolution: @@ -3970,12 +3925,6 @@ packages: node: '>= 0.4.0' resolution: integrity: sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8= - /pnpm-install-checks/1.1.0: - dependencies: - semver: 5.5.0 - dev: false - resolution: - integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= /pnpm-registry-mock/1.22.2: dependencies: anonymous-npm-registry-client: 0.1.2 @@ -3989,8 +3938,8 @@ packages: dependencies: '@pnpm/resolver-base': 1.1.0 '@types/js-yaml': 3.11.1 - '@types/node': 10.0.6 - '@types/ramda': 0.25.26 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 js-yaml: 3.11.0 @@ -4246,18 +4195,9 @@ packages: resolution: integrity: sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= /regenerator-runtime/0.11.1: + dev: true resolution: integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - /remove-all-except-outer-links/1.0.3: - dependencies: - is-subdir: 1.0.2 - mz: 2.7.0 - p-filter: 1.0.0 - resolve-link-target: 1.0.1 - rimraf-then: 1.0.1 - dev: false - resolution: - integrity: sha512-h9Pl2xE1ZxYOhlKh0nYeMfzfv0GYUfglE5Eb0ILFFUiDnvVcbKwxGGukETEeIteR0JTVfesOaKqiwrOoUz1ajw== /rename-overwrite/1.0.2: dependencies: delay: 2.0.0 @@ -4284,12 +4224,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - /replace-string/1.1.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o= /request/2.85.0: dependencies: aws-sign2: 0.7.0 @@ -4352,14 +4286,6 @@ packages: node: '>=4' resolution: integrity: sha1-j7As/Vt9sgEY6IYxHxWvlb0V+9k= - /resolve-link-target/1.0.1: - dependencies: - graceful-fs: 4.1.11 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-uid343+whX+g+LLUzwCYaZBOZPX8Hi3Y7qZBr0r1Rvb0y6WMWVLT32uuGllxD5uNQR+mddUE/Dx/wwvgGrZLSA== /resolve/1.5.0: dependencies: path-parse: 1.0.5 @@ -4534,11 +4460,13 @@ packages: /shebang-command/1.2.0: dependencies: shebang-regex: 1.0.0 + dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= /shebang-regex/1.0.0: + dev: true engines: node: '>=0.10.0' resolution: @@ -4788,6 +4716,7 @@ packages: resolution: integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= /strip-eof/1.0.0: + dev: true engines: node: '>=0.10.0' resolution: @@ -4806,142 +4735,6 @@ packages: node: '>=4' resolution: integrity: sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= - /supi/0.17.4: - dependencies: - '@pnpm/check-package': 1.0.0 - '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.9 - '@pnpm/lifecycle': 2.2.0 - '@pnpm/link-bins': 1.0.2 - '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.8 - '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/resolver-base': 1.1.0 - '@pnpm/types': 1.7.0 - '@types/byline': 4.2.31 - '@types/common-tags': 1.4.0 - '@types/load-json-file': 2.0.7 - '@types/mz': 0.0.32 - '@types/node': 9.6.14 - '@types/nopt': 3.0.29 - '@types/npm': 2.0.29 - '@types/p-series': 1.0.1 - '@types/ramda': 0.25.26 - '@types/rc': 0.0.1 - '@types/semver': 5.5.0 - '@zkochan/npm-package-arg': 1.0.0 - common-tags: 1.7.2 - dependency-path: 1.2.1 - encode-registry: 1.1.0 - execa: 0.10.0 - fs-vacuum: 1.2.10 - get-npm-tarball-url: 2.0.1 - graceful-fs: 4.1.11 - graph-sequencer: 2.0.0 - is-ci: 1.1.0 - is-inner-link: 2.0.2 - is-subdir: 1.0.2 - load-json-file: 4.0.0 - mkdirp-promise: 5.0.1 - mz: 2.7.0 - normalize-path: 3.0.0 - normalize-registry-url: 1.0.0 - os-homedir: 1.0.2 - p-filter: 1.0.0 - p-limit: 1.2.0 - package-store: 0.18.1 - path-absolute: 1.0.0 - path-exists: 3.0.0 - pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.4.0 - ramda: 0.25.0 - read-package-json: 2.0.13 - remove-all-except-outer-links: 1.0.3 - replace-string: 1.1.0 - resolve-link-target: 1.0.1 - rimraf-then: 1.0.1 - semver: 5.5.0 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - validate-npm-package-name: 3.0.0 - version-selector-type: 2.0.0 - write-pkg: 3.1.0 - dev: false - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-EpaxmnPXnj/aHw9AqLYvN/zcsmJ6ZIJWZULUSXFFVxCkBZfF1wSEom/TaF7OCHd3IAbjo8NPqoVITTnCIQJaMg== - /supi/0.18.0: - dependencies: - '@pnpm/check-package': 1.0.0 - '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.9 - '@pnpm/lifecycle': 2.2.0 - '@pnpm/link-bins': 1.0.2 - '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.8 - '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/resolver-base': 1.1.0 - '@pnpm/types': 1.7.0 - '@types/byline': 4.2.31 - '@types/common-tags': 1.4.0 - '@types/load-json-file': 2.0.7 - '@types/mz': 0.0.32 - '@types/node': 10.0.6 - '@types/nopt': 3.0.29 - '@types/npm': 2.0.29 - '@types/p-series': 1.0.1 - '@types/ramda': 0.25.26 - '@types/rc': 0.0.1 - '@types/semver': 5.5.0 - '@zkochan/npm-package-arg': 1.0.0 - common-tags: 1.7.2 - dependency-path: 1.2.1 - encode-registry: 1.1.0 - execa: 0.10.0 - fs-vacuum: 1.2.10 - get-npm-tarball-url: 2.0.1 - graceful-fs: 4.1.11 - graph-sequencer: 2.0.0 - is-ci: 1.1.0 - is-inner-link: 2.0.2 - is-subdir: 1.0.2 - load-json-file: 4.0.0 - mkdirp-promise: 5.0.1 - mz: 2.7.0 - normalize-path: 3.0.0 - normalize-registry-url: 1.0.0 - os-homedir: 1.0.2 - p-filter: 1.0.0 - p-limit: 1.2.0 - package-store: 0.19.0 - path-absolute: 1.0.0 - path-exists: 3.0.0 - pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.4.0 - ramda: 0.25.0 - read-package-json: 2.0.13 - remove-all-except-outer-links: 1.0.3 - replace-string: 1.1.0 - resolve-link-target: 1.0.1 - rimraf-then: 1.0.1 - semver: 5.5.0 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - validate-npm-package-name: 3.0.0 - version-selector-type: 2.0.0 - write-pkg: 3.1.0 - dev: false - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-2+LFW+rIhiKky8A/MWk2DnrzWdph0Py4vvAOFpbwlZQDZ9auxNLaGABIHRjOPdhy5uNEwBQVcuoQGgqwfdR17Q== /supports-color/2.0.0: dev: true engines: @@ -4968,6 +4761,19 @@ packages: node: '>=4' resolution: integrity: sha512-GXEvwF1zpalvovqO+x18H7k+4adCXn9NU6vjfEQ+cVS7Ltq7YXFQyitdl7WoQqNUMce3RGMPo037GJrtM7f7lw== + /symlink-dir/1.1.3: + dependencies: + '@types/mz': 0.0.32 + '@types/node': 10.0.8 + graceful-fs: 4.1.11 + is-windows: 1.0.2 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha512-klQgTYk7en8A69nAzZjJdaMXbGCmfh0DU+YLaZG/stHNp00VZSS3Pos238Ua7oCKVw57UszViod4D7RVRH6XHg== /tape-promise/2.0.1: dependencies: is-promise: 2.1.0 @@ -5321,12 +5127,6 @@ packages: spdx-expression-parse: 3.0.0 resolution: integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== - /validate-npm-package-name/3.0.0: - dependencies: - builtins: 1.0.3 - dev: false - resolution: - integrity: sha1-X6kS2B630MdK/BQN5zF/DKffQ34= /vary/1.1.2: dev: true engines: @@ -5383,6 +5183,7 @@ packages: /version-selector-type/2.0.0: dependencies: semver: 5.5.0 + dev: true engines: node: '>=4' resolution: @@ -5458,7 +5259,7 @@ packages: dependencies: detect-indent: 5.0.0 graceful-fs: 4.1.11 - make-dir: 1.2.0 + make-dir: 1.3.0 pify: 3.0.0 sort-keys: 2.0.0 write-file-atomic: 2.3.0 @@ -5470,6 +5271,7 @@ packages: dependencies: sort-keys: 2.0.0 write-json-file: 2.3.0 + dev: true engines: node: '>=4' resolution: @@ -5534,6 +5336,7 @@ specifiers: '@pnpm/pkgid-to-filename': ^1.0.0 '@pnpm/store-path': ^1.0.3 '@pnpm/types': ^1.7.0 + '@pnpm/utils': ^0.1.0 '@types/fs-extra': ^5.0.1 '@types/mz': ^0.0.32 '@types/node': ^10.0.6 @@ -5562,7 +5365,6 @@ specifiers: rimraf: ^2.6.2 rimraf-then: ^1.0.1 sinon: ^5.0.0 - supi: ^0.18.0 symlink-dir: ^1.1.2 tape: ^4.8.0 tape-promise: ^2.0.1 diff --git a/src/index.ts b/src/index.ts index 84d8a6d697..4bf88357d9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,6 +14,15 @@ import { } from '@pnpm/package-requester' import pkgIdToFilename from '@pnpm/pkgid-to-filename' import {PackageJson} from '@pnpm/types' +import { + packageJsonLogger, + realNodeModulesDir, + removeOrphanPackages as removeOrphanPkgs, + rootLogger, + stageLogger, + statsLogger, + summaryLogger, +} from '@pnpm/utils' import dp = require('dependency-path') import pLimit = require('p-limit') import {StoreController} from 'package-store' @@ -30,15 +39,6 @@ import { } from 'pnpm-shrinkwrap' import R = require('ramda') import readPkgCB = require('read-package-json') -import removeOrphanPkgs from 'supi/lib/api/removeOrphanPkgs' -import realNodeModulesDir from 'supi/lib/fs/realNodeModulesDir' -import { - packageJsonLogger, - rootLogger, - stageLogger, - statsLogger, - summaryLogger, -} from 'supi/lib/loggers' import symlinkDir = require('symlink-dir') import promisify = require('util.promisify') import { diff --git a/src/runDependenciesScripts.ts b/src/runDependenciesScripts.ts index 96e69b5930..80647f7030 100644 --- a/src/runDependenciesScripts.ts +++ b/src/runDependenciesScripts.ts @@ -2,13 +2,13 @@ import {runPostinstallHooks} from '@pnpm/lifecycle' import logger from '@pnpm/logger' +import {skippedOptionalDependencyLogger} from '@pnpm/utils' import graphSequencer = require('graph-sequencer') import pLimit = require('p-limit') import {StoreController} from 'package-store' import path = require('path') import R = require('ramda') import readPkgCB = require('read-package-json') -import {skippedOptionalDependencyLogger} from 'supi/lib/loggers' import promisify = require('util.promisify') import {DepGraphNodesByDepPath} from '.' import {ENGINE_NAME} from './constants' diff --git a/test/index.ts b/test/index.ts index 3a069a7397..c30171441e 100644 --- a/test/index.ts +++ b/test/index.ts @@ -13,9 +13,8 @@ import { StageLog, StatsLog, PackageJsonLog, - ProgressLog, RootLog, -} from 'supi' +} from '@pnpm/utils' import testDefaults from './utils/testDefaults' const fixtures = path.join(__dirname, 'fixtures') @@ -64,7 +63,7 @@ test('installing a simple project', async (t) => { level: 'debug', pkgId: 'localhost+4873/is-negative/2.1.0', status: 'resolving_content', - } as ProgressLog), 'logs that package is being resolved') + }), 'logs that package is being resolved') t.end() }) @@ -287,12 +286,12 @@ test('available packages are used when node_modules is not clean', async (t) => level: 'debug', pkgId: 'localhost+4873/balanced-match/1.0.0', status: 'resolving_content', - } as ProgressLog), 'does not resolve already available package') + }), 'does not resolve already available package') t.ok(reporter.calledWithMatch({ level: 'debug', pkgId: 'localhost+4873/rimraf/2.6.2', status: 'resolving_content', - } as ProgressLog), 'resolves rimraf') + }), 'resolves rimraf') t.end() }) @@ -325,12 +324,12 @@ test('available packages are relinked during forced install', async (t) => { level: 'debug', pkgId: 'localhost+4873/balanced-match/1.0.0', status: 'resolving_content', - } as ProgressLog), 'does not resolve already available package') + }), 'does not resolve already available package') t.ok(reporter.calledWithMatch({ level: 'debug', pkgId: 'localhost+4873/rimraf/2.6.2', status: 'resolving_content', - } as ProgressLog), 'resolves rimraf') + }), 'resolves rimraf') t.end() }) diff --git a/test/utils/testDefaults.ts b/test/utils/testDefaults.ts index e330dbb07c..702093f631 100644 --- a/test/utils/testDefaults.ts +++ b/test/utils/testDefaults.ts @@ -3,7 +3,6 @@ import createResolver from '@pnpm/default-resolver' import storePath from '@pnpm/store-path' import createStore, {StoreController} from 'package-store' import path = require('path') -import {InstallOptions} from 'supi' import tempy = require('tempy') import {HeadlessOptions} from '@pnpm/headless'