From b7e098cbd242dec597c70fc662770b2ebb554406 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 14 Apr 2022 10:40:05 +0000 Subject: [PATCH 01/26] 1fd3893c2 build: update angular --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9a1270a57..6e6bc21ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.8+22.sha-86678f9", + "version": "14.0.0-next.9+1.sha-1fd3893", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#86678f969", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#86678f969", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#86678f969", - "@schematics/angular": "github:angular/schematics-angular-builds#86678f969", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1fd3893c2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1fd3893c2", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1fd3893c2", + "@schematics/angular": "github:angular/schematics-angular-builds#1fd3893c2", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#86678f969", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#86678f969", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#86678f969", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#86678f969", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#86678f969", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#86678f969" + "@angular/cli": "github:angular/cli-builds#1fd3893c2", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1fd3893c2", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#1fd3893c2", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1fd3893c2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1fd3893c2", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1fd3893c2" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 46c8d3b7a..49eaa3ee7 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.8+22.sha-86678f9'); +// export const VERSION = new Version('14.0.0-next.9+1.sha-1fd3893'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 9faa043c6..b1ceaaec1 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 13 2022 22:58:52 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 14 2022 10:40:04 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 04ac7842e7e2be3c1995672d7803ecdca62bcbbc Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 14 Apr 2022 11:38:07 +0000 Subject: [PATCH 02/26] c636cc8a2 build: update dependency karma-jasmine to v5 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 6e6bc21ec..80d602a5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+1.sha-1fd3893", + "version": "14.0.0-next.9+3.sha-c636cc8", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1fd3893c2", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1fd3893c2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1fd3893c2", - "@schematics/angular": "github:angular/schematics-angular-builds#1fd3893c2", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c636cc8a2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c636cc8a2", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c636cc8a2", + "@schematics/angular": "github:angular/schematics-angular-builds#c636cc8a2", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#1fd3893c2", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1fd3893c2", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#1fd3893c2", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1fd3893c2", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1fd3893c2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1fd3893c2" + "@angular/cli": "github:angular/cli-builds#c636cc8a2", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c636cc8a2", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#c636cc8a2", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#c636cc8a2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c636cc8a2", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c636cc8a2" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 49eaa3ee7..ba08d7baa 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+1.sha-1fd3893'); +// export const VERSION = new Version('14.0.0-next.9+3.sha-c636cc8'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index b1ceaaec1..6ecfb5b48 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 14 2022 10:40:04 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 14 2022 11:38:07 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 42c76566662cea0ab8ac31fc8657fff5516dc906 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 14 Apr 2022 11:41:12 +0000 Subject: [PATCH 03/26] 3739a0f02 build: update dependency karma-jasmine to v5 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 80d602a5a..e7f4cd8ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+3.sha-c636cc8", + "version": "14.0.0-next.9+2.sha-3739a0f", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c636cc8a2", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c636cc8a2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c636cc8a2", - "@schematics/angular": "github:angular/schematics-angular-builds#c636cc8a2", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3739a0f02", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#3739a0f02", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3739a0f02", + "@schematics/angular": "github:angular/schematics-angular-builds#3739a0f02", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#c636cc8a2", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c636cc8a2", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#c636cc8a2", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#c636cc8a2", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c636cc8a2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c636cc8a2" + "@angular/cli": "github:angular/cli-builds#3739a0f02", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3739a0f02", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#3739a0f02", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#3739a0f02", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#3739a0f02", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3739a0f02" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index ba08d7baa..0ef1e79e4 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+3.sha-c636cc8'); +// export const VERSION = new Version('14.0.0-next.9+2.sha-3739a0f'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 6ecfb5b48..ef22a070d 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 14 2022 11:38:07 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 14 2022 11:41:12 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From b3c762270b8dd1973317adb6e8f2227b7a46a561 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 14 Apr 2022 15:21:57 +0000 Subject: [PATCH 04/26] d270258dc build: update dependency glob to v8 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index e7f4cd8ad..5250afbe8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+2.sha-3739a0f", + "version": "14.0.0-next.9+4.sha-d270258", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3739a0f02", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#3739a0f02", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3739a0f02", - "@schematics/angular": "github:angular/schematics-angular-builds#3739a0f02", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d270258dc", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d270258dc", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d270258dc", + "@schematics/angular": "github:angular/schematics-angular-builds#d270258dc", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#3739a0f02", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3739a0f02", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#3739a0f02", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#3739a0f02", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#3739a0f02", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3739a0f02" + "@angular/cli": "github:angular/cli-builds#d270258dc", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d270258dc", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#d270258dc", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d270258dc", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d270258dc", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d270258dc" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 0ef1e79e4..ec9a2c469 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+2.sha-3739a0f'); +// export const VERSION = new Version('14.0.0-next.9+4.sha-d270258'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index ef22a070d..fbf498a38 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 14 2022 11:41:12 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 14 2022 15:21:57 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 28d92c82e2f95e66e3fb04af8287b6bd0f04abb1 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 14 Apr 2022 15:48:16 +0000 Subject: [PATCH 05/26] f74a79f7c refactor(@angular-devkit/core): remove no longer needed `fast-json-stable-stringify` dependency --- package.json | 22 +++++++++++----------- src/utilities/json-file.js | 3 ++- src/utilities/version.js | 2 +- uniqueId | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 5250afbe8..21ab06e97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+4.sha-d270258", + "version": "14.0.0-next.9+6.sha-f74a79f", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d270258dc", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d270258dc", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d270258dc", - "@schematics/angular": "github:angular/schematics-angular-builds#d270258dc", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f74a79f7c", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f74a79f7c", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#f74a79f7c", + "@schematics/angular": "github:angular/schematics-angular-builds#f74a79f7c", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#d270258dc", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d270258dc", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#d270258dc", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d270258dc", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d270258dc", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d270258dc" + "@angular/cli": "github:angular/cli-builds#f74a79f7c", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f74a79f7c", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#f74a79f7c", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#f74a79f7c", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f74a79f7c", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#f74a79f7c" } }, "engines": { diff --git a/src/utilities/json-file.js b/src/utilities/json-file.js index 17f0189d0..5da623ff7 100644 --- a/src/utilities/json-file.js +++ b/src/utilities/json-file.js @@ -59,6 +59,7 @@ class JSONFile { } const edits = (0, jsonc_parser_1.modify)(this.content, jsonPath, value, { getInsertionIndex, + // TODO: use indentation from original file. formattingOptions: { insertSpaces: true, tabSize: 2, @@ -95,4 +96,4 @@ function parseJson(content) { return (0, jsonc_parser_1.parse)(content, undefined, { allowTrailingComma: true }); } exports.parseJson = parseJson; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/src/utilities/json-file.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,2BAAiD;AACjD,+CAUsB;AAKtB,gBAAgB;AAChB,MAAa,QAAQ;IAGnB,YAA6B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QACvC,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SAClC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,IAAI,CAAC,CAAC;SAC9C;IACH,CAAC;IAGD,IAAY,OAAO;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QAED,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAChC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,QAAkB;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,IAAA,2BAAY,EAAC,WAAW,CAAC,CAAC;SAClC;QAED,MAAM,IAAI,GAAG,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEvD,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,2BAAY,EAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CACJ,QAAkB,EAClB,KAA4B,EAC5B,aAAsC;QAEtC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE;YAC3D,6CAA6C;YAC7C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,iBAA6C,CAAC;QAClD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,iBAAiB,GAAG,CAAC,UAAU,EAAE,EAAE,CACjC,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;SACrE;aAAM,IAAI,aAAa,KAAK,KAAK,EAAE;YAClC,iBAAiB,GAAG,aAAa,CAAC;SACnC;QAED,MAAM,KAAK,GAAG,IAAA,qBAAM,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;YAClD,iBAAiB;YACjB,iBAAiB,EAAE;gBACjB,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,CAAC;aACX;SACF,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAA,kBAAa,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACF;AAlFD,4BAkFC;AAED,8DAA8D;AAC9D,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,IAAA,oBAAK,EAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IACzF,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC3B;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,4CAQC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,MAAoB;IACrD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,yBAAyB,IAAA,kCAAmB,EAClE,KAAK,CACN,iBAAiB,MAAM,GAAG,CAC5B,CAAC;AACJ,CAAC;AAED,8DAA8D;AAC9D,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,IAAA,oBAAK,EAAC,OAAO,EAAE,SAAS,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,CAAC;AAFD,8BAEC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { JsonValue } from '@angular-devkit/core';\nimport { readFileSync, writeFileSync } from 'fs';\nimport {\n  Node,\n  ParseError,\n  applyEdits,\n  findNodeAtLocation,\n  getNodeValue,\n  modify,\n  parse,\n  parseTree,\n  printParseErrorCode,\n} from 'jsonc-parser';\n\nexport type InsertionIndex = (properties: string[]) => number;\nexport type JSONPath = (string | number)[];\n\n/** @internal */\nexport class JSONFile {\n  content: string;\n\n  constructor(private readonly path: string) {\n    const buffer = readFileSync(this.path);\n    if (buffer) {\n      this.content = buffer.toString();\n    } else {\n      throw new Error(`Could not read '${path}'.`);\n    }\n  }\n\n  private _jsonAst: Node | undefined;\n  private get JsonAst(): Node | undefined {\n    if (this._jsonAst) {\n      return this._jsonAst;\n    }\n\n    const errors: ParseError[] = [];\n    this._jsonAst = parseTree(this.content, errors, { allowTrailingComma: true });\n    if (errors.length) {\n      formatError(this.path, errors);\n    }\n\n    return this._jsonAst;\n  }\n\n  get(jsonPath: JSONPath): unknown {\n    const jsonAstNode = this.JsonAst;\n    if (!jsonAstNode) {\n      return undefined;\n    }\n\n    if (jsonPath.length === 0) {\n      return getNodeValue(jsonAstNode);\n    }\n\n    const node = findNodeAtLocation(jsonAstNode, jsonPath);\n\n    return node === undefined ? undefined : getNodeValue(node);\n  }\n\n  modify(\n    jsonPath: JSONPath,\n    value: JsonValue | undefined,\n    insertInOrder?: InsertionIndex | false,\n  ): boolean {\n    if (value === undefined && this.get(jsonPath) === undefined) {\n      // Cannot remove a value which doesn't exist.\n      return false;\n    }\n\n    let getInsertionIndex: InsertionIndex | undefined;\n    if (insertInOrder === undefined) {\n      const property = jsonPath.slice(-1)[0];\n      getInsertionIndex = (properties) =>\n        [...properties, property].sort().findIndex((p) => p === property);\n    } else if (insertInOrder !== false) {\n      getInsertionIndex = insertInOrder;\n    }\n\n    const edits = modify(this.content, jsonPath, value, {\n      getInsertionIndex,\n      formattingOptions: {\n        insertSpaces: true,\n        tabSize: 2,\n      },\n    });\n\n    if (edits.length === 0) {\n      return false;\n    }\n\n    this.content = applyEdits(this.content, edits);\n    this._jsonAst = undefined;\n\n    return true;\n  }\n\n  save(): void {\n    writeFileSync(this.path, this.content);\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function readAndParseJson(path: string): any {\n  const errors: ParseError[] = [];\n  const content = parse(readFileSync(path, 'utf-8'), errors, { allowTrailingComma: true });\n  if (errors.length) {\n    formatError(path, errors);\n  }\n\n  return content;\n}\n\nfunction formatError(path: string, errors: ParseError[]): never {\n  const { error, offset } = errors[0];\n  throw new Error(\n    `Failed to parse \"${path}\" as JSON AST Object. ${printParseErrorCode(\n      error,\n    )} at location: ${offset}.`,\n  );\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function parseJson(content: string): any {\n  return parse(content, undefined, { allowTrailingComma: true });\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/src/utilities/json-file.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { JsonValue } from '@angular-devkit/core';\nimport { readFileSync, writeFileSync } from 'fs';\nimport {\n  Node,\n  ParseError,\n  applyEdits,\n  findNodeAtLocation,\n  getNodeValue,\n  modify,\n  parse,\n  parseTree,\n  printParseErrorCode,\n} from 'jsonc-parser';\n\nexport type InsertionIndex = (properties: string[]) => number;\nexport type JSONPath = (string | number)[];\n\n/** @internal */\nexport class JSONFile {\n  content: string;\n\n  constructor(private readonly path: string) {\n    const buffer = readFileSync(this.path);\n    if (buffer) {\n      this.content = buffer.toString();\n    } else {\n      throw new Error(`Could not read '${path}'.`);\n    }\n  }\n\n  private _jsonAst: Node | undefined;\n  private get JsonAst(): Node | undefined {\n    if (this._jsonAst) {\n      return this._jsonAst;\n    }\n\n    const errors: ParseError[] = [];\n    this._jsonAst = parseTree(this.content, errors, { allowTrailingComma: true });\n    if (errors.length) {\n      formatError(this.path, errors);\n    }\n\n    return this._jsonAst;\n  }\n\n  get(jsonPath: JSONPath): unknown {\n    const jsonAstNode = this.JsonAst;\n    if (!jsonAstNode) {\n      return undefined;\n    }\n\n    if (jsonPath.length === 0) {\n      return getNodeValue(jsonAstNode);\n    }\n\n    const node = findNodeAtLocation(jsonAstNode, jsonPath);\n\n    return node === undefined ? undefined : getNodeValue(node);\n  }\n\n  modify(\n    jsonPath: JSONPath,\n    value: JsonValue | undefined,\n    insertInOrder?: InsertionIndex | false,\n  ): boolean {\n    if (value === undefined && this.get(jsonPath) === undefined) {\n      // Cannot remove a value which doesn't exist.\n      return false;\n    }\n\n    let getInsertionIndex: InsertionIndex | undefined;\n    if (insertInOrder === undefined) {\n      const property = jsonPath.slice(-1)[0];\n      getInsertionIndex = (properties) =>\n        [...properties, property].sort().findIndex((p) => p === property);\n    } else if (insertInOrder !== false) {\n      getInsertionIndex = insertInOrder;\n    }\n\n    const edits = modify(this.content, jsonPath, value, {\n      getInsertionIndex,\n      // TODO: use indentation from original file.\n      formattingOptions: {\n        insertSpaces: true,\n        tabSize: 2,\n      },\n    });\n\n    if (edits.length === 0) {\n      return false;\n    }\n\n    this.content = applyEdits(this.content, edits);\n    this._jsonAst = undefined;\n\n    return true;\n  }\n\n  save(): void {\n    writeFileSync(this.path, this.content);\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function readAndParseJson(path: string): any {\n  const errors: ParseError[] = [];\n  const content = parse(readFileSync(path, 'utf-8'), errors, { allowTrailingComma: true });\n  if (errors.length) {\n    formatError(path, errors);\n  }\n\n  return content;\n}\n\nfunction formatError(path: string, errors: ParseError[]): never {\n  const { error, offset } = errors[0];\n  throw new Error(\n    `Failed to parse \"${path}\" as JSON AST Object. ${printParseErrorCode(\n      error,\n    )} at location: ${offset}.`,\n  );\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function parseJson(content: string): any {\n  return parse(content, undefined, { allowTrailingComma: true });\n}\n"]} \ No newline at end of file diff --git a/src/utilities/version.js b/src/utilities/version.js index ec9a2c469..ac346ab16 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+4.sha-d270258'); +// export const VERSION = new Version('14.0.0-next.9+6.sha-f74a79f'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index fbf498a38..249c2760d 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 14 2022 15:21:57 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 14 2022 15:48:16 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 530227caa51a9172fcf26f3c47e114e170a5d48d Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Fri, 15 Apr 2022 08:15:08 +0000 Subject: [PATCH 06/26] 41982aa28 build: update all non-major dependencies --- package.json | 24 ++++++++++++------------ src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 21ab06e97..e94d907aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+6.sha-f74a79f", + "version": "14.0.0-next.9+7.sha-41982aa", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f74a79f7c", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f74a79f7c", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#f74a79f7c", - "@schematics/angular": "github:angular/schematics-angular-builds#f74a79f7c", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#41982aa28", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#41982aa28", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#41982aa28", + "@schematics/angular": "github:angular/schematics-angular-builds#41982aa28", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -41,7 +41,7 @@ "ora": "5.4.1", "pacote": "13.1.1", "resolve": "1.22.0", - "semver": "7.3.6", + "semver": "7.3.7", "symbol-observable": "4.0.0", "uuid": "8.3.2", "yargs": "17.4.1" @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#f74a79f7c", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f74a79f7c", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#f74a79f7c", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#f74a79f7c", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f74a79f7c", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#f74a79f7c" + "@angular/cli": "github:angular/cli-builds#41982aa28", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#41982aa28", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#41982aa28", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#41982aa28", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#41982aa28", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#41982aa28" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index ac346ab16..589b69b9f 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+6.sha-f74a79f'); +// export const VERSION = new Version('14.0.0-next.9+7.sha-41982aa'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 249c2760d..b0aecea23 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 14 2022 15:48:16 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Apr 15 2022 08:15:08 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From c5c8932186b3b0ba3d27b05f9422fb3fe1f48989 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Fri, 15 Apr 2022 12:59:09 +0000 Subject: [PATCH 07/26] c24be811d build: update actions/checkout action to v3.0.1 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index e94d907aa..b25a0ab5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+7.sha-41982aa", + "version": "14.0.0-next.9+8.sha-c24be81", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#41982aa28", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#41982aa28", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#41982aa28", - "@schematics/angular": "github:angular/schematics-angular-builds#41982aa28", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c24be811d", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c24be811d", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c24be811d", + "@schematics/angular": "github:angular/schematics-angular-builds#c24be811d", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#41982aa28", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#41982aa28", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#41982aa28", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#41982aa28", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#41982aa28", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#41982aa28" + "@angular/cli": "github:angular/cli-builds#c24be811d", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c24be811d", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#c24be811d", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#c24be811d", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c24be811d", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c24be811d" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 589b69b9f..95d5a1334 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+7.sha-41982aa'); +// export const VERSION = new Version('14.0.0-next.9+8.sha-c24be81'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index b0aecea23..5c5117b86 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Apr 15 2022 08:15:08 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Apr 15 2022 12:59:09 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From a8c5c168dd82296aa637f768cc9b509b4dd1bc94 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Sat, 16 Apr 2022 06:13:35 +0000 Subject: [PATCH 08/26] 1a160dac0 fix(@angular-devkit/build-angular): ensure karma sourcemap support on Windows --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b25a0ab5a..d8e3de16b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+8.sha-c24be81", + "version": "14.0.0-next.9+9.sha-1a160da", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c24be811d", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c24be811d", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c24be811d", - "@schematics/angular": "github:angular/schematics-angular-builds#c24be811d", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1a160dac0", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a160dac0", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1a160dac0", + "@schematics/angular": "github:angular/schematics-angular-builds#1a160dac0", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#c24be811d", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c24be811d", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#c24be811d", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#c24be811d", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c24be811d", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c24be811d" + "@angular/cli": "github:angular/cli-builds#1a160dac0", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1a160dac0", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#1a160dac0", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1a160dac0", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a160dac0", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1a160dac0" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 95d5a1334..09c127699 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+8.sha-c24be81'); +// export const VERSION = new Version('14.0.0-next.9+9.sha-1a160da'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 5c5117b86..b33e90fcc 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Apr 15 2022 12:59:09 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Sat Apr 16 2022 06:13:35 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 7406fb3db22e586cd4de659e21579d7071bc2c7a Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Sun, 17 Apr 2022 16:41:22 +0000 Subject: [PATCH 09/26] bbf88abac build: update angular to afacf03 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index d8e3de16b..4d8c24081 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+9.sha-1a160da", + "version": "14.0.0-next.9+sha-bbf88ab", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1a160dac0", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a160dac0", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1a160dac0", - "@schematics/angular": "github:angular/schematics-angular-builds#1a160dac0", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bbf88abac", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bbf88abac", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bbf88abac", + "@schematics/angular": "github:angular/schematics-angular-builds#bbf88abac", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#1a160dac0", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1a160dac0", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#1a160dac0", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1a160dac0", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a160dac0", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#1a160dac0" + "@angular/cli": "github:angular/cli-builds#bbf88abac", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bbf88abac", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#bbf88abac", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#bbf88abac", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bbf88abac", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bbf88abac" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 09c127699..94f6dac1c 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+9.sha-1a160da'); +// export const VERSION = new Version('14.0.0-next.9+sha-bbf88ab'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index b33e90fcc..a09f954fc 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Sat Apr 16 2022 06:13:35 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Sun Apr 17 2022 16:41:22 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 38cec178cdb8c51da8a60fd75abcf265a69a9e98 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Mon, 18 Apr 2022 08:08:55 +0000 Subject: [PATCH 10/26] 464cf330a feat(@angular-devkit/schematics): support null for options parameter from OptionTransform type --- package.json | 22 +++++++++---------- .../schematics-command-module.js | 6 ++--- src/utilities/version.js | 2 +- uniqueId | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 4d8c24081..ef917e804 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+sha-bbf88ab", + "version": "14.0.0-next.9+sha-464cf33", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bbf88abac", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bbf88abac", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bbf88abac", - "@schematics/angular": "github:angular/schematics-angular-builds#bbf88abac", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#464cf330a", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#464cf330a", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#464cf330a", + "@schematics/angular": "github:angular/schematics-angular-builds#464cf330a", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#bbf88abac", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bbf88abac", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#bbf88abac", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#bbf88abac", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bbf88abac", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bbf88abac" + "@angular/cli": "github:angular/cli-builds#464cf330a", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#464cf330a", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#464cf330a", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#464cf330a", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#464cf330a", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#464cf330a" } }, "engines": { diff --git a/src/command-builder/schematics-command-module.js b/src/command-builder/schematics-command-module.js index 573335d44..1b0f2a45e 100644 --- a/src/command-builder/schematics-command-module.js +++ b/src/command-builder/schematics-command-module.js @@ -112,9 +112,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule { optionTransforms: [ // Add configuration file defaults async (schematic, current) => { - const projectName = typeof current.project === 'string' - ? current.project - : this.getProjectName(); + const projectName = typeof (current === null || current === void 0 ? void 0 : current.project) === 'string' ? current.project : this.getProjectName(); return { ...(await (0, config_1.getSchematicDefaults)(schematic.collection.name, schematic.name, projectName)), ...current, @@ -345,4 +343,4 @@ __decorate([ __metadata("design:returntype", Promise) ], SchematicsCommandModule.prototype, "getSchematicCollections", null); exports.SchematicsCommandModule = SchematicsCommandModule; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schematics-command-module.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/src/command-builder/schematics-command-module.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { schema, tags } from '@angular-devkit/core';\nimport { Collection, UnsuccessfulWorkflowExecution, formats } from '@angular-devkit/schematics';\nimport {\n  FileSystemCollectionDescription,\n  FileSystemSchematicDescription,\n  NodeWorkflow,\n} from '@angular-devkit/schematics/tools';\nimport type { CheckboxQuestion, Question } from 'inquirer';\nimport { Argv } from 'yargs';\nimport { getProjectByCwd, getSchematicDefaults } from '../utilities/config';\nimport { memoize } from '../utilities/memoize';\nimport { isTTY } from '../utilities/tty';\nimport {\n  CommandModule,\n  CommandModuleImplementation,\n  CommandScope,\n  Options,\n  OtherOptions,\n} from './command-module';\nimport { Option, parseJsonSchemaToOptions } from './utilities/json-schema';\nimport { SchematicEngineHost } from './utilities/schematic-engine-host';\nimport { subscribeToWorkflow } from './utilities/schematic-workflow';\n\nexport const DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';\n\nexport interface SchematicsCommandArgs {\n  interactive: boolean;\n  force: boolean;\n  'dry-run': boolean;\n  defaults: boolean;\n}\n\nexport interface SchematicsExecutionOptions extends Options<SchematicsCommandArgs> {\n  packageRegistry?: string;\n}\n\nexport abstract class SchematicsCommandModule\n  extends CommandModule<SchematicsCommandArgs>\n  implements CommandModuleImplementation<SchematicsCommandArgs>\n{\n  static override scope = CommandScope.In;\n  protected readonly allowPrivateSchematics: boolean = false;\n  protected override readonly shouldReportAnalytics = false;\n\n  async builder(argv: Argv): Promise<Argv<SchematicsCommandArgs>> {\n    return argv\n      .option('interactive', {\n        describe: 'Enable interactive input prompts.',\n        type: 'boolean',\n        default: true,\n      })\n      .option('dry-run', {\n        describe: 'Run through and reports activity without writing out results.',\n        type: 'boolean',\n        default: false,\n      })\n      .option('defaults', {\n        describe: 'Disable interactive input prompts for options with a default.',\n        type: 'boolean',\n        default: false,\n      })\n      .option('force', {\n        describe: 'Force overwriting of existing files.',\n        type: 'boolean',\n        default: false,\n      })\n      .strict();\n  }\n\n  /** Get schematic schema options.*/\n  protected async getSchematicOptions(\n    collection: Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>,\n    schematicName: string,\n    workflow: NodeWorkflow,\n  ): Promise<Option[]> {\n    const schematic = collection.createSchematic(schematicName, true);\n    const { schemaJson } = schematic.description;\n\n    if (!schemaJson) {\n      return [];\n    }\n\n    return parseJsonSchemaToOptions(workflow.registry, schemaJson);\n  }\n\n  @memoize\n  protected getOrCreateWorkflowForBuilder(collectionName: string): NodeWorkflow {\n    return new NodeWorkflow(this.context.root, {\n      resolvePaths: this.getResolvePaths(collectionName),\n      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),\n    });\n  }\n\n  @memoize\n  protected async getOrCreateWorkflowForExecution(\n    collectionName: string,\n    options: SchematicsExecutionOptions,\n  ): Promise<NodeWorkflow> {\n    const { logger, root, packageManager } = this.context;\n    const { force, dryRun, packageRegistry } = options;\n\n    const workflow = new NodeWorkflow(root, {\n      force,\n      dryRun,\n      packageManager: packageManager.name,\n      // A schema registry is required to allow customizing addUndefinedDefaults\n      registry: new schema.CoreSchemaRegistry(formats.standardFormats),\n      packageRegistry,\n      resolvePaths: this.getResolvePaths(collectionName),\n      schemaValidation: true,\n      optionTransforms: [\n        // Add configuration file defaults\n        async (schematic, current) => {\n          const projectName =\n            typeof (current as Record<string, unknown>).project === 'string'\n              ? ((current as Record<string, unknown>).project as string)\n              : this.getProjectName();\n\n          return {\n            ...(await getSchematicDefaults(schematic.collection.name, schematic.name, projectName)),\n            ...current,\n          };\n        },\n      ],\n      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),\n    });\n\n    workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);\n    workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());\n    workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));\n\n    let shouldReportAnalytics = true;\n    workflow.engineHost.registerOptionsTransform(async (schematic, options) => {\n      if (shouldReportAnalytics) {\n        shouldReportAnalytics = false;\n        // ng generate lib -> ng generate\n        const commandName = this.command?.split(' ', 1)[0];\n\n        await this.reportAnalytics(options as {}, [\n          commandName,\n          schematic.collection.name.replace(/\\//g, '_'),\n          schematic.name.replace(/\\//g, '_'),\n        ]);\n      }\n\n      return options;\n    });\n\n    if (options.interactive !== false && isTTY()) {\n      workflow.registry.usePromptProvider(async (definitions: Array<schema.PromptDefinition>) => {\n        const questions = definitions\n          .filter((definition) => !options.defaults || definition.default === undefined)\n          .map((definition) => {\n            const question: Question = {\n              name: definition.id,\n              message: definition.message,\n              default: definition.default,\n            };\n\n            const validator = definition.validator;\n            if (validator) {\n              question.validate = (input) => validator(input);\n\n              // Filter allows transformation of the value prior to validation\n              question.filter = async (input) => {\n                for (const type of definition.propertyTypes) {\n                  let value;\n                  switch (type) {\n                    case 'string':\n                      value = String(input);\n                      break;\n                    case 'integer':\n                    case 'number':\n                      value = Number(input);\n                      break;\n                    default:\n                      value = input;\n                      break;\n                  }\n                  // Can be a string if validation fails\n                  const isValid = (await validator(value)) === true;\n                  if (isValid) {\n                    return value;\n                  }\n                }\n\n                return input;\n              };\n            }\n\n            switch (definition.type) {\n              case 'confirmation':\n                question.type = 'confirm';\n                break;\n              case 'list':\n                question.type = definition.multiselect ? 'checkbox' : 'list';\n                (question as CheckboxQuestion).choices = definition.items?.map((item) => {\n                  return typeof item == 'string'\n                    ? item\n                    : {\n                        name: item.label,\n                        value: item.value,\n                      };\n                });\n                break;\n              default:\n                question.type = definition.type;\n                break;\n            }\n\n            return question;\n          });\n\n        if (questions.length) {\n          const { prompt } = await import('inquirer');\n\n          return prompt(questions);\n        } else {\n          return {};\n        }\n      });\n    }\n\n    return workflow;\n  }\n\n  @memoize\n  protected async getSchematicCollections(): Promise<Set<string>> {\n    const getSchematicCollections = (\n      configSection: Record<string, unknown> | undefined,\n    ): Set<string> | undefined => {\n      if (!configSection) {\n        return undefined;\n      }\n\n      const { schematicCollections, defaultCollection } = configSection;\n      if (Array.isArray(schematicCollections)) {\n        return new Set(schematicCollections);\n      } else if (typeof defaultCollection === 'string') {\n        return new Set([defaultCollection]);\n      }\n\n      return undefined;\n    };\n\n    const { workspace, globalConfiguration } = this.context;\n    if (workspace) {\n      const project = getProjectByCwd(workspace);\n      if (project) {\n        const value = getSchematicCollections(workspace.getProjectCli(project));\n        if (value) {\n          return value;\n        }\n      }\n    }\n\n    const value =\n      getSchematicCollections(workspace?.getCli()) ??\n      getSchematicCollections(globalConfiguration?.getCli());\n    if (value) {\n      return value;\n    }\n\n    return new Set([DEFAULT_SCHEMATICS_COLLECTION]);\n  }\n\n  protected parseSchematicInfo(\n    schematic: string | undefined,\n  ): [collectionName: string | undefined, schematicName: string | undefined] {\n    if (schematic?.includes(':')) {\n      const [collectionName, schematicName] = schematic.split(':', 2);\n\n      return [collectionName, schematicName];\n    }\n\n    return [undefined, schematic];\n  }\n\n  protected async runSchematic(options: {\n    executionOptions: SchematicsExecutionOptions;\n    schematicOptions: OtherOptions;\n    collectionName: string;\n    schematicName: string;\n  }): Promise<number> {\n    const { logger } = this.context;\n    const { schematicOptions, executionOptions, collectionName, schematicName } = options;\n    const workflow = await this.getOrCreateWorkflowForExecution(collectionName, executionOptions);\n\n    if (!schematicName) {\n      throw new Error('schematicName cannot be undefined.');\n    }\n\n    const { unsubscribe, files } = subscribeToWorkflow(workflow, logger);\n\n    try {\n      await workflow\n        .execute({\n          collection: collectionName,\n          schematic: schematicName,\n          options: schematicOptions,\n          logger,\n          allowPrivate: this.allowPrivateSchematics,\n        })\n        .toPromise();\n\n      if (!files.size) {\n        logger.info('Nothing to be done.');\n      }\n\n      if (executionOptions.dryRun) {\n        logger.warn(`\\nNOTE: The \"--dry-run\" option means no changes were made.`);\n      }\n    } catch (err) {\n      // In case the workflow was not successful, show an appropriate error message.\n      if (err instanceof UnsuccessfulWorkflowExecution) {\n        // \"See above\" because we already printed the error.\n        logger.fatal('The Schematic workflow failed. See above.');\n\n        return 1;\n      } else {\n        throw err;\n      }\n    } finally {\n      unsubscribe();\n    }\n\n    return 0;\n  }\n\n  private defaultProjectDeprecationWarningShown = false;\n  private getProjectName(): string | undefined {\n    const { workspace, logger } = this.context;\n    if (!workspace) {\n      return undefined;\n    }\n\n    const projectName = getProjectByCwd(workspace);\n    if (projectName) {\n      return projectName;\n    }\n\n    const defaultProjectName = workspace.extensions['defaultProject'];\n    if (typeof defaultProjectName === 'string' && defaultProjectName) {\n      if (!this.defaultProjectDeprecationWarningShown) {\n        logger.warn(tags.oneLine`\n            DEPRECATED: The 'defaultProject' workspace option has been deprecated.\n            The project to use will be determined from the current working directory.\n          `);\n\n        this.defaultProjectDeprecationWarningShown = true;\n      }\n\n      return defaultProjectName;\n    }\n\n    return undefined;\n  }\n\n  private getResolvePaths(collectionName: string): string[] {\n    const { workspace, root } = this.context;\n\n    return workspace\n      ? // Workspace\n        collectionName === DEFAULT_SCHEMATICS_COLLECTION\n        ? // Favor __dirname for @schematics/angular to use the build-in version\n          [__dirname, process.cwd(), root]\n        : [process.cwd(), root, __dirname]\n      : // Global\n        [__dirname, process.cwd()];\n  }\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schematics-command-module.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/src/command-builder/schematics-command-module.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { schema, tags } from '@angular-devkit/core';\nimport { Collection, UnsuccessfulWorkflowExecution, formats } from '@angular-devkit/schematics';\nimport {\n  FileSystemCollectionDescription,\n  FileSystemSchematicDescription,\n  NodeWorkflow,\n} from '@angular-devkit/schematics/tools';\nimport type { CheckboxQuestion, Question } from 'inquirer';\nimport { Argv } from 'yargs';\nimport { getProjectByCwd, getSchematicDefaults } from '../utilities/config';\nimport { memoize } from '../utilities/memoize';\nimport { isTTY } from '../utilities/tty';\nimport {\n  CommandModule,\n  CommandModuleImplementation,\n  CommandScope,\n  Options,\n  OtherOptions,\n} from './command-module';\nimport { Option, parseJsonSchemaToOptions } from './utilities/json-schema';\nimport { SchematicEngineHost } from './utilities/schematic-engine-host';\nimport { subscribeToWorkflow } from './utilities/schematic-workflow';\n\nexport const DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';\n\nexport interface SchematicsCommandArgs {\n  interactive: boolean;\n  force: boolean;\n  'dry-run': boolean;\n  defaults: boolean;\n}\n\nexport interface SchematicsExecutionOptions extends Options<SchematicsCommandArgs> {\n  packageRegistry?: string;\n}\n\nexport abstract class SchematicsCommandModule\n  extends CommandModule<SchematicsCommandArgs>\n  implements CommandModuleImplementation<SchematicsCommandArgs>\n{\n  static override scope = CommandScope.In;\n  protected readonly allowPrivateSchematics: boolean = false;\n  protected override readonly shouldReportAnalytics = false;\n\n  async builder(argv: Argv): Promise<Argv<SchematicsCommandArgs>> {\n    return argv\n      .option('interactive', {\n        describe: 'Enable interactive input prompts.',\n        type: 'boolean',\n        default: true,\n      })\n      .option('dry-run', {\n        describe: 'Run through and reports activity without writing out results.',\n        type: 'boolean',\n        default: false,\n      })\n      .option('defaults', {\n        describe: 'Disable interactive input prompts for options with a default.',\n        type: 'boolean',\n        default: false,\n      })\n      .option('force', {\n        describe: 'Force overwriting of existing files.',\n        type: 'boolean',\n        default: false,\n      })\n      .strict();\n  }\n\n  /** Get schematic schema options.*/\n  protected async getSchematicOptions(\n    collection: Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>,\n    schematicName: string,\n    workflow: NodeWorkflow,\n  ): Promise<Option[]> {\n    const schematic = collection.createSchematic(schematicName, true);\n    const { schemaJson } = schematic.description;\n\n    if (!schemaJson) {\n      return [];\n    }\n\n    return parseJsonSchemaToOptions(workflow.registry, schemaJson);\n  }\n\n  @memoize\n  protected getOrCreateWorkflowForBuilder(collectionName: string): NodeWorkflow {\n    return new NodeWorkflow(this.context.root, {\n      resolvePaths: this.getResolvePaths(collectionName),\n      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),\n    });\n  }\n\n  @memoize\n  protected async getOrCreateWorkflowForExecution(\n    collectionName: string,\n    options: SchematicsExecutionOptions,\n  ): Promise<NodeWorkflow> {\n    const { logger, root, packageManager } = this.context;\n    const { force, dryRun, packageRegistry } = options;\n\n    const workflow = new NodeWorkflow(root, {\n      force,\n      dryRun,\n      packageManager: packageManager.name,\n      // A schema registry is required to allow customizing addUndefinedDefaults\n      registry: new schema.CoreSchemaRegistry(formats.standardFormats),\n      packageRegistry,\n      resolvePaths: this.getResolvePaths(collectionName),\n      schemaValidation: true,\n      optionTransforms: [\n        // Add configuration file defaults\n        async (schematic, current) => {\n          const projectName =\n            typeof current?.project === 'string' ? current.project : this.getProjectName();\n\n          return {\n            ...(await getSchematicDefaults(schematic.collection.name, schematic.name, projectName)),\n            ...current,\n          };\n        },\n      ],\n      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),\n    });\n\n    workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);\n    workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());\n    workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));\n\n    let shouldReportAnalytics = true;\n    workflow.engineHost.registerOptionsTransform(async (schematic, options) => {\n      if (shouldReportAnalytics) {\n        shouldReportAnalytics = false;\n        // ng generate lib -> ng generate\n        const commandName = this.command?.split(' ', 1)[0];\n\n        await this.reportAnalytics(options as {}, [\n          commandName,\n          schematic.collection.name.replace(/\\//g, '_'),\n          schematic.name.replace(/\\//g, '_'),\n        ]);\n      }\n\n      return options;\n    });\n\n    if (options.interactive !== false && isTTY()) {\n      workflow.registry.usePromptProvider(async (definitions: Array<schema.PromptDefinition>) => {\n        const questions = definitions\n          .filter((definition) => !options.defaults || definition.default === undefined)\n          .map((definition) => {\n            const question: Question = {\n              name: definition.id,\n              message: definition.message,\n              default: definition.default,\n            };\n\n            const validator = definition.validator;\n            if (validator) {\n              question.validate = (input) => validator(input);\n\n              // Filter allows transformation of the value prior to validation\n              question.filter = async (input) => {\n                for (const type of definition.propertyTypes) {\n                  let value;\n                  switch (type) {\n                    case 'string':\n                      value = String(input);\n                      break;\n                    case 'integer':\n                    case 'number':\n                      value = Number(input);\n                      break;\n                    default:\n                      value = input;\n                      break;\n                  }\n                  // Can be a string if validation fails\n                  const isValid = (await validator(value)) === true;\n                  if (isValid) {\n                    return value;\n                  }\n                }\n\n                return input;\n              };\n            }\n\n            switch (definition.type) {\n              case 'confirmation':\n                question.type = 'confirm';\n                break;\n              case 'list':\n                question.type = definition.multiselect ? 'checkbox' : 'list';\n                (question as CheckboxQuestion).choices = definition.items?.map((item) => {\n                  return typeof item == 'string'\n                    ? item\n                    : {\n                        name: item.label,\n                        value: item.value,\n                      };\n                });\n                break;\n              default:\n                question.type = definition.type;\n                break;\n            }\n\n            return question;\n          });\n\n        if (questions.length) {\n          const { prompt } = await import('inquirer');\n\n          return prompt(questions);\n        } else {\n          return {};\n        }\n      });\n    }\n\n    return workflow;\n  }\n\n  @memoize\n  protected async getSchematicCollections(): Promise<Set<string>> {\n    const getSchematicCollections = (\n      configSection: Record<string, unknown> | undefined,\n    ): Set<string> | undefined => {\n      if (!configSection) {\n        return undefined;\n      }\n\n      const { schematicCollections, defaultCollection } = configSection;\n      if (Array.isArray(schematicCollections)) {\n        return new Set(schematicCollections);\n      } else if (typeof defaultCollection === 'string') {\n        return new Set([defaultCollection]);\n      }\n\n      return undefined;\n    };\n\n    const { workspace, globalConfiguration } = this.context;\n    if (workspace) {\n      const project = getProjectByCwd(workspace);\n      if (project) {\n        const value = getSchematicCollections(workspace.getProjectCli(project));\n        if (value) {\n          return value;\n        }\n      }\n    }\n\n    const value =\n      getSchematicCollections(workspace?.getCli()) ??\n      getSchematicCollections(globalConfiguration?.getCli());\n    if (value) {\n      return value;\n    }\n\n    return new Set([DEFAULT_SCHEMATICS_COLLECTION]);\n  }\n\n  protected parseSchematicInfo(\n    schematic: string | undefined,\n  ): [collectionName: string | undefined, schematicName: string | undefined] {\n    if (schematic?.includes(':')) {\n      const [collectionName, schematicName] = schematic.split(':', 2);\n\n      return [collectionName, schematicName];\n    }\n\n    return [undefined, schematic];\n  }\n\n  protected async runSchematic(options: {\n    executionOptions: SchematicsExecutionOptions;\n    schematicOptions: OtherOptions;\n    collectionName: string;\n    schematicName: string;\n  }): Promise<number> {\n    const { logger } = this.context;\n    const { schematicOptions, executionOptions, collectionName, schematicName } = options;\n    const workflow = await this.getOrCreateWorkflowForExecution(collectionName, executionOptions);\n\n    if (!schematicName) {\n      throw new Error('schematicName cannot be undefined.');\n    }\n\n    const { unsubscribe, files } = subscribeToWorkflow(workflow, logger);\n\n    try {\n      await workflow\n        .execute({\n          collection: collectionName,\n          schematic: schematicName,\n          options: schematicOptions,\n          logger,\n          allowPrivate: this.allowPrivateSchematics,\n        })\n        .toPromise();\n\n      if (!files.size) {\n        logger.info('Nothing to be done.');\n      }\n\n      if (executionOptions.dryRun) {\n        logger.warn(`\\nNOTE: The \"--dry-run\" option means no changes were made.`);\n      }\n    } catch (err) {\n      // In case the workflow was not successful, show an appropriate error message.\n      if (err instanceof UnsuccessfulWorkflowExecution) {\n        // \"See above\" because we already printed the error.\n        logger.fatal('The Schematic workflow failed. See above.');\n\n        return 1;\n      } else {\n        throw err;\n      }\n    } finally {\n      unsubscribe();\n    }\n\n    return 0;\n  }\n\n  private defaultProjectDeprecationWarningShown = false;\n  private getProjectName(): string | undefined {\n    const { workspace, logger } = this.context;\n    if (!workspace) {\n      return undefined;\n    }\n\n    const projectName = getProjectByCwd(workspace);\n    if (projectName) {\n      return projectName;\n    }\n\n    const defaultProjectName = workspace.extensions['defaultProject'];\n    if (typeof defaultProjectName === 'string' && defaultProjectName) {\n      if (!this.defaultProjectDeprecationWarningShown) {\n        logger.warn(tags.oneLine`\n            DEPRECATED: The 'defaultProject' workspace option has been deprecated.\n            The project to use will be determined from the current working directory.\n          `);\n\n        this.defaultProjectDeprecationWarningShown = true;\n      }\n\n      return defaultProjectName;\n    }\n\n    return undefined;\n  }\n\n  private getResolvePaths(collectionName: string): string[] {\n    const { workspace, root } = this.context;\n\n    return workspace\n      ? // Workspace\n        collectionName === DEFAULT_SCHEMATICS_COLLECTION\n        ? // Favor __dirname for @schematics/angular to use the build-in version\n          [__dirname, process.cwd(), root]\n        : [process.cwd(), root, __dirname]\n      : // Global\n        [__dirname, process.cwd()];\n  }\n}\n"]} \ No newline at end of file diff --git a/src/utilities/version.js b/src/utilities/version.js index 94f6dac1c..aa03e5199 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+sha-bbf88ab'); +// export const VERSION = new Version('14.0.0-next.9+sha-464cf33'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index a09f954fc..7def796f9 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Sun Apr 17 2022 16:41:22 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Mon Apr 18 2022 08:08:55 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From b5cec75362a10f24800bed2e8f52d2901230d706 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 20 Apr 2022 15:53:06 +0000 Subject: [PATCH 11/26] d6ecb66f3 build: update all non-major dependencies --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index ef917e804..7024e8531 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+sha-464cf33", + "version": "14.0.0-next.9+sha-d6ecb66", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#464cf330a", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#464cf330a", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#464cf330a", - "@schematics/angular": "github:angular/schematics-angular-builds#464cf330a", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d6ecb66f3", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d6ecb66f3", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d6ecb66f3", + "@schematics/angular": "github:angular/schematics-angular-builds#d6ecb66f3", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#464cf330a", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#464cf330a", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#464cf330a", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#464cf330a", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#464cf330a", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#464cf330a" + "@angular/cli": "github:angular/cli-builds#d6ecb66f3", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d6ecb66f3", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#d6ecb66f3", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d6ecb66f3", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d6ecb66f3", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d6ecb66f3" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index aa03e5199..c1c6effff 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+sha-464cf33'); +// export const VERSION = new Version('14.0.0-next.9+sha-d6ecb66'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 7def796f9..05c5d22c8 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Mon Apr 18 2022 08:08:55 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 20 2022 15:53:06 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 76988f8ffa6ed169f7c80e22b7e6cca3fbe4d36c Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 21 Apr 2022 01:47:58 +0000 Subject: [PATCH 12/26] fbd6b51ef release: cut the v14.0.0-next.10 release --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7024e8531..7540d650d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.9+sha-d6ecb66", + "version": "14.0.0-next.10+sha-fbd6b51", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d6ecb66f3", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d6ecb66f3", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d6ecb66f3", - "@schematics/angular": "github:angular/schematics-angular-builds#d6ecb66f3", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#fbd6b51ef", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#fbd6b51ef", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#fbd6b51ef", + "@schematics/angular": "github:angular/schematics-angular-builds#fbd6b51ef", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#d6ecb66f3", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d6ecb66f3", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#d6ecb66f3", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d6ecb66f3", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d6ecb66f3", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d6ecb66f3" + "@angular/cli": "github:angular/cli-builds#fbd6b51ef", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#fbd6b51ef", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#fbd6b51ef", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#fbd6b51ef", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#fbd6b51ef", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#fbd6b51ef" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index c1c6effff..db0e1c0e4 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.9+sha-d6ecb66'); +// export const VERSION = new Version('14.0.0-next.10+sha-fbd6b51'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 05c5d22c8..5b45cf116 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 20 2022 15:53:06 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 21 2022 01:47:58 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From e6d4bee65fb22286a895d63453646adc1b26ae48 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Thu, 21 Apr 2022 17:16:28 +0000 Subject: [PATCH 13/26] b29878651 build: preparation for primary branch rename in the Angular repos --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7540d650d..fdccca415 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.10+sha-fbd6b51", + "version": "14.0.0-next.11+sha-b298786", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#fbd6b51ef", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#fbd6b51ef", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#fbd6b51ef", - "@schematics/angular": "github:angular/schematics-angular-builds#fbd6b51ef", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b29878651", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#b29878651", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#b29878651", + "@schematics/angular": "github:angular/schematics-angular-builds#b29878651", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#fbd6b51ef", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#fbd6b51ef", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#fbd6b51ef", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#fbd6b51ef", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#fbd6b51ef", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#fbd6b51ef" + "@angular/cli": "github:angular/cli-builds#b29878651", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b29878651", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#b29878651", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#b29878651", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#b29878651", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#b29878651" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index db0e1c0e4..e0758c90f 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.10+sha-fbd6b51'); +// export const VERSION = new Version('14.0.0-next.11+sha-b298786'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 5b45cf116..59e4ed27e 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 21 2022 01:47:58 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Apr 21 2022 17:16:28 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From f4b3a8b87ca37191fb5ffd4ec0f2e61093b6d059 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Fri, 22 Apr 2022 16:04:19 +0000 Subject: [PATCH 14/26] 8b3676207 build: update angular --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index fdccca415..a30860479 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-b298786", + "version": "14.0.0-next.11+sha-8b36762", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b29878651", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#b29878651", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#b29878651", - "@schematics/angular": "github:angular/schematics-angular-builds#b29878651", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8b3676207", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8b3676207", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#8b3676207", + "@schematics/angular": "github:angular/schematics-angular-builds#8b3676207", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#b29878651", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b29878651", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#b29878651", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#b29878651", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#b29878651", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#b29878651" + "@angular/cli": "github:angular/cli-builds#8b3676207", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8b3676207", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#8b3676207", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#8b3676207", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8b3676207", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#8b3676207" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index e0758c90f..27f076824 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-b298786'); +// export const VERSION = new Version('14.0.0-next.11+sha-8b36762'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 59e4ed27e..07cdfbdf2 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Apr 21 2022 17:16:28 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Apr 22 2022 16:04:19 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 3b4bba934876a34df370680b1ec975450eb229b2 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Fri, 22 Apr 2022 16:06:08 +0000 Subject: [PATCH 15/26] ccd7e71a4 refactor(@schematics/angular): minor cleanup of unneeded `@angular-devkit/core` imports --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a30860479..90f317b28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-8b36762", + "version": "14.0.0-next.11+sha-ccd7e71", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8b3676207", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8b3676207", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#8b3676207", - "@schematics/angular": "github:angular/schematics-angular-builds#8b3676207", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ccd7e71a4", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ccd7e71a4", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ccd7e71a4", + "@schematics/angular": "github:angular/schematics-angular-builds#ccd7e71a4", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#8b3676207", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8b3676207", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#8b3676207", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#8b3676207", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8b3676207", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#8b3676207" + "@angular/cli": "github:angular/cli-builds#ccd7e71a4", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ccd7e71a4", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ccd7e71a4", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ccd7e71a4", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ccd7e71a4", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ccd7e71a4" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 27f076824..9155d3f43 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-8b36762'); +// export const VERSION = new Version('14.0.0-next.11+sha-ccd7e71'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 07cdfbdf2..f63718ba3 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Apr 22 2022 16:04:19 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Apr 22 2022 16:06:08 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 293ae2cdb9ba1e4d313d274820116b07dae1f7bd Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Fri, 22 Apr 2022 20:40:10 +0000 Subject: [PATCH 16/26] ba92525e0 build: update actions/checkout action to v3.0.2 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 90f317b28..f5756ee64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-ccd7e71", + "version": "14.0.0-next.11+sha-ba92525", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ccd7e71a4", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ccd7e71a4", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ccd7e71a4", - "@schematics/angular": "github:angular/schematics-angular-builds#ccd7e71a4", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ba92525e0", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ba92525e0", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ba92525e0", + "@schematics/angular": "github:angular/schematics-angular-builds#ba92525e0", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#ccd7e71a4", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ccd7e71a4", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ccd7e71a4", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ccd7e71a4", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ccd7e71a4", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ccd7e71a4" + "@angular/cli": "github:angular/cli-builds#ba92525e0", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ba92525e0", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ba92525e0", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ba92525e0", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ba92525e0", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ba92525e0" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 9155d3f43..670e06ba2 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-ccd7e71'); +// export const VERSION = new Version('14.0.0-next.11+sha-ba92525'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index f63718ba3..2df7d7895 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Apr 22 2022 16:06:08 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Apr 22 2022 20:40:10 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 36ba1fa20eccf58b6442acfa5f2beabf577f80b5 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Sat, 23 Apr 2022 01:19:49 +0000 Subject: [PATCH 17/26] ef23b39dd ci: add initial E2E test subset for experimental esbuild builder --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index f5756ee64..30ab78838 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-ba92525", + "version": "14.0.0-next.11+sha-ef23b39", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ba92525e0", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ba92525e0", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ba92525e0", - "@schematics/angular": "github:angular/schematics-angular-builds#ba92525e0", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ef23b39dd", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ef23b39dd", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ef23b39dd", + "@schematics/angular": "github:angular/schematics-angular-builds#ef23b39dd", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#ba92525e0", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ba92525e0", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ba92525e0", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ba92525e0", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ba92525e0", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ba92525e0" + "@angular/cli": "github:angular/cli-builds#ef23b39dd", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ef23b39dd", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ef23b39dd", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ef23b39dd", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ef23b39dd", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ef23b39dd" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 670e06ba2..3480b1e1a 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-ba92525'); +// export const VERSION = new Version('14.0.0-next.11+sha-ef23b39'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 2df7d7895..261e61492 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Apr 22 2022 20:40:10 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Sat Apr 23 2022 01:19:49 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From f1167dd05e35e75fe285d13a87fc6a93c7c05acb Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Mon, 25 Apr 2022 16:56:01 +0000 Subject: [PATCH 18/26] 94288c741 build: update angular to e9949aa --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 30ab78838..a76a3d4e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-ef23b39", + "version": "14.0.0-next.11+sha-94288c7", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ef23b39dd", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ef23b39dd", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ef23b39dd", - "@schematics/angular": "github:angular/schematics-angular-builds#ef23b39dd", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#94288c741", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#94288c741", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#94288c741", + "@schematics/angular": "github:angular/schematics-angular-builds#94288c741", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#ef23b39dd", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ef23b39dd", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ef23b39dd", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ef23b39dd", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#ef23b39dd", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#ef23b39dd" + "@angular/cli": "github:angular/cli-builds#94288c741", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#94288c741", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#94288c741", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#94288c741", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#94288c741", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#94288c741" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 3480b1e1a..c22626cee 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-ef23b39'); +// export const VERSION = new Version('14.0.0-next.11+sha-94288c7'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 261e61492..5cb00d8c9 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Sat Apr 23 2022 01:19:49 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Mon Apr 25 2022 16:56:01 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 9f5c2a2755adb40fd35bc9741333b27f00012304 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Tue, 26 Apr 2022 21:49:25 +0000 Subject: [PATCH 19/26] 044101554 perf(@ngtools/webpack): use Webpack's built-in xxhash64 support --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a76a3d4e2..a72eee81a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-94288c7", + "version": "14.0.0-next.11+sha-0441015", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#94288c741", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#94288c741", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#94288c741", - "@schematics/angular": "github:angular/schematics-angular-builds#94288c741", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#044101554", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#044101554", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#044101554", + "@schematics/angular": "github:angular/schematics-angular-builds#044101554", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#94288c741", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#94288c741", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#94288c741", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#94288c741", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#94288c741", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#94288c741" + "@angular/cli": "github:angular/cli-builds#044101554", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#044101554", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#044101554", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#044101554", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#044101554", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#044101554" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index c22626cee..e6fbd1ae8 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-94288c7'); +// export const VERSION = new Version('14.0.0-next.11+sha-0441015'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 5cb00d8c9..97bda3496 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Mon Apr 25 2022 16:56:01 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Tue Apr 26 2022 21:49:25 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 32a6ca500c0356c75e6e344cd3ca4c054ff52c95 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 00:02:02 +0000 Subject: [PATCH 20/26] a0e3de2b5 refactor(@schematics/angular): use Tree's newly introduced `readText` and `readJSON` functionality --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a72eee81a..b4826c75b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-0441015", + "version": "14.0.0-next.11+sha-a0e3de2", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#044101554", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#044101554", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#044101554", - "@schematics/angular": "github:angular/schematics-angular-builds#044101554", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a0e3de2b5", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a0e3de2b5", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#a0e3de2b5", + "@schematics/angular": "github:angular/schematics-angular-builds#a0e3de2b5", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#044101554", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#044101554", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#044101554", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#044101554", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#044101554", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#044101554" + "@angular/cli": "github:angular/cli-builds#a0e3de2b5", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a0e3de2b5", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#a0e3de2b5", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#a0e3de2b5", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a0e3de2b5", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#a0e3de2b5" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index e6fbd1ae8..77de4dc43 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-0441015'); +// export const VERSION = new Version('14.0.0-next.11+sha-a0e3de2'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 97bda3496..0e3285e3b 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Tue Apr 26 2022 21:49:25 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 00:02:02 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 8b1777310a397dbd52dad34aff0e94732d32d87c Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 17:04:21 +0000 Subject: [PATCH 21/26] 4b07aa345 fix(@angular/cli): change wrapping of schematic code --- package.json | 22 +++++++++---------- .../utilities/schematic-engine-host.js | 6 +++-- src/utilities/version.js | 2 +- uniqueId | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index b4826c75b..acfc99ef6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-a0e3de2", + "version": "14.0.0-next.11+sha-4b07aa3", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a0e3de2b5", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a0e3de2b5", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#a0e3de2b5", - "@schematics/angular": "github:angular/schematics-angular-builds#a0e3de2b5", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4b07aa345", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4b07aa345", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#4b07aa345", + "@schematics/angular": "github:angular/schematics-angular-builds#4b07aa345", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#a0e3de2b5", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a0e3de2b5", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#a0e3de2b5", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#a0e3de2b5", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a0e3de2b5", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#a0e3de2b5" + "@angular/cli": "github:angular/cli-builds#4b07aa345", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4b07aa345", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#4b07aa345", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#4b07aa345", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4b07aa345", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#4b07aa345" } }, "engines": { diff --git a/src/command-builder/utilities/schematic-engine-host.js b/src/command-builder/utilities/schematic-engine-host.js index 76f9f924e..1e17fad72 100644 --- a/src/command-builder/utilities/schematic-engine-host.js +++ b/src/command-builder/utilities/schematic-engine-host.js @@ -161,7 +161,9 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) { const schematicCode = (0, fs_1.readFileSync)(schematicFile, 'utf8'); // `module` is required due to @angular/localize ng-add being in UMD format const headerCode = '(function() {\nvar exports = {};\nvar module = { exports };\n'; - const footerCode = exportName ? `\nreturn exports['${exportName}'];});` : '\nreturn exports;});'; + const footerCode = exportName + ? `\nreturn module.exports['${exportName}'];});` + : '\nreturn module.exports;});'; const script = new vm_1.Script(headerCode + schematicCode + footerCode, { filename: schematicFile, lineOffset: 3, @@ -183,4 +185,4 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) { function loadBuiltinModule(id) { return undefined; } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schematic-engine-host.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/cli/src/command-builder/utilities/schematic-engine-host.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { RuleFactory, SchematicsException, Tree } from '@angular-devkit/schematics';\nimport { FileSystemCollectionDesc, NodeModulesEngineHost } from '@angular-devkit/schematics/tools';\nimport { readFileSync } from 'fs';\nimport { parse as parseJson } from 'jsonc-parser';\nimport nodeModule from 'module';\nimport { dirname, resolve } from 'path';\nimport { Script } from 'vm';\n\n/**\n * Environment variable to control schematic package redirection\n */\nconst schematicRedirectVariable = process.env['NG_SCHEMATIC_REDIRECT']?.toLowerCase();\n\nfunction shouldWrapSchematic(schematicFile: string, schematicEncapsulation: boolean): boolean {\n  // Check environment variable if present\n  switch (schematicRedirectVariable) {\n    case '0':\n    case 'false':\n    case 'off':\n    case 'none':\n      return false;\n    case 'all':\n      return true;\n  }\n\n  const normalizedSchematicFile = schematicFile.replace(/\\\\/g, '/');\n  // Never wrap the internal update schematic when executed directly\n  // It communicates with the update command via `global`\n  // But we still want to redirect schematics located in `@angular/cli/node_modules`.\n  if (\n    normalizedSchematicFile.includes('node_modules/@angular/cli/') &&\n    !normalizedSchematicFile.includes('node_modules/@angular/cli/node_modules/')\n  ) {\n    return false;\n  }\n\n  // Check for first-party Angular schematic packages\n  // Angular schematics are safe to use in the wrapped VM context\n  if (/\\/node_modules\\/@(?:angular|schematics|nguniversal)\\//.test(normalizedSchematicFile)) {\n    return true;\n  }\n\n  // Otherwise use the value of the schematic collection's encapsulation option (current default of false)\n  return schematicEncapsulation;\n}\n\nexport class SchematicEngineHost extends NodeModulesEngineHost {\n  protected override _resolveReferenceString(\n    refString: string,\n    parentPath: string,\n    collectionDescription?: FileSystemCollectionDesc,\n  ) {\n    const [path, name] = refString.split('#', 2);\n    // Mimic behavior of ExportStringRef class used in default behavior\n    const fullPath = path[0] === '.' ? resolve(parentPath ?? process.cwd(), path) : path;\n\n    const schematicFile = require.resolve(fullPath, { paths: [parentPath] });\n\n    if (shouldWrapSchematic(schematicFile, !!collectionDescription?.encapsulation)) {\n      const schematicPath = dirname(schematicFile);\n\n      const moduleCache = new Map<string, unknown>();\n      const factoryInitializer = wrap(\n        schematicFile,\n        schematicPath,\n        moduleCache,\n        name || 'default',\n      ) as () => RuleFactory<{}>;\n\n      const factory = factoryInitializer();\n      if (!factory || typeof factory !== 'function') {\n        return null;\n      }\n\n      return { ref: factory, path: schematicPath };\n    }\n\n    // All other schematics use default behavior\n    return super._resolveReferenceString(refString, parentPath, collectionDescription);\n  }\n}\n\n/**\n * Minimal shim modules for legacy deep imports of `@schematics/angular`\n */\nconst legacyModules: Record<string, unknown> = {\n  '@schematics/angular/utility/config': {\n    getWorkspace(host: Tree) {\n      const path = '/.angular.json';\n      const data = host.read(path);\n      if (!data) {\n        throw new SchematicsException(`Could not find (${path})`);\n      }\n\n      return parseJson(data.toString(), [], { allowTrailingComma: true });\n    },\n  },\n  '@schematics/angular/utility/project': {\n    buildDefaultPath(project: { sourceRoot?: string; root: string; projectType: string }): string {\n      const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;\n\n      return `${root}${project.projectType === 'application' ? 'app' : 'lib'}`;\n    },\n  },\n};\n\n/**\n * Wrap a JavaScript file in a VM context to allow specific Angular dependencies to be redirected.\n * This VM setup is ONLY intended to redirect dependencies.\n *\n * @param schematicFile A JavaScript schematic file path that should be wrapped.\n * @param schematicDirectory A directory that will be used as the location of the JavaScript file.\n * @param moduleCache A map to use for caching repeat module usage and proper `instanceof` support.\n * @param exportName An optional name of a specific export to return. Otherwise, return all exports.\n */\nfunction wrap(\n  schematicFile: string,\n  schematicDirectory: string,\n  moduleCache: Map<string, unknown>,\n  exportName?: string,\n): () => unknown {\n  const hostRequire = nodeModule.createRequire(__filename);\n  const schematicRequire = nodeModule.createRequire(schematicFile);\n\n  const customRequire = function (id: string) {\n    if (legacyModules[id]) {\n      // Provide compatibility modules for older versions of @angular/cdk\n      return legacyModules[id];\n    } else if (id.startsWith('schematics:')) {\n      // Schematics built-in modules use the `schematics` scheme (similar to the Node.js `node` scheme)\n      const builtinId = id.slice(11);\n      const builtinModule = loadBuiltinModule(builtinId);\n      if (!builtinModule) {\n        throw new Error(\n          `Unknown schematics built-in module '${id}' requested from schematic '${schematicFile}'`,\n        );\n      }\n\n      return builtinModule;\n    } else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {\n      // Files should not redirect `@angular/core` and instead use the direct\n      // dependency if available. This allows old major version migrations to continue to function\n      // even though the latest major version may have breaking changes in `@angular/core`.\n      if (id.startsWith('@angular-devkit/core')) {\n        try {\n          return schematicRequire(id);\n        } catch (e) {\n          if (e.code !== 'MODULE_NOT_FOUND') {\n            throw e;\n          }\n        }\n      }\n\n      // Resolve from inside the `@angular/cli` project\n      return hostRequire(id);\n    } else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {\n      // Wrap relative files inside the schematic collection\n      // Also wrap `@angular/cdk`, it contains helper utilities that import core schematic packages\n\n      // Resolve from the original file\n      const modulePath = schematicRequire.resolve(id);\n\n      // Use cached module if available\n      const cachedModule = moduleCache.get(modulePath);\n      if (cachedModule) {\n        return cachedModule;\n      }\n\n      // Do not wrap vendored third-party packages or JSON files\n      if (\n        !/[/\\\\]node_modules[/\\\\]@schematics[/\\\\]angular[/\\\\]third_party[/\\\\]/.test(modulePath) &&\n        !modulePath.endsWith('.json')\n      ) {\n        // Wrap module and save in cache\n        const wrappedModule = wrap(modulePath, dirname(modulePath), moduleCache)();\n        moduleCache.set(modulePath, wrappedModule);\n\n        return wrappedModule;\n      }\n    }\n\n    // All others are required directly from the original file\n    return schematicRequire(id);\n  };\n\n  // Setup a wrapper function to capture the module's exports\n  const schematicCode = readFileSync(schematicFile, 'utf8');\n  // `module` is required due to @angular/localize ng-add being in UMD format\n  const headerCode = '(function() {\\nvar exports = {};\\nvar module = { exports };\\n';\n  const footerCode = exportName ? `\\nreturn exports['${exportName}'];});` : '\\nreturn exports;});';\n\n  const script = new Script(headerCode + schematicCode + footerCode, {\n    filename: schematicFile,\n    lineOffset: 3,\n  });\n\n  const context = {\n    __dirname: schematicDirectory,\n    __filename: schematicFile,\n    Buffer,\n    console,\n    process,\n    get global() {\n      return this;\n    },\n    require: customRequire,\n  };\n\n  const exportsFactory = script.runInNewContext(context);\n\n  return exportsFactory;\n}\n\nfunction loadBuiltinModule(id: string): unknown {\n  return undefined;\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schematic-engine-host.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/cli/src/command-builder/utilities/schematic-engine-host.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { RuleFactory, SchematicsException, Tree } from '@angular-devkit/schematics';\nimport { FileSystemCollectionDesc, NodeModulesEngineHost } from '@angular-devkit/schematics/tools';\nimport { readFileSync } from 'fs';\nimport { parse as parseJson } from 'jsonc-parser';\nimport nodeModule from 'module';\nimport { dirname, resolve } from 'path';\nimport { Script } from 'vm';\n\n/**\n * Environment variable to control schematic package redirection\n */\nconst schematicRedirectVariable = process.env['NG_SCHEMATIC_REDIRECT']?.toLowerCase();\n\nfunction shouldWrapSchematic(schematicFile: string, schematicEncapsulation: boolean): boolean {\n  // Check environment variable if present\n  switch (schematicRedirectVariable) {\n    case '0':\n    case 'false':\n    case 'off':\n    case 'none':\n      return false;\n    case 'all':\n      return true;\n  }\n\n  const normalizedSchematicFile = schematicFile.replace(/\\\\/g, '/');\n  // Never wrap the internal update schematic when executed directly\n  // It communicates with the update command via `global`\n  // But we still want to redirect schematics located in `@angular/cli/node_modules`.\n  if (\n    normalizedSchematicFile.includes('node_modules/@angular/cli/') &&\n    !normalizedSchematicFile.includes('node_modules/@angular/cli/node_modules/')\n  ) {\n    return false;\n  }\n\n  // Check for first-party Angular schematic packages\n  // Angular schematics are safe to use in the wrapped VM context\n  if (/\\/node_modules\\/@(?:angular|schematics|nguniversal)\\//.test(normalizedSchematicFile)) {\n    return true;\n  }\n\n  // Otherwise use the value of the schematic collection's encapsulation option (current default of false)\n  return schematicEncapsulation;\n}\n\nexport class SchematicEngineHost extends NodeModulesEngineHost {\n  protected override _resolveReferenceString(\n    refString: string,\n    parentPath: string,\n    collectionDescription?: FileSystemCollectionDesc,\n  ) {\n    const [path, name] = refString.split('#', 2);\n    // Mimic behavior of ExportStringRef class used in default behavior\n    const fullPath = path[0] === '.' ? resolve(parentPath ?? process.cwd(), path) : path;\n\n    const schematicFile = require.resolve(fullPath, { paths: [parentPath] });\n\n    if (shouldWrapSchematic(schematicFile, !!collectionDescription?.encapsulation)) {\n      const schematicPath = dirname(schematicFile);\n\n      const moduleCache = new Map<string, unknown>();\n      const factoryInitializer = wrap(\n        schematicFile,\n        schematicPath,\n        moduleCache,\n        name || 'default',\n      ) as () => RuleFactory<{}>;\n\n      const factory = factoryInitializer();\n      if (!factory || typeof factory !== 'function') {\n        return null;\n      }\n\n      return { ref: factory, path: schematicPath };\n    }\n\n    // All other schematics use default behavior\n    return super._resolveReferenceString(refString, parentPath, collectionDescription);\n  }\n}\n\n/**\n * Minimal shim modules for legacy deep imports of `@schematics/angular`\n */\nconst legacyModules: Record<string, unknown> = {\n  '@schematics/angular/utility/config': {\n    getWorkspace(host: Tree) {\n      const path = '/.angular.json';\n      const data = host.read(path);\n      if (!data) {\n        throw new SchematicsException(`Could not find (${path})`);\n      }\n\n      return parseJson(data.toString(), [], { allowTrailingComma: true });\n    },\n  },\n  '@schematics/angular/utility/project': {\n    buildDefaultPath(project: { sourceRoot?: string; root: string; projectType: string }): string {\n      const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;\n\n      return `${root}${project.projectType === 'application' ? 'app' : 'lib'}`;\n    },\n  },\n};\n\n/**\n * Wrap a JavaScript file in a VM context to allow specific Angular dependencies to be redirected.\n * This VM setup is ONLY intended to redirect dependencies.\n *\n * @param schematicFile A JavaScript schematic file path that should be wrapped.\n * @param schematicDirectory A directory that will be used as the location of the JavaScript file.\n * @param moduleCache A map to use for caching repeat module usage and proper `instanceof` support.\n * @param exportName An optional name of a specific export to return. Otherwise, return all exports.\n */\nfunction wrap(\n  schematicFile: string,\n  schematicDirectory: string,\n  moduleCache: Map<string, unknown>,\n  exportName?: string,\n): () => unknown {\n  const hostRequire = nodeModule.createRequire(__filename);\n  const schematicRequire = nodeModule.createRequire(schematicFile);\n\n  const customRequire = function (id: string) {\n    if (legacyModules[id]) {\n      // Provide compatibility modules for older versions of @angular/cdk\n      return legacyModules[id];\n    } else if (id.startsWith('schematics:')) {\n      // Schematics built-in modules use the `schematics` scheme (similar to the Node.js `node` scheme)\n      const builtinId = id.slice(11);\n      const builtinModule = loadBuiltinModule(builtinId);\n      if (!builtinModule) {\n        throw new Error(\n          `Unknown schematics built-in module '${id}' requested from schematic '${schematicFile}'`,\n        );\n      }\n\n      return builtinModule;\n    } else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {\n      // Files should not redirect `@angular/core` and instead use the direct\n      // dependency if available. This allows old major version migrations to continue to function\n      // even though the latest major version may have breaking changes in `@angular/core`.\n      if (id.startsWith('@angular-devkit/core')) {\n        try {\n          return schematicRequire(id);\n        } catch (e) {\n          if (e.code !== 'MODULE_NOT_FOUND') {\n            throw e;\n          }\n        }\n      }\n\n      // Resolve from inside the `@angular/cli` project\n      return hostRequire(id);\n    } else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {\n      // Wrap relative files inside the schematic collection\n      // Also wrap `@angular/cdk`, it contains helper utilities that import core schematic packages\n\n      // Resolve from the original file\n      const modulePath = schematicRequire.resolve(id);\n\n      // Use cached module if available\n      const cachedModule = moduleCache.get(modulePath);\n      if (cachedModule) {\n        return cachedModule;\n      }\n\n      // Do not wrap vendored third-party packages or JSON files\n      if (\n        !/[/\\\\]node_modules[/\\\\]@schematics[/\\\\]angular[/\\\\]third_party[/\\\\]/.test(modulePath) &&\n        !modulePath.endsWith('.json')\n      ) {\n        // Wrap module and save in cache\n        const wrappedModule = wrap(modulePath, dirname(modulePath), moduleCache)();\n        moduleCache.set(modulePath, wrappedModule);\n\n        return wrappedModule;\n      }\n    }\n\n    // All others are required directly from the original file\n    return schematicRequire(id);\n  };\n\n  // Setup a wrapper function to capture the module's exports\n  const schematicCode = readFileSync(schematicFile, 'utf8');\n  // `module` is required due to @angular/localize ng-add being in UMD format\n  const headerCode = '(function() {\\nvar exports = {};\\nvar module = { exports };\\n';\n  const footerCode = exportName\n    ? `\\nreturn module.exports['${exportName}'];});`\n    : '\\nreturn module.exports;});';\n\n  const script = new Script(headerCode + schematicCode + footerCode, {\n    filename: schematicFile,\n    lineOffset: 3,\n  });\n\n  const context = {\n    __dirname: schematicDirectory,\n    __filename: schematicFile,\n    Buffer,\n    console,\n    process,\n    get global() {\n      return this;\n    },\n    require: customRequire,\n  };\n\n  const exportsFactory = script.runInNewContext(context);\n\n  return exportsFactory;\n}\n\nfunction loadBuiltinModule(id: string): unknown {\n  return undefined;\n}\n"]} \ No newline at end of file diff --git a/src/utilities/version.js b/src/utilities/version.js index 77de4dc43..d879e9e07 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-a0e3de2'); +// export const VERSION = new Version('14.0.0-next.11+sha-4b07aa3'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 0e3285e3b..b3eb93bc0 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 00:02:02 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 17:04:21 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 7b8514cc575e0b3a12f93a271feacefd4408831d Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 18:11:00 +0000 Subject: [PATCH 22/26] 586f39364 build: update angular to 7b6d862 --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index acfc99ef6..b31b76fbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-4b07aa3", + "version": "14.0.0-next.11+sha-586f393", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4b07aa345", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4b07aa345", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#4b07aa345", - "@schematics/angular": "github:angular/schematics-angular-builds#4b07aa345", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#586f39364", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#586f39364", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#586f39364", + "@schematics/angular": "github:angular/schematics-angular-builds#586f39364", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#4b07aa345", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4b07aa345", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#4b07aa345", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#4b07aa345", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4b07aa345", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#4b07aa345" + "@angular/cli": "github:angular/cli-builds#586f39364", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#586f39364", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#586f39364", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#586f39364", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#586f39364", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#586f39364" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index d879e9e07..237de72be 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-4b07aa3'); +// export const VERSION = new Version('14.0.0-next.11+sha-586f393'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index b3eb93bc0..a0360adac 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 17:04:21 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 18:11:00 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 4e4b56a9d83b6577dde6cec99a3a8a407b4d883b Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 18:21:06 +0000 Subject: [PATCH 23/26] 7abe212c6 fix(@angular-devkit/build-angular): correctly resolve custom service worker configuration file --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b31b76fbd..a5497a2f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-586f393", + "version": "14.0.0-next.11+sha-7abe212", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#586f39364", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#586f39364", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#586f39364", - "@schematics/angular": "github:angular/schematics-angular-builds#586f39364", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7abe212c6", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7abe212c6", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7abe212c6", + "@schematics/angular": "github:angular/schematics-angular-builds#7abe212c6", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#586f39364", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#586f39364", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#586f39364", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#586f39364", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#586f39364", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#586f39364" + "@angular/cli": "github:angular/cli-builds#7abe212c6", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7abe212c6", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#7abe212c6", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7abe212c6", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7abe212c6", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7abe212c6" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 237de72be..543490f70 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-586f393'); +// export const VERSION = new Version('14.0.0-next.11+sha-7abe212'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index a0360adac..ed9e698a8 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 18:11:00 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 18:21:06 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From e50245370ff25e99a628f23bf9da50394d09c8e4 Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 20:07:56 +0000 Subject: [PATCH 24/26] 7b78b7840 feat(@schematics/angular): add --standalone to ng generate --- help/generate.json | 18 ++++++++++++++++++ lib/config/schema.json | 18 ++++++++++++++++++ lib/config/workspace-schema.d.ts | 12 ++++++++++++ lib/config/workspace-schema.js | 2 +- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 7 files changed, 62 insertions(+), 14 deletions(-) diff --git a/help/generate.json b/help/generate.json index d53888fd2..806e04987 100644 --- a/help/generate.json +++ b/help/generate.json @@ -337,6 +337,12 @@ "default": false, "description": "Do not create \"spec.ts\" test files for the new component." }, + { + "name": "standalone", + "type": "boolean", + "default": false, + "description": "Whether the generated component is standalone." + }, { "name": "style", "type": "string", @@ -435,6 +441,12 @@ "type": "boolean", "default": false, "description": "Do not create \"spec.ts\" test files for the new class." + }, + { + "name": "standalone", + "type": "boolean", + "default": false, + "description": "Whether the generated directive is standalone." } ], "aliases": [ @@ -727,6 +739,12 @@ "type": "boolean", "default": false, "description": "Do not create \"spec.ts\" test files for the new pipe." + }, + { + "name": "standalone", + "type": "boolean", + "default": false, + "description": "Whether the generated pipe is standalone." } ], "aliases": [ diff --git a/lib/config/schema.json b/lib/config/schema.json index 5e39e268a..800e2eb6e 100644 --- a/lib/config/schema.json +++ b/lib/config/schema.json @@ -812,6 +812,12 @@ "alias": "t", "x-user-analytics": 10 }, + "standalone": { + "description": "Whether the generated component is standalone.", + "type": "boolean", + "default": false, + "x-user-analytics": 15 + }, "viewEncapsulation": { "description": "The view encapsulation strategy to use in the new component.", "enum": [ @@ -964,6 +970,12 @@ "format": "html-selector", "description": "The HTML selector to use for this directive." }, + "standalone": { + "description": "Whether the generated directive is standalone.", + "type": "boolean", + "default": false, + "x-user-analytics": 15 + }, "flat": { "type": "boolean", "description": "When true (the default), creates the new files at the top level of the current project.", @@ -1251,6 +1263,12 @@ "description": "Do not import this pipe into the owning NgModule.", "x-user-analytics": 18 }, + "standalone": { + "description": "Whether the generated pipe is standalone.", + "type": "boolean", + "default": false, + "x-user-analytics": 15 + }, "module": { "type": "string", "description": "The declaring NgModule.", diff --git a/lib/config/workspace-schema.d.ts b/lib/config/workspace-schema.d.ts index 34e158477..531974f43 100644 --- a/lib/config/workspace-schema.d.ts +++ b/lib/config/workspace-schema.d.ts @@ -292,6 +292,10 @@ export interface AngularComponentOptionsSchema { * Do not create "spec.ts" test files for the new component. */ skipTests?: boolean; + /** + * Whether the generated component is standalone. + */ + standalone?: boolean; /** * The file extension or preprocessor to use for style files, or 'none' to skip generating * the style file. @@ -369,6 +373,10 @@ export interface AngularDirectiveOptionsSchema { * Do not create "spec.ts" test files for the new class. */ skipTests?: boolean; + /** + * Whether the generated directive is standalone. + */ + standalone?: boolean; } /** * Generates a new, generic enum definition for the given or default project. @@ -640,6 +648,10 @@ export interface AngularPipeOptionsSchema { * Do not create "spec.ts" test files for the new pipe. */ skipTests?: boolean; + /** + * Whether the generated pipe is standalone. + */ + standalone?: boolean; } /** * Generates a new, generic resolver definition in the given or default project. diff --git a/lib/config/workspace-schema.js b/lib/config/workspace-schema.js index d9ff40b9f..1fb73853c 100644 --- a/lib/config/workspace-schema.js +++ b/lib/config/workspace-schema.js @@ -74,4 +74,4 @@ var Implement; Implement["CanDeactivate"] = "CanDeactivate"; Implement["CanLoad"] = "CanLoad"; })(Implement = exports.Implement || (exports.Implement = {})); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-schema.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/lib/config/workspace-schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAiFpF;;GAEG;AACH,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,8BAAe,CAAA;AACnB,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAED;;;;GAIG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,6BAAW,CAAA;IACX,+BAAa,CAAA;IACb,+BAAa,CAAA;AACjB,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AA8FD;;GAEG;AACH,IAAY,iCAKX;AALD,WAAY,iCAAiC;IACzC,gDAAW,CAAA;IACX,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,kDAAa,CAAA;AACjB,CAAC,EALW,iCAAiC,GAAjC,yCAAiC,KAAjC,yCAAiC,QAK5C;AAED;;;;;;GAMG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;IACb,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B;AA8GD;;GAEG;AACH,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED;;;GAGG;AACH,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACvC,8CAAW,CAAA;IACX,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;AACjB,CAAC,EANW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAM1C;AAuGD,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,wCAA2B,CAAA;IAC3B,kDAAqC,CAAA;IACrC,4CAA+B,CAAA;IAC/B,gCAAmB,CAAA;AACvB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB","sourcesContent":["\n// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE\n// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).\n\nexport interface Schema {\n    $schema?: string;\n    cli?:     CliOptions;\n    /**\n     * Default project name used in commands.\n     * @deprecated The project to use will be determined from the current working directory.\n     */\n    defaultProject?: string;\n    /**\n     * Path where new projects will be created.\n     */\n    newProjectRoot?: string;\n    projects?:       Projects;\n    schematics?:     SchematicOptions;\n    version:         number;\n}\n\nexport interface CliOptions {\n    /**\n     * Share anonymous usage data with the Angular Team at Google.\n     */\n    analytics?:        Analytics;\n    analyticsSharing?: AnalyticsSharing;\n    /**\n     * Control disk cache.\n     */\n    cache?: Cache;\n    /**\n     * The default schematics collection to use.\n     */\n    defaultCollection?: string;\n    /**\n     * Specify which package manager tool to use.\n     */\n    packageManager?: PackageManager;\n    /**\n     * The list of schematic collections to use.\n     */\n    schematicCollections?: string[];\n    /**\n     * Control CLI specific console warnings\n     */\n    warnings?: Warnings;\n}\n\n/**\n * Share anonymous usage data with the Angular Team at Google.\n */\nexport type Analytics = boolean | string;\n\nexport interface AnalyticsSharing {\n    /**\n     * Analytics sharing info tracking ID.\n     */\n    tracking?: string;\n    /**\n     * Analytics sharing info universally unique identifier.\n     */\n    uuid?: string;\n}\n\n/**\n * Control disk cache.\n */\nexport interface Cache {\n    /**\n     * Configure whether disk caching is enabled.\n     */\n    enabled?: boolean;\n    /**\n     * Configure in which environment disk cache is enabled.\n     */\n    environment?: Environment;\n    /**\n     * Cache base path.\n     */\n    path?: string;\n}\n\n/**\n * Configure in which environment disk cache is enabled.\n */\nexport enum Environment {\n    All = \"all\",\n    Ci = \"ci\",\n    Local = \"local\",\n}\n\n/**\n * Specify which package manager tool to use.\n *\n * The package manager used to install dependencies.\n */\nexport enum PackageManager {\n    Cnpm = \"cnpm\",\n    Npm = \"npm\",\n    Pnpm = \"pnpm\",\n    Yarn = \"yarn\",\n}\n\n/**\n * Control CLI specific console warnings\n */\nexport interface Warnings {\n    /**\n     * Show a warning when the global version is newer than the local one.\n     */\n    versionMismatch?: boolean;\n}\n\nexport interface Projects {\n}\n\nexport interface SchematicOptions {\n    \"@schematics/angular:application\"?: AngularApplicationOptionsSchema;\n    \"@schematics/angular:class\"?:       AngularClassOptionsSchema;\n    \"@schematics/angular:component\"?:   AngularComponentOptionsSchema;\n    \"@schematics/angular:directive\"?:   AngularDirectiveOptionsSchema;\n    \"@schematics/angular:enum\"?:        AngularEnumOptionsSchema;\n    \"@schematics/angular:guard\"?:       AngularGuardOptionsSchema;\n    \"@schematics/angular:interceptor\"?: AngularInterceptorOptionsSchema;\n    \"@schematics/angular:interface\"?:   AngularInterfaceOptionsSchema;\n    \"@schematics/angular:library\"?:     LibraryOptionsSchema;\n    \"@schematics/angular:ng-new\"?:      AngularNgNewOptionsSchema;\n    \"@schematics/angular:pipe\"?:        AngularPipeOptionsSchema;\n    \"@schematics/angular:resolver\"?:    AngularResolverOptionsSchema;\n    \"@schematics/angular:service\"?:     AngularServiceOptionsSchema;\n    \"@schematics/angular:web-worker\"?:  AngularWebWorkerOptionsSchema;\n}\n\n/**\n * Generates a new basic application definition in the \"projects\" subfolder of the workspace.\n */\nexport interface AngularApplicationOptionsSchema {\n    /**\n     * Include styles inline in the root component.ts file. Only CSS styles can be included\n     * inline. Default is false, meaning that an external styles file is created and referenced\n     * in the root component.ts file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the root component.ts file. Default is false, meaning that an\n     * external template file is created and referenced in the root component.ts file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * Create a bare-bones project without any testing frameworks. (Use for learning purposes\n     * only.)\n     */\n    minimal?: boolean;\n    /**\n     * The name of the new app.\n     */\n    name: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The root directory of the new app.\n     */\n    projectRoot?: string;\n    /**\n     * Create a routing NgModule.\n     */\n    routing?: boolean;\n    /**\n     * Skip installing dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not add dependencies to the \"package.json\" file.\n     */\n    skipPackageJson?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the application.\n     */\n    skipTests?: boolean;\n    /**\n     * Creates an application with stricter bundle budgets settings.\n     */\n    strict?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files.\n     */\n    style?: SchematicsAngularApplicationStyle;\n    /**\n     * The view encapsulation strategy to use in the new application.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * The file extension or preprocessor to use for style files.\n */\nexport enum SchematicsAngularApplicationStyle {\n    Css = \"css\",\n    Less = \"less\",\n    Sass = \"sass\",\n    Scss = \"scss\",\n}\n\n/**\n * The view encapsulation strategy to use in the new application.\n *\n * The view encapsulation strategy to use in the new component.\n *\n * The view encapsulation strategy to use in the initial project.\n */\nexport enum ViewEncapsulation {\n    Emulated = \"Emulated\",\n    None = \"None\",\n    ShadowDom = \"ShadowDom\",\n}\n\n/**\n * Creates a new, generic class definition in the given or default project.\n */\nexport interface AngularClassOptionsSchema {\n    /**\n     * The name of the new class.\n     */\n    name: string;\n    /**\n     * The path at which to create the class, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new class.\n     */\n    skipTests?: boolean;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Creates a new, generic component definition in the given or default project.\n */\nexport interface AngularComponentOptionsSchema {\n    /**\n     * The change detection strategy to use in the new component.\n     */\n    changeDetection?: ChangeDetection;\n    /**\n     * Specifies if the style will contain `:host { display: block; }`.\n     */\n    displayBlock?: boolean;\n    /**\n     * The declaring NgModule exports this component.\n     */\n    export?: boolean;\n    /**\n     * Create the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * Include styles inline in the component.ts file. Only CSS styles can be included inline.\n     * By default, an external styles file is created and referenced in the component.ts file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the component.ts file. By default, an external template file\n     * is created and referenced in the component.ts file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the component.\n     */\n    name: string;\n    /**\n     * The path at which to create the component file, relative to the current workspace.\n     * Default is a folder with the same name as the component in the project root.\n     */\n    path?: string;\n    /**\n     * The prefix to apply to the generated component selector.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * The HTML selector to use for this component.\n     */\n    selector?: string;\n    /**\n     * Do not import this component into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Specifies if the component should have a selector or not.\n     */\n    skipSelector?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new component.\n     */\n    skipTests?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files, or 'none' to skip generating\n     * the style file.\n     */\n    style?: SchematicsAngularComponentStyle;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n    /**\n     * The view encapsulation strategy to use in the new component.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * The change detection strategy to use in the new component.\n */\nexport enum ChangeDetection {\n    Default = \"Default\",\n    OnPush = \"OnPush\",\n}\n\n/**\n * The file extension or preprocessor to use for style files, or 'none' to skip generating\n * the style file.\n */\nexport enum SchematicsAngularComponentStyle {\n    Css = \"css\",\n    Less = \"less\",\n    None = \"none\",\n    Sass = \"sass\",\n    Scss = \"scss\",\n}\n\n/**\n * Creates a new, generic directive definition in the given or default project.\n */\nexport interface AngularDirectiveOptionsSchema {\n    /**\n     * The declaring NgModule exports this directive.\n     */\n    export?: boolean;\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the new directive.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the directive, relative to the\n     * workspace root.\n     */\n    path?: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * The HTML selector to use for this directive.\n     */\n    selector?: string;\n    /**\n     * Do not import this directive into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new class.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Generates a new, generic enum definition for the given or default project.\n */\nexport interface AngularEnumOptionsSchema {\n    /**\n     * The name of the enum.\n     */\n    name: string;\n    /**\n     * The path at which to create the enum definition, relative to the current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project in which to create the enum. Default is the configured default\n     * project for the workspace.\n     */\n    project?: string;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Generates a new, generic route guard definition in the given or default project.\n */\nexport interface AngularGuardOptionsSchema {\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * Specifies which interfaces to implement.\n     */\n    implements?: Implement[];\n    /**\n     * The name of the new route guard.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the guard, relative to the current\n     * workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new guard.\n     */\n    skipTests?: boolean;\n}\n\nexport enum Implement {\n    CanActivate = \"CanActivate\",\n    CanActivateChild = \"CanActivateChild\",\n    CanDeactivate = \"CanDeactivate\",\n    CanLoad = \"CanLoad\",\n}\n\n/**\n * Creates a new, generic interceptor definition in the given or default project.\n */\nexport interface AngularInterceptorOptionsSchema {\n    /**\n     * When true (the default), creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the interceptor.\n     */\n    name: string;\n    /**\n     * The path at which to create the interceptor, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new interceptor.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic interface definition in the given or default project.\n */\nexport interface AngularInterfaceOptionsSchema {\n    /**\n     * The name of the interface.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Creates a new, generic library project in the current workspace.\n */\nexport interface LibraryOptionsSchema {\n    /**\n     * The path at which to create the library's public API file, relative to the workspace root.\n     */\n    entryFile?: string;\n    /**\n     * The name of the library.\n     */\n    name: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * Do not install dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not add dependencies to the \"package.json\" file.\n     */\n    skipPackageJson?: boolean;\n    /**\n     * Do not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping\n     * is needed to use the library in an app, but can be disabled here to simplify development.\n     */\n    skipTsConfig?: boolean;\n}\n\n/**\n * Creates a new project by combining the workspace and application schematics.\n */\nexport interface AngularNgNewOptionsSchema {\n    /**\n     * Initial git repository commit information.\n     */\n    commit?: CommitUnion;\n    /**\n     * Create a new initial application project in the 'src' folder of the new workspace. When\n     * false, creates an empty workspace with no initial application. You can then use the\n     * generate application command so that all applications are created in the projects folder.\n     */\n    createApplication?: boolean;\n    /**\n     * The directory name to create the workspace in.\n     */\n    directory?: string;\n    /**\n     * Include styles inline in the component TS file. By default, an external styles file is\n     * created and referenced in the component TypeScript file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the component TS file. By default, an external template file\n     * is created and referenced in the component TypeScript file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * Link the CLI to the global version (internal development only).\n     */\n    linkCli?: boolean;\n    /**\n     * Create a workspace without any testing frameworks. (Use for learning purposes only.)\n     */\n    minimal?: boolean;\n    /**\n     * The name of the new workspace and initial project.\n     */\n    name: string;\n    /**\n     * The path where new projects will be created, relative to the new workspace root.\n     */\n    newProjectRoot?: string;\n    /**\n     * The package manager used to install dependencies.\n     */\n    packageManager?: PackageManager;\n    /**\n     * The prefix to apply to generated selectors for the initial project.\n     */\n    prefix?: string;\n    /**\n     * Generate a routing module for the initial project.\n     */\n    routing?: boolean;\n    /**\n     * Do not initialize a git repository.\n     */\n    skipGit?: boolean;\n    /**\n     * Do not install dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not generate \"spec.ts\" test files for the new project.\n     */\n    skipTests?: boolean;\n    /**\n     * Creates a workspace with stricter type checking and stricter bundle budgets settings.\n     * This setting helps improve maintainability and catch bugs ahead of time. For more\n     * information, see https://angular.io/guide/strict-mode\n     */\n    strict?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files.\n     */\n    style?: SchematicsAngularApplicationStyle;\n    /**\n     * The version of the Angular CLI to use.\n     */\n    version: string;\n    /**\n     * The view encapsulation strategy to use in the initial project.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * Initial git repository commit information.\n */\nexport type CommitUnion = boolean | CommitObject;\n\nexport interface CommitObject {\n    email:    string;\n    message?: string;\n    name:     string;\n}\n\n/**\n * Creates a new, generic pipe definition in the given or default project.\n */\nexport interface AngularPipeOptionsSchema {\n    /**\n     * The declaring NgModule exports this pipe.\n     */\n    export?: boolean;\n    /**\n     * When true (the default) creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the pipe.\n     */\n    name: string;\n    /**\n     * The path at which to create the pipe, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not import this pipe into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new pipe.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Generates a new, generic resolver definition in the given or default project.\n */\nexport interface AngularResolverOptionsSchema {\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the new resolver.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the resolver, relative to the\n     * current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new resolver.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic service definition in the given or default project.\n */\nexport interface AngularServiceOptionsSchema {\n    /**\n     * When true (the default), creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the service.\n     */\n    name: string;\n    /**\n     * The path at which to create the service, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new service.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic web worker definition in the given or default project.\n */\nexport interface AngularWebWorkerOptionsSchema {\n    /**\n     * The name of the worker.\n     */\n    name: string;\n    /**\n     * The path at which to create the worker file, relative to the current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project: string;\n    /**\n     * Add a worker creation snippet in a sibling file of the same name.\n     */\n    snippet?: boolean;\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-schema.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/cli/lib/config/workspace-schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAiFpF;;GAEG;AACH,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,8BAAe,CAAA;AACnB,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAED;;;;GAIG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,6BAAW,CAAA;IACX,+BAAa,CAAA;IACb,+BAAa,CAAA;AACjB,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AA8FD;;GAEG;AACH,IAAY,iCAKX;AALD,WAAY,iCAAiC;IACzC,gDAAW,CAAA;IACX,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,kDAAa,CAAA;AACjB,CAAC,EALW,iCAAiC,GAAjC,yCAAiC,KAAjC,yCAAiC,QAK5C;AAED;;;;;;GAMG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;IACb,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B;AAkHD;;GAEG;AACH,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED;;;GAGG;AACH,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACvC,8CAAW,CAAA;IACX,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;AACjB,CAAC,EANW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAM1C;AA2GD,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,wCAA2B,CAAA;IAC3B,kDAAqC,CAAA;IACrC,4CAA+B,CAAA;IAC/B,gCAAmB,CAAA;AACvB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB","sourcesContent":["\n// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE\n// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).\n\nexport interface Schema {\n    $schema?: string;\n    cli?:     CliOptions;\n    /**\n     * Default project name used in commands.\n     * @deprecated The project to use will be determined from the current working directory.\n     */\n    defaultProject?: string;\n    /**\n     * Path where new projects will be created.\n     */\n    newProjectRoot?: string;\n    projects?:       Projects;\n    schematics?:     SchematicOptions;\n    version:         number;\n}\n\nexport interface CliOptions {\n    /**\n     * Share anonymous usage data with the Angular Team at Google.\n     */\n    analytics?:        Analytics;\n    analyticsSharing?: AnalyticsSharing;\n    /**\n     * Control disk cache.\n     */\n    cache?: Cache;\n    /**\n     * The default schematics collection to use.\n     */\n    defaultCollection?: string;\n    /**\n     * Specify which package manager tool to use.\n     */\n    packageManager?: PackageManager;\n    /**\n     * The list of schematic collections to use.\n     */\n    schematicCollections?: string[];\n    /**\n     * Control CLI specific console warnings\n     */\n    warnings?: Warnings;\n}\n\n/**\n * Share anonymous usage data with the Angular Team at Google.\n */\nexport type Analytics = boolean | string;\n\nexport interface AnalyticsSharing {\n    /**\n     * Analytics sharing info tracking ID.\n     */\n    tracking?: string;\n    /**\n     * Analytics sharing info universally unique identifier.\n     */\n    uuid?: string;\n}\n\n/**\n * Control disk cache.\n */\nexport interface Cache {\n    /**\n     * Configure whether disk caching is enabled.\n     */\n    enabled?: boolean;\n    /**\n     * Configure in which environment disk cache is enabled.\n     */\n    environment?: Environment;\n    /**\n     * Cache base path.\n     */\n    path?: string;\n}\n\n/**\n * Configure in which environment disk cache is enabled.\n */\nexport enum Environment {\n    All = \"all\",\n    Ci = \"ci\",\n    Local = \"local\",\n}\n\n/**\n * Specify which package manager tool to use.\n *\n * The package manager used to install dependencies.\n */\nexport enum PackageManager {\n    Cnpm = \"cnpm\",\n    Npm = \"npm\",\n    Pnpm = \"pnpm\",\n    Yarn = \"yarn\",\n}\n\n/**\n * Control CLI specific console warnings\n */\nexport interface Warnings {\n    /**\n     * Show a warning when the global version is newer than the local one.\n     */\n    versionMismatch?: boolean;\n}\n\nexport interface Projects {\n}\n\nexport interface SchematicOptions {\n    \"@schematics/angular:application\"?: AngularApplicationOptionsSchema;\n    \"@schematics/angular:class\"?:       AngularClassOptionsSchema;\n    \"@schematics/angular:component\"?:   AngularComponentOptionsSchema;\n    \"@schematics/angular:directive\"?:   AngularDirectiveOptionsSchema;\n    \"@schematics/angular:enum\"?:        AngularEnumOptionsSchema;\n    \"@schematics/angular:guard\"?:       AngularGuardOptionsSchema;\n    \"@schematics/angular:interceptor\"?: AngularInterceptorOptionsSchema;\n    \"@schematics/angular:interface\"?:   AngularInterfaceOptionsSchema;\n    \"@schematics/angular:library\"?:     LibraryOptionsSchema;\n    \"@schematics/angular:ng-new\"?:      AngularNgNewOptionsSchema;\n    \"@schematics/angular:pipe\"?:        AngularPipeOptionsSchema;\n    \"@schematics/angular:resolver\"?:    AngularResolverOptionsSchema;\n    \"@schematics/angular:service\"?:     AngularServiceOptionsSchema;\n    \"@schematics/angular:web-worker\"?:  AngularWebWorkerOptionsSchema;\n}\n\n/**\n * Generates a new basic application definition in the \"projects\" subfolder of the workspace.\n */\nexport interface AngularApplicationOptionsSchema {\n    /**\n     * Include styles inline in the root component.ts file. Only CSS styles can be included\n     * inline. Default is false, meaning that an external styles file is created and referenced\n     * in the root component.ts file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the root component.ts file. Default is false, meaning that an\n     * external template file is created and referenced in the root component.ts file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * Create a bare-bones project without any testing frameworks. (Use for learning purposes\n     * only.)\n     */\n    minimal?: boolean;\n    /**\n     * The name of the new app.\n     */\n    name: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The root directory of the new app.\n     */\n    projectRoot?: string;\n    /**\n     * Create a routing NgModule.\n     */\n    routing?: boolean;\n    /**\n     * Skip installing dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not add dependencies to the \"package.json\" file.\n     */\n    skipPackageJson?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the application.\n     */\n    skipTests?: boolean;\n    /**\n     * Creates an application with stricter bundle budgets settings.\n     */\n    strict?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files.\n     */\n    style?: SchematicsAngularApplicationStyle;\n    /**\n     * The view encapsulation strategy to use in the new application.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * The file extension or preprocessor to use for style files.\n */\nexport enum SchematicsAngularApplicationStyle {\n    Css = \"css\",\n    Less = \"less\",\n    Sass = \"sass\",\n    Scss = \"scss\",\n}\n\n/**\n * The view encapsulation strategy to use in the new application.\n *\n * The view encapsulation strategy to use in the new component.\n *\n * The view encapsulation strategy to use in the initial project.\n */\nexport enum ViewEncapsulation {\n    Emulated = \"Emulated\",\n    None = \"None\",\n    ShadowDom = \"ShadowDom\",\n}\n\n/**\n * Creates a new, generic class definition in the given or default project.\n */\nexport interface AngularClassOptionsSchema {\n    /**\n     * The name of the new class.\n     */\n    name: string;\n    /**\n     * The path at which to create the class, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new class.\n     */\n    skipTests?: boolean;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Creates a new, generic component definition in the given or default project.\n */\nexport interface AngularComponentOptionsSchema {\n    /**\n     * The change detection strategy to use in the new component.\n     */\n    changeDetection?: ChangeDetection;\n    /**\n     * Specifies if the style will contain `:host { display: block; }`.\n     */\n    displayBlock?: boolean;\n    /**\n     * The declaring NgModule exports this component.\n     */\n    export?: boolean;\n    /**\n     * Create the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * Include styles inline in the component.ts file. Only CSS styles can be included inline.\n     * By default, an external styles file is created and referenced in the component.ts file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the component.ts file. By default, an external template file\n     * is created and referenced in the component.ts file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the component.\n     */\n    name: string;\n    /**\n     * The path at which to create the component file, relative to the current workspace.\n     * Default is a folder with the same name as the component in the project root.\n     */\n    path?: string;\n    /**\n     * The prefix to apply to the generated component selector.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * The HTML selector to use for this component.\n     */\n    selector?: string;\n    /**\n     * Do not import this component into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Specifies if the component should have a selector or not.\n     */\n    skipSelector?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new component.\n     */\n    skipTests?: boolean;\n    /**\n     * Whether the generated component is standalone.\n     */\n    standalone?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files, or 'none' to skip generating\n     * the style file.\n     */\n    style?: SchematicsAngularComponentStyle;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n    /**\n     * The view encapsulation strategy to use in the new component.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * The change detection strategy to use in the new component.\n */\nexport enum ChangeDetection {\n    Default = \"Default\",\n    OnPush = \"OnPush\",\n}\n\n/**\n * The file extension or preprocessor to use for style files, or 'none' to skip generating\n * the style file.\n */\nexport enum SchematicsAngularComponentStyle {\n    Css = \"css\",\n    Less = \"less\",\n    None = \"none\",\n    Sass = \"sass\",\n    Scss = \"scss\",\n}\n\n/**\n * Creates a new, generic directive definition in the given or default project.\n */\nexport interface AngularDirectiveOptionsSchema {\n    /**\n     * The declaring NgModule exports this directive.\n     */\n    export?: boolean;\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the new directive.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the directive, relative to the\n     * workspace root.\n     */\n    path?: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * The HTML selector to use for this directive.\n     */\n    selector?: string;\n    /**\n     * Do not import this directive into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new class.\n     */\n    skipTests?: boolean;\n    /**\n     * Whether the generated directive is standalone.\n     */\n    standalone?: boolean;\n}\n\n/**\n * Generates a new, generic enum definition for the given or default project.\n */\nexport interface AngularEnumOptionsSchema {\n    /**\n     * The name of the enum.\n     */\n    name: string;\n    /**\n     * The path at which to create the enum definition, relative to the current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project in which to create the enum. Default is the configured default\n     * project for the workspace.\n     */\n    project?: string;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Generates a new, generic route guard definition in the given or default project.\n */\nexport interface AngularGuardOptionsSchema {\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * Specifies which interfaces to implement.\n     */\n    implements?: Implement[];\n    /**\n     * The name of the new route guard.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the guard, relative to the current\n     * workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new guard.\n     */\n    skipTests?: boolean;\n}\n\nexport enum Implement {\n    CanActivate = \"CanActivate\",\n    CanActivateChild = \"CanActivateChild\",\n    CanDeactivate = \"CanDeactivate\",\n    CanLoad = \"CanLoad\",\n}\n\n/**\n * Creates a new, generic interceptor definition in the given or default project.\n */\nexport interface AngularInterceptorOptionsSchema {\n    /**\n     * When true (the default), creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the interceptor.\n     */\n    name: string;\n    /**\n     * The path at which to create the interceptor, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new interceptor.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic interface definition in the given or default project.\n */\nexport interface AngularInterfaceOptionsSchema {\n    /**\n     * The name of the interface.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Adds a developer-defined type to the filename, in the format \"name.type.ts\".\n     */\n    type?: string;\n}\n\n/**\n * Creates a new, generic library project in the current workspace.\n */\nexport interface LibraryOptionsSchema {\n    /**\n     * The path at which to create the library's public API file, relative to the workspace root.\n     */\n    entryFile?: string;\n    /**\n     * The name of the library.\n     */\n    name: string;\n    /**\n     * A prefix to apply to generated selectors.\n     */\n    prefix?: string;\n    /**\n     * Do not install dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not add dependencies to the \"package.json\" file.\n     */\n    skipPackageJson?: boolean;\n    /**\n     * Do not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping\n     * is needed to use the library in an app, but can be disabled here to simplify development.\n     */\n    skipTsConfig?: boolean;\n}\n\n/**\n * Creates a new project by combining the workspace and application schematics.\n */\nexport interface AngularNgNewOptionsSchema {\n    /**\n     * Initial git repository commit information.\n     */\n    commit?: CommitUnion;\n    /**\n     * Create a new initial application project in the 'src' folder of the new workspace. When\n     * false, creates an empty workspace with no initial application. You can then use the\n     * generate application command so that all applications are created in the projects folder.\n     */\n    createApplication?: boolean;\n    /**\n     * The directory name to create the workspace in.\n     */\n    directory?: string;\n    /**\n     * Include styles inline in the component TS file. By default, an external styles file is\n     * created and referenced in the component TypeScript file.\n     */\n    inlineStyle?: boolean;\n    /**\n     * Include template inline in the component TS file. By default, an external template file\n     * is created and referenced in the component TypeScript file.\n     */\n    inlineTemplate?: boolean;\n    /**\n     * Link the CLI to the global version (internal development only).\n     */\n    linkCli?: boolean;\n    /**\n     * Create a workspace without any testing frameworks. (Use for learning purposes only.)\n     */\n    minimal?: boolean;\n    /**\n     * The name of the new workspace and initial project.\n     */\n    name: string;\n    /**\n     * The path where new projects will be created, relative to the new workspace root.\n     */\n    newProjectRoot?: string;\n    /**\n     * The package manager used to install dependencies.\n     */\n    packageManager?: PackageManager;\n    /**\n     * The prefix to apply to generated selectors for the initial project.\n     */\n    prefix?: string;\n    /**\n     * Generate a routing module for the initial project.\n     */\n    routing?: boolean;\n    /**\n     * Do not initialize a git repository.\n     */\n    skipGit?: boolean;\n    /**\n     * Do not install dependency packages.\n     */\n    skipInstall?: boolean;\n    /**\n     * Do not generate \"spec.ts\" test files for the new project.\n     */\n    skipTests?: boolean;\n    /**\n     * Creates a workspace with stricter type checking and stricter bundle budgets settings.\n     * This setting helps improve maintainability and catch bugs ahead of time. For more\n     * information, see https://angular.io/guide/strict-mode\n     */\n    strict?: boolean;\n    /**\n     * The file extension or preprocessor to use for style files.\n     */\n    style?: SchematicsAngularApplicationStyle;\n    /**\n     * The version of the Angular CLI to use.\n     */\n    version: string;\n    /**\n     * The view encapsulation strategy to use in the initial project.\n     */\n    viewEncapsulation?: ViewEncapsulation;\n}\n\n/**\n * Initial git repository commit information.\n */\nexport type CommitUnion = boolean | CommitObject;\n\nexport interface CommitObject {\n    email:    string;\n    message?: string;\n    name:     string;\n}\n\n/**\n * Creates a new, generic pipe definition in the given or default project.\n */\nexport interface AngularPipeOptionsSchema {\n    /**\n     * The declaring NgModule exports this pipe.\n     */\n    export?: boolean;\n    /**\n     * When true (the default) creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The declaring NgModule.\n     */\n    module?: string;\n    /**\n     * The name of the pipe.\n     */\n    name: string;\n    /**\n     * The path at which to create the pipe, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not import this pipe into the owning NgModule.\n     */\n    skipImport?: boolean;\n    /**\n     * Do not create \"spec.ts\" test files for the new pipe.\n     */\n    skipTests?: boolean;\n    /**\n     * Whether the generated pipe is standalone.\n     */\n    standalone?: boolean;\n}\n\n/**\n * Generates a new, generic resolver definition in the given or default project.\n */\nexport interface AngularResolverOptionsSchema {\n    /**\n     * When true (the default), creates the new files at the top level of the current project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the new resolver.\n     */\n    name: string;\n    /**\n     * The path at which to create the interface that defines the resolver, relative to the\n     * current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new resolver.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic service definition in the given or default project.\n */\nexport interface AngularServiceOptionsSchema {\n    /**\n     * When true (the default), creates files at the top level of the project.\n     */\n    flat?: boolean;\n    /**\n     * The name of the service.\n     */\n    name: string;\n    /**\n     * The path at which to create the service, relative to the workspace root.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project?: string;\n    /**\n     * Do not create \"spec.ts\" test files for the new service.\n     */\n    skipTests?: boolean;\n}\n\n/**\n * Creates a new, generic web worker definition in the given or default project.\n */\nexport interface AngularWebWorkerOptionsSchema {\n    /**\n     * The name of the worker.\n     */\n    name: string;\n    /**\n     * The path at which to create the worker file, relative to the current workspace.\n     */\n    path?: string;\n    /**\n     * The name of the project.\n     */\n    project: string;\n    /**\n     * Add a worker creation snippet in a sibling file of the same name.\n     */\n    snippet?: boolean;\n}\n"]} \ No newline at end of file diff --git a/package.json b/package.json index a5497a2f5..8d74fc18c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-7abe212", + "version": "14.0.0-next.11+sha-7b78b78", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7abe212c6", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7abe212c6", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7abe212c6", - "@schematics/angular": "github:angular/schematics-angular-builds#7abe212c6", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7b78b7840", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7b78b7840", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7b78b7840", + "@schematics/angular": "github:angular/schematics-angular-builds#7b78b7840", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#7abe212c6", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7abe212c6", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#7abe212c6", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7abe212c6", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7abe212c6", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7abe212c6" + "@angular/cli": "github:angular/cli-builds#7b78b7840", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7b78b7840", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#7b78b7840", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7b78b7840", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7b78b7840", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7b78b7840" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 543490f70..4107936b8 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-7abe212'); +// export const VERSION = new Version('14.0.0-next.11+sha-7b78b78'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index ed9e698a8..982436210 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 18:21:06 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 20:07:56 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From 93f29a7bab765c21230aa45259322650291c413c Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 22:45:37 +0000 Subject: [PATCH 25/26] 418a75a7a docs: release notes for the v13.3.4 release --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 8d74fc18c..bf13a7954 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-7b78b78", + "version": "14.0.0-next.11+sha-418a75a", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7b78b7840", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7b78b7840", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7b78b7840", - "@schematics/angular": "github:angular/schematics-angular-builds#7b78b7840", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#418a75a7a", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#418a75a7a", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#418a75a7a", + "@schematics/angular": "github:angular/schematics-angular-builds#418a75a7a", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#7b78b7840", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7b78b7840", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#7b78b7840", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7b78b7840", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7b78b7840", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#7b78b7840" + "@angular/cli": "github:angular/cli-builds#418a75a7a", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#418a75a7a", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#418a75a7a", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#418a75a7a", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#418a75a7a", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#418a75a7a" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 4107936b8..5f3c66710 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-7b78b78'); +// export const VERSION = new Version('14.0.0-next.11+sha-418a75a'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 982436210..121269aa5 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 20:07:56 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 22:45:37 GMT+0000 (Coordinated Universal Time) \ No newline at end of file From f258be5be44cc0551a112f5bdb13b4d707a046db Mon Sep 17 00:00:00 2001 From: Angular Builds Date: Wed, 27 Apr 2022 23:29:19 +0000 Subject: [PATCH 26/26] bafd68c41 release: cut the v14.0.0-next.12 release --- package.json | 22 +++++++++++----------- src/utilities/version.js | 2 +- uniqueId | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index bf13a7954..cdbd1c337 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/cli", - "version": "14.0.0-next.11+sha-418a75a", + "version": "14.0.0-next.12+sha-bafd68c", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "bin": { @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#418a75a7a", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#418a75a7a", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#418a75a7a", - "@schematics/angular": "github:angular/schematics-angular-builds#418a75a7a", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bafd68c41", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bafd68c41", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bafd68c41", + "@schematics/angular": "github:angular/schematics-angular-builds#bafd68c41", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.3.4", @@ -49,12 +49,12 @@ "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { - "@angular/cli": "github:angular/cli-builds#418a75a7a", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#418a75a7a", - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#418a75a7a", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#418a75a7a", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#418a75a7a", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#418a75a7a" + "@angular/cli": "github:angular/cli-builds#bafd68c41", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bafd68c41", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#bafd68c41", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#bafd68c41", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bafd68c41", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#bafd68c41" } }, "engines": { diff --git a/src/utilities/version.js b/src/utilities/version.js index 5f3c66710..71ed17546 100644 --- a/src/utilities/version.js +++ b/src/utilities/version.js @@ -21,6 +21,6 @@ class Version { } } // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel -// export const VERSION = new Version('14.0.0-next.11+sha-418a75a'); +// export const VERSION = new Version('14.0.0-next.12+sha-bafd68c'); exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvY2xpL3NyYy91dGlsaXRpZXMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyQkFBa0M7QUFDbEMsK0JBQStCO0FBRS9CLCtDQUErQztBQUMvQyxNQUFNLE9BQU87SUFLWCxZQUE0QixJQUFZO1FBQVosU0FBSSxHQUFKLElBQUksQ0FBUTtRQUN0QyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7Q0FDRjtBQUVELHFHQUFxRztBQUNyRywyREFBMkQ7QUFDOUMsUUFBQSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBRTlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBQSxpQkFBWSxFQUFDLElBQUEsY0FBTyxFQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUczRSxDQUFDLE9BQU8sQ0FDVixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IHJlYWRGaWxlU3luYyB9IGZyb20gJ2ZzJztcbmltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJztcblxuLy8gU2FtZSBzdHJ1Y3R1cmUgYXMgdXNlZCBpbiBmcmFtZXdvcmsgcGFja2FnZXNcbmNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgcmVhZG9ubHkgbWFqb3I6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1pbm9yOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBwYXRjaDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyByZWFkb25seSBmdWxsOiBzdHJpbmcpIHtcbiAgICBjb25zdCBbbWFqb3IsIG1pbm9yLCBwYXRjaF0gPSBmdWxsLnNwbGl0KCctJywgMSlbMF0uc3BsaXQoJy4nLCAzKTtcbiAgICB0aGlzLm1ham9yID0gbWFqb3I7XG4gICAgdGhpcy5taW5vciA9IG1pbm9yO1xuICAgIHRoaXMucGF0Y2ggPSBwYXRjaDtcbiAgfVxufVxuXG4vLyBUT0RPOiBDb252ZXJ0IHRoaXMgdG8gdXNlIGJ1aWxkLXRpbWUgdmVyc2lvbiBzdGFtcGluZyBhZnRlciBmbGlwcGluZyB0aGUgYnVpbGQgc2NyaXB0IHRvIHVzZSBiYXplbFxuLy8gZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gbmV3IFZlcnNpb24oXG4gIChcbiAgICBKU09OLnBhcnNlKHJlYWRGaWxlU3luYyhyZXNvbHZlKF9fZGlybmFtZSwgJy4uLy4uL3BhY2thZ2UuanNvbicpLCAndXRmLTgnKSkgYXMge1xuICAgICAgdmVyc2lvbjogc3RyaW5nO1xuICAgIH1cbiAgKS52ZXJzaW9uLFxuKTtcbiJdfQ== \ No newline at end of file diff --git a/uniqueId b/uniqueId index 121269aa5..7fd38e06d 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Apr 27 2022 22:45:37 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Apr 27 2022 23:29:19 GMT+0000 (Coordinated Universal Time) \ No newline at end of file