From eb5d3088a4be3f26e88fb579aa8dc180c344c952 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Wed, 24 Oct 2018 13:24:14 +0100 Subject: [PATCH] build: update `canonical-path` dependency (#26719) This new version (1.0.0) provides a typings file! PR Close #26719 --- aio/package.json | 2 +- aio/tools/examples/shared/package.json | 2 +- aio/tools/examples/shared/yarn.lock | 5 +++++ aio/yarn.lock | 7 ++++++- package.json | 2 +- packages/compiler-cli/package.json | 2 +- packages/compiler-cli/src/ngcc/BUILD.bazel | 1 + packages/compiler-cli/src/ngcc/canonical-path.d.ts | 14 -------------- packages/compiler-cli/src/ngcc/test/BUILD.bazel | 1 + yarn.lock | 8 ++++---- 10 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 packages/compiler-cli/src/ngcc/canonical-path.d.ts diff --git a/aio/package.json b/aio/package.json index 9726460eb0..81a92fd55d 100644 --- a/aio/package.json +++ b/aio/package.json @@ -104,7 +104,7 @@ "@types/jasminewd2": "^2.0.4", "@types/node": "~6.0.60", "archiver": "^1.3.0", - "canonical-path": "^0.0.2", + "canonical-path": "1.0.0", "chalk": "^2.1.0", "cjson": "^0.5.0", "codelyzer": "~4.2.1", diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json index 83abad589a..1aced60284 100644 --- a/aio/tools/examples/shared/package.json +++ b/aio/tools/examples/shared/package.json @@ -57,7 +57,7 @@ "@types/jasminewd2": "^2.0.4", "@types/jquery": "^3.3.4", "@types/node": "~8.9.4", - "canonical-path": "0.0.2", + "canonical-path": "1.0.0", "concurrently": "^3.0.0", "http-server": "^0.9.0", "jasmine-core": "~2.99.1", diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock index d3964f3b83..45e2a1b691 100644 --- a/aio/tools/examples/shared/yarn.lock +++ b/aio/tools/examples/shared/yarn.lock @@ -1450,6 +1450,11 @@ canonical-path@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574" +canonical-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d" + integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" diff --git a/aio/yarn.lock b/aio/yarn.lock index f78f935593..84c050008d 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -1746,11 +1746,16 @@ caniuse-lite@^1.0.30000832, caniuse-lite@^1.0.30000844: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf" integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg== -canonical-path@0.0.2, canonical-path@^0.0.2, canonical-path@~0.0.2: +canonical-path@0.0.2, canonical-path@~0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574" integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ= +canonical-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d" + integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg== + capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" diff --git a/package.json b/package.json index df13946287..bd5ea108e9 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "angular-mocks-1.5": "npm:angular-mocks@1.5", "angular-mocks-1.6": "npm:angular-mocks@1.6", "base64-js": "1.2.1", - "canonical-path": "0.0.2", + "canonical-path": "1.0.0", "chokidar": "1.7.0", "convert-source-map": "^1.5.1", "dependency-graph": "^0.7.2", diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json index 63912e6d54..2254201ab6 100644 --- a/packages/compiler-cli/package.json +++ b/packages/compiler-cli/package.json @@ -12,7 +12,7 @@ "dependencies": { "reflect-metadata": "^0.1.2", "minimist": "^1.2.0", - "canonical-path": "0.0.2", + "canonical-path": "1.0.0", "chokidar": "^1.4.2", "convert-source-map": "^1.5.1", "dependency-graph": "^0.7.2", diff --git a/packages/compiler-cli/src/ngcc/BUILD.bazel b/packages/compiler-cli/src/ngcc/BUILD.bazel index dc52f11a1f..b0f98698e3 100644 --- a/packages/compiler-cli/src/ngcc/BUILD.bazel +++ b/packages/compiler-cli/src/ngcc/BUILD.bazel @@ -22,6 +22,7 @@ ts_library( "@ngdeps//@types/shelljs", "@ngdeps//@types/source-map", "@ngdeps//@types/yargs", + "@ngdeps//canonical-path", "@ngdeps//dependency-graph", "@ngdeps//magic-string", "@ngdeps//source-map", diff --git a/packages/compiler-cli/src/ngcc/canonical-path.d.ts b/packages/compiler-cli/src/ngcc/canonical-path.d.ts deleted file mode 100644 index c8c8b88610..0000000000 --- a/packages/compiler-cli/src/ngcc/canonical-path.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -declare module 'canonical-path' { - export function normalize(p: string): string; - export function join(...paths: any[]): string; - export function resolve(...pathSegments: any[]): string; - export function isAbsolute(p: string): boolean; - export function relative(from: string, to: string): string; - export function dirname(p: string): string; - export function basename(p: string, ext?: string): string; - export function extname(p: string): string; - export var sep: string; - export var delimiter: string; - export function parse(p: string): ParsedPath; - export function format(pP: ParsedPath): string; -} diff --git a/packages/compiler-cli/src/ngcc/test/BUILD.bazel b/packages/compiler-cli/src/ngcc/test/BUILD.bazel index 99ebd0807b..187153676a 100644 --- a/packages/compiler-cli/src/ngcc/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngcc/test/BUILD.bazel @@ -15,6 +15,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/transform", "@ngdeps//@types/convert-source-map", "@ngdeps//@types/mock-fs", + "@ngdeps//canonical-path", "@ngdeps//magic-string", "@ngdeps//typescript", ], diff --git a/yarn.lock b/yarn.lock index 906ae7eda4..86f6ac59d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1274,10 +1274,10 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -canonical-path@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574" - integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ= +canonical-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d" + integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg== caseless@~0.11.0: version "0.11.0"