From 8883cbe260846f5cbaaacfafb0b79f08133d799a Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 28 Sep 2018 17:10:02 -0700 Subject: [PATCH] chore: bump versions of Angular and devkit betas We can't bump to Angular 7 RC because it requires TypeScript 3.1, and devkit/schematics hasn't published a version w/ TypeScript 3.1 yet. Since it's a full dependency there (and not a peer dependency), the version mismatch breaks our schematics. For going to Angular 7 beta.7, we need to now explicitly unset some of the `angularCompilerOptions` in the `tsconfig-test` because they're now inherited. For going to devkit/schematics v6 beta 4, we need to update some imports around the `WorkspaceProject` class. There seem to now be two incompatible versions of this class in the devkit, so we'll need to sort that out soon. --- package-lock.json | 392 +++++++++++------- package.json | 36 +- src/cdk-experimental/tsconfig-tests.json | 7 +- src/cdk/schematics/utils/ast.ts | 4 +- src/cdk/schematics/utils/build-component.ts | 4 +- src/cdk/schematics/utils/get-project.ts | 8 +- src/cdk/schematics/utils/project-main-file.ts | 2 +- .../schematics/utils/project-style-file.ts | 2 +- src/cdk/schematics/utils/project-targets.ts | 2 +- src/cdk/schematics/utils/schematic-options.ts | 3 +- src/cdk/tsconfig-tests.json | 7 +- .../schematics/ng-add/fonts/head-element.ts | 3 +- .../ng-add/fonts/project-index-html.ts | 3 +- src/lib/schematics/ng-add/index.spec.ts | 3 +- src/lib/schematics/ng-add/theming/theming.ts | 3 +- src/lib/tsconfig-tests.json | 7 +- src/material-examples/tsconfig-tests.json | 7 +- src/material-experimental/tsconfig-tests.json | 7 +- .../tsconfig-tests.json | 7 +- 19 files changed, 321 insertions(+), 186 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3a4a8af94fc..498d02fdd562 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@angular-devkit/core": { - "version": "0.9.0-beta.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz", - "integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==", + "version": "7.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.0.0-beta.4.tgz", + "integrity": "sha512-Yk4+u1G3qQBTaYDR6yXkCAc1Woe+h1tWCbzXPWPmzvg53Ox/47cMwMl61lCMqEShVAS/x+Ss/9mVFlPci5YSNQ==", "dev": true, "requires": { "ajv": "6.5.3", @@ -68,12 +68,12 @@ } }, "@angular-devkit/schematics": { - "version": "0.9.0-beta.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz", - "integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==", + "version": "7.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.0.0-beta.4.tgz", + "integrity": "sha512-zLUWeaZ9R/vbNjUbwyLU9QWsHpVojliT2+QeSstnXaCNDvdQ82rJF0munosqzQP5nx9uTLdB6Q7gnM6Ijox3Vw==", "dev": true, "requires": { - "@angular-devkit/core": "0.9.0-beta.3", + "@angular-devkit/core": "7.0.0-beta.4", "rxjs": "6.2.2" }, "dependencies": { @@ -89,17 +89,17 @@ } }, "@angular/animations": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.0.0-beta.5.tgz", - "integrity": "sha512-vqX9LoSdrjgcNcd9naWKb0jpGjWb3920KpZ/24gAC3xNotEPQqUKWVHxf9cqQ5Bm+O5NGnFJTUxvaJzOkjyjGQ==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.0.0-beta.7.tgz", + "integrity": "sha512-rVNk6DixFEO8NzJXzBHCHQONXv8xEVn+u08AR/l4i/NIMNH8YSFPkfR3hrbbsrUjCCveyr9//MzLk5TrEmROTA==", "requires": { "tslib": "^1.9.0" } }, "@angular/bazel": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/bazel/-/bazel-7.0.0-beta.5.tgz", - "integrity": "sha512-3e0XeR9QAJlldhhBU7TenD5/Nz3/OgR/a35Bh7AG82ncmJCPOI5GPv8SzBp4X/7g8e+7uDBYPdDYMWxKU8UHtw==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/bazel/-/bazel-7.0.0-beta.7.tgz", + "integrity": "sha512-Y8quaC6hCX3eTqMprU97KCODBQMaIWEcIVjgDPNsEQ8G/txntnAu47Ff/AyfBQC5avlou4Sp/QjV11xEJ3PFrg==", "dev": true, "requires": { "@bazel/typescript": "^0.15.0", @@ -116,17 +116,6 @@ "protobufjs": "5.0.0", "tsickle": "0.25.x", "tsutils": "2.20.0" - }, - "dependencies": { - "tsutils": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.20.0.tgz", - "integrity": "sha512-qPOBy1/hwLdBxh/TNIpim5qL1WRMR0tgVGBB6shjnpw6/SuS5ZKYyXXxKDYsMsMtVdFOcL+XPGZVEuc+eCOo4A==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - } } }, "@types/node": { @@ -161,39 +150,58 @@ "source-map": "^0.5.6", "source-map-support": "^0.4.2" } + }, + "tsutils": { + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.20.0.tgz", + "integrity": "sha512-qPOBy1/hwLdBxh/TNIpim5qL1WRMR0tgVGBB6shjnpw6/SuS5ZKYyXXxKDYsMsMtVdFOcL+XPGZVEuc+eCOo4A==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } } } }, "@angular/common": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.0.0-beta.5.tgz", - "integrity": "sha512-K5KiVdhGzv8y1d0X6n7n1W8dZ9gsv8b9vRrqT8RkPNTkkRZDA3euRMTYGlawbdouvUjhHltQTLkLti2KndCx8w==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.0.0-beta.7.tgz", + "integrity": "sha512-/NbJEygr9mObD9hBKVa/AIZ2iwgMGur9XgBYfbEeHzigKf1L4cWrZYCLSPyHgfpD0TpMXmcXngeWXABRry+X8A==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.0.0-beta.5.tgz", - "integrity": "sha512-nJAdKdrSlmamaVP075RnPnwTYtwxARiOUOOul7NB6NO+DFPy+fF4UhVqfkgR+EuCTfhAgI25Oe8G0MSDsy1mag==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.0.0-beta.7.tgz", + "integrity": "sha512-J1jRqpA9ShI9CNMs/Zi4NSAgGm4AOhal5M+P4w+YKX6HWpwpuD/0ximIA2mRQDAGD/FEAYoOul3lEDbqjUUKfQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.5.tgz", - "integrity": "sha512-v+luLY8xWBrUTC47B7AvsndfWGLf1SN3i9Mq05g9EO4aB/26zdF8Ez7qaBYFd2ZPlMtn6rmVc0Tlmk0No0X5lw==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.7.tgz", + "integrity": "sha512-xh2a55G82I7mFQPHYMAxFQ9MZgrJX3Ht6Lr45DHI4pVUjWMwtVoeWQtY7Fo30nIFhhqAzE8DhqcZMleNU4wPvw==", "dev": true, "requires": { + "canonical-path": "0.0.2", "chokidar": "^1.4.2", "convert-source-map": "^1.5.1", + "dependency-graph": "^0.7.2", "magic-string": "^0.25.0", "minimist": "^1.2.0", "reflect-metadata": "^0.1.2", - "source-map": "^0.6.1" + "shelljs": "^0.8.1", + "source-map": "^0.6.1", + "yargs": "9.0.1" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -230,6 +238,12 @@ "repeat-element": "^1.1.2" } }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, "chokidar": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", @@ -280,6 +294,12 @@ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", @@ -298,10 +318,22 @@ "is-buffer": "^1.1.5" } }, + "load-json-file": { + "version": "2.0.0", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + } + }, "magic-string": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.0.tgz", - "integrity": "sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz", + "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==", "dev": true, "requires": { "sourcemap-codec": "^1.4.1" @@ -327,83 +359,190 @@ "parse-glob": "^3.0.4", "regex-cache": "^0.4.2" } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } + }, + "shelljs": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz", + "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "yargs": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz", + "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", + "dev": true, + "requires": { + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" + } + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } } } }, "@angular/core": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.0.0-beta.5.tgz", - "integrity": "sha512-32yIDX3oEMuZt85nZpS2ErX7EUDgYH+HuPsSHASDuAmeqS3hRhqPTjIieZPcizPFyF7e/shSlSRLAlRJLDRqvg==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.0.0-beta.7.tgz", + "integrity": "sha512-KFI2DMTwTmWZ342+WU7aPaLHOOlIzdVbljzdKzSETfxnUqu/aeWRoRuFV/sulct2eH4CRx5Nk3h6mApcaIAKnQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/elements": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-7.0.0-beta.5.tgz", - "integrity": "sha512-o03nhKAxg4eA764cKZa/AVQ8srCtglhJarljd3GD8635z31cQCa9dQUOOWQK5oU1ZGIKZrrvhRVM/Z2tFAcK0w==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-7.0.0-beta.7.tgz", + "integrity": "sha512-bDeb5r3wqvdTVcgzZBTXe3yYEM8cM0oFkIQPAtzRzk6ESYT6hxP4a3fVsXtmdMbYwbHUPyJW99sA/KpwXbC+2w==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.0.0-beta.5.tgz", - "integrity": "sha512-1zDXxfQSX/uiSZxDbWQxGG99ePwQXmYA8cegeX39+MMC2GuITwdQkxya3Hqf4k/wHJ5AGkStalCKhAlQeplN4A==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.0.0-beta.7.tgz", + "integrity": "sha512-Fc5QOt8qY8jv5TB6KRUnSLr5iO9lghbnXfEo8V3aNvtqtDP8cqFbDuFlmy6w8lqjQgDbxowiB+Bi+vmwA6Zs/w==", "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.0.0-beta.5.tgz", - "integrity": "sha512-2mSCncE5ITvBPxM+rY7+v93Kr4U5jSP8CPvuZRPMOBlocwB7t0LFf5VDQNQ7Ke5r5HKzbXfeAOFCX4mRXFT06Q==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.0.0-beta.7.tgz", + "integrity": "sha512-pP2TPiEblq+5Opxb0upK5OUEzrNTkKeZWct+E5Aw2RvZM2mHz0AUKWZg3WxcK5Zd7xccgWeE7RS0rFCiWr+jSw==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.0.0-beta.5.tgz", - "integrity": "sha512-6bOsNAMZYi/Bs0aBErJYTBVVkn0BhOHwBzd3xJjIjFoCHnsDjcbDXCBBwiIDmG7h3NKpzi1nK8a7/uuD+J1LDw==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.0.0-beta.7.tgz", + "integrity": "sha512-ZA99RAqteilQl/vUCAm/RNbC11sn0BykKYDKOmZnQbI6NkfkfFAnCrolza3vifOLuTpjSzH9bs3nLWwzeIF0dg==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.5.tgz", - "integrity": "sha512-BS8PCSYn0CioHFHi4HCodkjncCcBo+f3Ci1d+6osqVfxX3nQgQ+pmmiBl4m5EefCX/bmk70/Gs+I2O8cvcSbag==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.7.tgz", + "integrity": "sha512-VyPzKj77CQQ/FELgzbW99bANhohh57FNBiSN87wOkPfR5Mw7Q/l3K6dNXRVB9HQM7qMscu88jROw7akwnbnsEQ==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/platform-server": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.0.0-beta.5.tgz", - "integrity": "sha512-/LPYqSXOPZmI2rSDcN7c26Qwo/blaJCdL0YfGjz2gXE1I/5dQAsOGoraOyFmVgZFw51/6Gyuw6NVoJi2Dhg08g==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.0.0-beta.7.tgz", + "integrity": "sha512-zcAGN5KDTmIndByDM49CS/wfpoNYVKZ5Adm1lOa8zbiFZ33VJn0ibTvGKms68+6j5Qk/98IPtEuV3Ohp8ihkIA==", "dev": true, "requires": { - "domino": "^2.0.1", + "domino": "^2.1.0", "tslib": "^1.9.0", "xhr2": "^0.1.4" } }, "@angular/router": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.0.0-beta.5.tgz", - "integrity": "sha512-AEvJmrahzfpMNg/avgRNhwARgNJ2sFhr3lTchl2mExs0ccZF+FRa9EbL0LQ/OXiyInYXQ3EIrwMLe3CekCF62A==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.0.0-beta.7.tgz", + "integrity": "sha512-dZgPWfygKYqA0JHBB0L8NXnKdC28UpAx2xi/YkKMzBTzdfhUuXm2n5RH9Kd4vm3iF3feanVShu5/dykoCP6H2g==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/upgrade": { - "version": "7.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-7.0.0-beta.5.tgz", - "integrity": "sha512-8z0v6WrfdKzcVpAVudf8skR/OQqV4QmYdtN/kkh0cPRBo7iAm6Jm0D2Dpc4wCf2HW1uDZX9IeWNq0oiYNs8YLg==", + "version": "7.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-7.0.0-beta.7.tgz", + "integrity": "sha512-Oh8DVM9DNvYVu01QJbZCGi3Cv7DN3kzGqZI5W5VQRC++b8+85+xXwnqTDIO12vRlFswYGmptyTDzeTic/gPZGQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -1333,52 +1472,20 @@ "dev": true }, "@schematics/angular": { - "version": "0.9.0-beta.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.2.tgz", - "integrity": "sha512-+IR5m3tVFSpyjSj0avWr9oKEBbHgstZZ7lfsmaNwrpNRxiQVlERGS0qLWJYLiOiMBQmJlss71lQAXtug8i1a/g==", + "version": "7.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.0.0-beta.4.tgz", + "integrity": "sha512-YJvTvAn3Dw0XFWCJhaMKk003cunkI6jLOcqU+BmEcdOTL/REs6ZSgiZueZdD7lmpq3DB44dUm8UXy3I4k7nZ6g==", "dev": true, "requires": { - "@angular-devkit/core": "0.9.0-beta.2", - "@angular-devkit/schematics": "0.9.0-beta.2", - "typescript": ">=2.6.2 <3.1" + "@angular-devkit/core": "7.0.0-beta.4", + "@angular-devkit/schematics": "7.0.0-beta.4", + "typescript": "3.0.1" }, "dependencies": { - "@angular-devkit/core": { - "version": "0.9.0-beta.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.2.tgz", - "integrity": "sha512-zs6kCtFSg1GBqC0Jq0nxndX43Tp1IphwCF8PCy2airLLs15OTzZ0lRqDy5hSzKWy6WsY3X6yUXXmSe+5fO6SiQ==", - "dev": true, - "requires": { - "ajv": "~6.4.0", - "chokidar": "^2.0.3", - "fast-json-stable-stringify": "^2.0.0", - "rxjs": "~6.2.0", - "source-map": "^0.5.6" - } - }, - "@angular-devkit/schematics": { - "version": "0.9.0-beta.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.2.tgz", - "integrity": "sha512-+4wJ7tTmzzTKxu8EUdIzytmDddeUNeUFfakqz7lG6Go5rGJCOO+GMY4oLPl8OAbE4kGv8Psz8DDP1xf/emlX1Q==", - "dev": true, - "requires": { - "@angular-devkit/core": "0.9.0-beta.2", - "rxjs": "~6.2.0" - } - }, - "rxjs": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", - "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "typescript": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz", + "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==", "dev": true } } @@ -1643,7 +1750,7 @@ }, "acorn-globals": { "version": "1.0.9", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", + "resolved": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "dev": true, "requires": { @@ -1742,7 +1849,7 @@ }, "ansi-colors": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "requires": { @@ -3525,7 +3632,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -5417,7 +5524,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "dev": true, "optional": true, @@ -6140,14 +6247,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6162,20 +6267,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -6292,8 +6394,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -6305,7 +6406,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6320,7 +6420,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6432,8 +6531,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -6445,7 +6543,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6567,7 +6664,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6684,7 +6780,7 @@ }, "gcp-metadata": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", + "resolved": "http://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "dev": true, "requires": { @@ -6756,7 +6852,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -7592,7 +7688,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7617,7 +7713,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { @@ -7626,7 +7722,7 @@ "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true } @@ -7786,7 +7882,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -9093,7 +9189,7 @@ "dependencies": { "ansi-regex": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "resolved": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", "dev": true }, @@ -9206,7 +9302,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -9511,7 +9607,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -9755,7 +9851,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -10739,7 +10835,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -11433,7 +11529,7 @@ }, "json5": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, @@ -11689,7 +11785,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -12439,7 +12535,7 @@ }, "magic-string": { "version": "0.22.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", + "resolved": "http://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", "dev": true, "requires": { @@ -12511,7 +12607,7 @@ }, "marked": { "version": "0.3.19", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", + "resolved": "http://registry.npmjs.org/marked/-/marked-0.3.19.tgz", "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", "dev": true }, @@ -12969,7 +13065,7 @@ }, "ncp": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz", "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=", "dev": true, "optional": true @@ -13186,7 +13282,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -13790,7 +13886,7 @@ }, "p-is-promise": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", "dev": true, "optional": true @@ -15688,7 +15784,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -18536,7 +18632,7 @@ }, "update-notifier": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz", "integrity": "sha1-B7XcIGazYnqztPUwEw9+3doHpMw=", "dev": true, "requires": { diff --git a/package.json b/package.json index d05e274801b2..604b59544656 100644 --- a/package.json +++ b/package.json @@ -25,15 +25,15 @@ "breaking-changes": "gulp breaking-changes" }, "version": "7.0.0-beta.2", - "requiredAngularVersion": ">=7.0.0-beta.5", + "requiredAngularVersion": ">=7.0.0-beta.7", "dependencies": { - "@angular/animations": "7.0.0-beta.5", - "@angular/common": "7.0.0-beta.5", - "@angular/compiler": "7.0.0-beta.5", - "@angular/core": "7.0.0-beta.5", - "@angular/elements": "7.0.0-beta.5", - "@angular/forms": "7.0.0-beta.5", - "@angular/platform-browser": "7.0.0-beta.5", + "@angular/animations": "7.0.0-beta.7", + "@angular/common": "7.0.0-beta.7", + "@angular/compiler": "7.0.0-beta.7", + "@angular/core": "7.0.0-beta.7", + "@angular/elements": "7.0.0-beta.7", + "@angular/forms": "7.0.0-beta.7", + "@angular/platform-browser": "7.0.0-beta.7", "@webcomponents/custom-elements": "^1.1.0", "core-js": "^2.4.1", "rxjs": "^6.3.2", @@ -43,20 +43,20 @@ "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/core": "^0.9.0-beta.3", - "@angular-devkit/schematics": "^0.9.0-beta.3", - "@angular/bazel": "7.0.0-beta.5", - "@angular/compiler-cli": "7.0.0-beta.5", - "@angular/http": "7.0.0-beta.5", - "@angular/platform-browser-dynamic": "7.0.0-beta.5", - "@angular/platform-server": "7.0.0-beta.5", - "@angular/router": "7.0.0-beta.5", - "@angular/upgrade": "7.0.0-beta.5", + "@angular-devkit/core": "7.0.0-beta.4", + "@angular-devkit/schematics": "7.0.0-beta.4", + "@angular/bazel": "7.0.0-beta.7", + "@angular/compiler-cli": "7.0.0-beta.7", + "@angular/http": "7.0.0-beta.7", + "@angular/platform-browser-dynamic": "7.0.0-beta.7", + "@angular/platform-server": "7.0.0-beta.7", + "@angular/router": "7.0.0-beta.7", + "@angular/upgrade": "7.0.0-beta.7", "@bazel/ibazel": "0.3.1", "@bazel/typescript": "^0.18.0", "@google-cloud/storage": "^1.1.1", "@octokit/rest": "^15.9.4", - "@schematics/angular": "^0.9.0-beta.2", + "@schematics/angular": "7.0.0-beta.4", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.3", "@types/glob": "^5.0.33", diff --git a/src/cdk-experimental/tsconfig-tests.json b/src/cdk-experimental/tsconfig-tests.json index 69260ffb5e80..2ad689835068 100644 --- a/src/cdk-experimental/tsconfig-tests.json +++ b/src/cdk-experimental/tsconfig-tests.json @@ -16,7 +16,12 @@ "angularCompilerOptions": { "strictMetadataEmit": true, "skipTemplateCodegen": true, - "emitDecoratorMetadata": true + "emitDecoratorMetadata": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ // Include the index.ts for each secondary entry-point diff --git a/src/cdk/schematics/utils/ast.ts b/src/cdk/schematics/utils/ast.ts index ccb7f3b44f73..1bf55d36da6b 100644 --- a/src/cdk/schematics/utils/ast.ts +++ b/src/cdk/schematics/utils/ast.ts @@ -6,16 +6,18 @@ * found in the LICENSE file at https://angular.io/license */ +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {SchematicsException, Tree} from '@angular-devkit/schematics'; import {Schema as ComponentOptions} from '@schematics/angular/component/schema'; import {addImportToModule} from '@schematics/angular/utility/ast-utils'; import {InsertChange} from '@schematics/angular/utility/change'; -import {getWorkspace, WorkspaceProject} from '@schematics/angular/utility/config'; +import {getWorkspace} from '@schematics/angular/utility/config'; import {findModuleFromOptions as internalFindModule} from '@schematics/angular/utility/find-module'; import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils'; import {getProjectMainFile} from './project-main-file'; import {ts} from './version-agnostic-typescript'; + /** Reads file given path and returns TypeScript source file. */ export function getSourceFile(host: Tree, path: string) { const buffer = host.read(path); diff --git a/src/cdk/schematics/utils/build-component.ts b/src/cdk/schematics/utils/build-component.ts index 2e8124bf0eb4..8b4829202fc9 100644 --- a/src/cdk/schematics/utils/build-component.ts +++ b/src/cdk/schematics/utils/build-component.ts @@ -181,7 +181,9 @@ export function buildComponent(options: ComponentOptions, .forEach(optionName => options[optionName] = defaultComponentOptions[optionName]); if (options.path === undefined) { - options.path = buildDefaultPath(project); + // TODO(jelbourn): figure out if the need for this `as any` is a bug due to two different + // incompatible `WorkspaceProject` classes in @angular-devkit + options.path = buildDefaultPath(project as any); } options.module = findModuleFromOptions(host, options); diff --git a/src/cdk/schematics/utils/get-project.ts b/src/cdk/schematics/utils/get-project.ts index 544d6e0e8a01..4d4045d2e572 100644 --- a/src/cdk/schematics/utils/get-project.ts +++ b/src/cdk/schematics/utils/get-project.ts @@ -6,14 +6,15 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject, WorkspaceSchema} from '@schematics/angular/utility/config'; +import {WorkspaceSchema, WorkspaceProject} from '@angular-devkit/core/src/workspace'; /** * Finds the specified project configuration in the workspace. Throws an error if the project * couldn't be found. */ -export function getProjectFromWorkspace(workspace: WorkspaceSchema, - projectName?: string): WorkspaceProject { +export function getProjectFromWorkspace( + workspace: WorkspaceSchema, + projectName?: string): WorkspaceProject { const project = workspace.projects[projectName || workspace.defaultProject!]; @@ -22,5 +23,4 @@ export function getProjectFromWorkspace(workspace: WorkspaceSchema, } return project; - } diff --git a/src/cdk/schematics/utils/project-main-file.ts b/src/cdk/schematics/utils/project-main-file.ts index ce652c350057..e822f5fd39c5 100644 --- a/src/cdk/schematics/utils/project-main-file.ts +++ b/src/cdk/schematics/utils/project-main-file.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; -import {WorkspaceProject} from '@schematics/angular/utility/config'; import {getProjectTargetOptions} from './project-targets'; /** Looks for the main TypeScript file in the given project and returns its path. */ diff --git a/src/cdk/schematics/utils/project-style-file.ts b/src/cdk/schematics/utils/project-style-file.ts index 7737b95a5ca9..8b9cf07517e5 100644 --- a/src/cdk/schematics/utils/project-style-file.ts +++ b/src/cdk/schematics/utils/project-style-file.ts @@ -7,7 +7,7 @@ */ import {normalize} from '@angular-devkit/core'; -import {WorkspaceProject} from '@schematics/angular/utility/config'; +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {getProjectTargetOptions} from './project-targets'; /** Regular expression that matches all possible Angular CLI default style files. */ diff --git a/src/cdk/schematics/utils/project-targets.ts b/src/cdk/schematics/utils/project-targets.ts index 2b2e4b9ea78a..39a0e5ad6be0 100644 --- a/src/cdk/schematics/utils/project-targets.ts +++ b/src/cdk/schematics/utils/project-targets.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@schematics/angular/utility/config'; +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; /** Resolves the architect options for the build target of the given project. */ export function getProjectTargetOptions(project: WorkspaceProject, buildTarget: string) { diff --git a/src/cdk/schematics/utils/schematic-options.ts b/src/cdk/schematics/utils/schematic-options.ts index cb5ae44fedd8..a6cdc9f0b1c4 100644 --- a/src/cdk/schematics/utils/schematic-options.ts +++ b/src/cdk/schematics/utils/schematic-options.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {WorkspaceProject} from '@schematics/angular/utility/config'; +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; + /** * Returns the default options for the `@schematics/angular:component` schematic which would diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json index 279182fd0091..271bb4b489a7 100644 --- a/src/cdk/tsconfig-tests.json +++ b/src/cdk/tsconfig-tests.json @@ -21,7 +21,12 @@ "strictMetadataEmit": true, "skipTemplateCodegen": true, "emitDecoratorMetadata": true, - "fullTemplateTypeCheck": true + "fullTemplateTypeCheck": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ // Include the index.ts for each secondary entry-point diff --git a/src/lib/schematics/ng-add/fonts/head-element.ts b/src/lib/schematics/ng-add/fonts/head-element.ts index 0e31051ef306..28a32e1434aa 100644 --- a/src/lib/schematics/ng-add/fonts/head-element.ts +++ b/src/lib/schematics/ng-add/fonts/head-element.ts @@ -6,12 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {SchematicsException, Tree} from '@angular-devkit/schematics'; import {getChildElementIndentation} from '@angular/cdk/schematics'; -import {WorkspaceProject} from '@schematics/angular/utility/config'; import {DefaultTreeDocument, DefaultTreeElement, parse as parseHtml} from 'parse5'; import {getIndexHtmlPath} from './project-index-html'; + /** Appends the given element HTML fragment to the index.html head tag. */ export function appendElementToHead(host: Tree, project: WorkspaceProject, elementHtml: string) { const indexPath = getIndexHtmlPath(project); diff --git a/src/lib/schematics/ng-add/fonts/project-index-html.ts b/src/lib/schematics/ng-add/fonts/project-index-html.ts index 94689cfc61b4..52e023fc8b75 100644 --- a/src/lib/schematics/ng-add/fonts/project-index-html.ts +++ b/src/lib/schematics/ng-add/fonts/project-index-html.ts @@ -6,9 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {SchematicsException} from '@angular-devkit/schematics'; import {getProjectTargetOptions} from '@angular/cdk/schematics'; -import {WorkspaceProject} from '@schematics/angular/utility/config'; + /** Looks for the index HTML file in the given project and returns its path. */ export function getIndexHtmlPath(project: WorkspaceProject): string { diff --git a/src/lib/schematics/ng-add/index.spec.ts b/src/lib/schematics/ng-add/index.spec.ts index 29d9ef3cbefb..f1f55ffbfa75 100644 --- a/src/lib/schematics/ng-add/index.spec.ts +++ b/src/lib/schematics/ng-add/index.spec.ts @@ -1,4 +1,5 @@ import {normalize} from '@angular-devkit/core'; +import {WorkspaceProject} from '@angular-devkit/core/src/workspace'; import {Tree} from '@angular-devkit/schematics'; import {SchematicTestRunner} from '@angular-devkit/schematics/testing'; import { @@ -7,7 +8,7 @@ import { getProjectStyleFile, getProjectTargetOptions, } from '@angular/cdk/schematics'; -import {getWorkspace, WorkspaceProject} from '@schematics/angular/utility/config'; +import {getWorkspace} from '@schematics/angular/utility/config'; import {getFileContent} from '@schematics/angular/utility/test'; import {getIndexHtmlPath} from './fonts/project-index-html'; diff --git a/src/lib/schematics/ng-add/theming/theming.ts b/src/lib/schematics/ng-add/theming/theming.ts index 53b6c0e99641..d2bae262959c 100644 --- a/src/lib/schematics/ng-add/theming/theming.ts +++ b/src/lib/schematics/ng-add/theming/theming.ts @@ -7,6 +7,7 @@ */ import {normalize} from '@angular-devkit/core'; +import {WorkspaceProject, WorkspaceSchema} from '@angular-devkit/core/src/workspace'; import {SchematicsException, Tree} from '@angular-devkit/schematics'; import { getProjectFromWorkspace, @@ -14,7 +15,7 @@ import { getProjectTargetOptions, } from '@angular/cdk/schematics'; import {InsertChange} from '@schematics/angular/utility/change'; -import {getWorkspace, WorkspaceProject, WorkspaceSchema} from '@schematics/angular/utility/config'; +import {getWorkspace} from '@schematics/angular/utility/config'; import {join} from 'path'; import {Schema} from '../schema'; import {createCustomTheme} from './custom-theme'; diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json index 9435c945af1e..38a22d74a68f 100644 --- a/src/lib/tsconfig-tests.json +++ b/src/lib/tsconfig-tests.json @@ -17,7 +17,12 @@ "strictMetadataEmit": true, "skipTemplateCodegen": true, "emitDecoratorMetadata": true, - "fullTemplateTypeCheck": true + "fullTemplateTypeCheck": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ "**/*.spec.ts", diff --git a/src/material-examples/tsconfig-tests.json b/src/material-examples/tsconfig-tests.json index 52a004118f50..6b44279145fb 100644 --- a/src/material-examples/tsconfig-tests.json +++ b/src/material-examples/tsconfig-tests.json @@ -13,7 +13,12 @@ "strictMetadataEmit": true, "skipTemplateCodegen": true, "emitDecoratorMetadata": true, - "fullTemplateTypeCheck": true + "fullTemplateTypeCheck": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ "**/*.spec.ts", diff --git a/src/material-experimental/tsconfig-tests.json b/src/material-experimental/tsconfig-tests.json index 52a004118f50..6b44279145fb 100644 --- a/src/material-experimental/tsconfig-tests.json +++ b/src/material-experimental/tsconfig-tests.json @@ -13,7 +13,12 @@ "strictMetadataEmit": true, "skipTemplateCodegen": true, "emitDecoratorMetadata": true, - "fullTemplateTypeCheck": true + "fullTemplateTypeCheck": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ "**/*.spec.ts", diff --git a/src/material-moment-adapter/tsconfig-tests.json b/src/material-moment-adapter/tsconfig-tests.json index dd642ffd1413..3231ab75afc2 100644 --- a/src/material-moment-adapter/tsconfig-tests.json +++ b/src/material-moment-adapter/tsconfig-tests.json @@ -13,7 +13,12 @@ "strictMetadataEmit": true, "skipTemplateCodegen": true, "emitDecoratorMetadata": true, - "fullTemplateTypeCheck": true + "fullTemplateTypeCheck": true, + + // Unset options inherited from tsconfig-build + "annotateForClosureCompiler": false, + "flatModuleOutFile": null, + "flatModuleId": null, }, "include": [ "**/*.spec.ts",