diff --git a/package.json b/package.json index ab61fb1b8289..f946325ee434 100644 --- a/package.json +++ b/package.json @@ -66,20 +66,20 @@ ] }, "devDependencies": { - "@angular/animations": "9.1.4", + "@angular/animations": "10.0.0-next.5", "@angular/cdk": "9.2.2", - "@angular/common": "9.1.4", - "@angular/compiler": "9.1.4", - "@angular/compiler-cli": "9.1.4", - "@angular/core": "9.1.4", - "@angular/forms": "9.1.4", - "@angular/localize": "9.1.4", + "@angular/common": "10.0.0-next.5", + "@angular/compiler": "10.0.0-next.5", + "@angular/compiler-cli": "10.0.0-next.5", + "@angular/core": "10.0.0-next.5", + "@angular/forms": "10.0.0-next.5", + "@angular/localize": "10.0.0-next.5", "@angular/material": "9.2.2", - "@angular/platform-browser": "9.1.4", - "@angular/platform-browser-dynamic": "9.1.4", - "@angular/platform-server": "9.1.4", - "@angular/router": "9.1.4", - "@angular/service-worker": "9.1.4", + "@angular/platform-browser": "10.0.0-next.5", + "@angular/platform-browser-dynamic": "10.0.0-next.5", + "@angular/platform-server": "10.0.0-next.5", + "@angular/router": "10.0.0-next.5", + "@angular/service-worker": "10.0.0-next.5", "@babel/core": "7.9.6", "@babel/generator": "7.9.6", "@babel/plugin-transform-runtime": "7.9.6", @@ -170,7 +170,7 @@ "mini-css-extract-plugin": "0.9.0", "minimatch": "3.0.4", "minimist": "^1.2.0", - "ng-packagr": "~9.0.0", + "ng-packagr": "~10.0.0-next.0", "node-fetch": "^2.2.0", "npm-registry-client": "8.6.0", "open": "7.0.3", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 9f19f96c744a..b50c8b52ddc2 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -74,7 +74,7 @@ "worker-plugin": "4.0.3" }, "peerDependencies": { - "@angular/compiler-cli": ">=9.0.0 < 10", + "@angular/compiler-cli": ">=10.0.0-next.0 < 11", "typescript": ">=3.6 < 3.9" }, "peerDependenciesMeta": { diff --git a/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts index 69df646deef3..ede66e571a1c 100644 --- a/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts +++ b/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts @@ -93,6 +93,9 @@ describe('Browser Builder service worker', () => { '/favicon.ico', '/index.html', ], + cacheQueryOptions: { + ignoreVary: true, + }, patterns: [], }, { @@ -103,6 +106,9 @@ describe('Browser Builder service worker', () => { '/assets/folder-asset.txt', '/spectrum.png', ], + cacheQueryOptions: { + ignoreVary: true, + }, patterns: [], }, ], @@ -152,6 +158,9 @@ describe('Browser Builder service worker', () => { '/foo/bar/index.html', ], patterns: [], + cacheQueryOptions: { + ignoreVary: true, + }, }, { name: 'assets', @@ -161,6 +170,9 @@ describe('Browser Builder service worker', () => { '/foo/bar/assets/folder-asset.txt', ], patterns: [], + cacheQueryOptions: { + ignoreVary: true, + }, }, ], dataGroups: [], diff --git a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts index 2640ac083eff..416ea4fcc93e 100644 --- a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts +++ b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts @@ -694,14 +694,8 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) { const { default: generate } = await import('@babel/generator'); - // In Angular v10.0.0 the `source_file_utils` file was moved. - // (Remember to remove the `tryImport()` function when only one import path is required.) // tslint:disable-next-line: no-implicit-dependencies - const utils = await tryImport( - '@angular/localize/src/tools/src/source_file_utils', - '@angular/localize/src/tools/src/translate/source_files/source_file_utils', - ); - + const utils = await import('@angular/localize/src/tools/src/source_file_utils'); // tslint:disable-next-line: no-implicit-dependencies const localizeDiag = await import('@angular/localize/src/tools/src/diagnostics'); @@ -783,17 +777,6 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) { return { file: options.filename, diagnostics: diagnostics.messages, count: positions.length }; } -async function tryImport(...importPaths: string[]): Promise { - for (const importPath of importPaths) { - try { - return await import(importPath); - } catch { - // Do nothing - } - } - throw new Error('Unable to import from any of these paths:\n' + importPaths.map(p => ` - ${p}`).join('\n')); -} - function inlineCopyOnly(options: InlineOptions) { if (!i18n) { throw new Error('i18n options are missing'); @@ -818,7 +801,7 @@ function findLocalizePositions( ast: ParseResult, options: InlineOptions, // tslint:disable-next-line: no-implicit-dependencies - utils: typeof import('@angular/localize/src/tools/src/translate/source_files/source_file_utils'), + utils: typeof import('@angular/localize/src/tools/src/source_file_utils'), ): LocalizePosition[] { const positions: LocalizePosition[] = []; if (options.es5) { diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json index bb70176c0f5b..44362084ebe3 100644 --- a/packages/angular_devkit/build_ng_packagr/package.json +++ b/packages/angular_devkit/build_ng_packagr/package.json @@ -11,14 +11,14 @@ "rxjs": "6.5.5" }, "peerDependencies": { - "ng-packagr": "^9.0.0", - "tsickle": "~0.37.1 || ~0.38.0" + "ng-packagr": "^10.0.0-next.0", + "tsickle": "~0.38.0" }, "devDependencies": { - "@angular/compiler": "9.1.4", - "@angular/compiler-cli": "9.1.4", + "@angular/compiler": "10.0.0-next.5", + "@angular/compiler-cli": "10.0.0-next.5", "@angular-devkit/core": "0.0.0", - "ng-packagr": "~9.1.0", + "ng-packagr": "~10.0.0-next.0", "tslib": "^1.10.0" }, "peerDependenciesMeta": { diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts index a9c3412cc4aa..c06fcab9422b 100644 --- a/packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts +++ b/packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts @@ -63,9 +63,9 @@ describe('NgPackagr Builder', () => { await run.stop(); - expect(host.scopedSync().exists(normalize('./dist/lib/fesm5/lib.js'))).toBe(true); + expect(host.scopedSync().exists(normalize('./dist/lib/fesm2015/lib.js'))).toBe(true); const content = virtualFs.fileBufferToString( - host.scopedSync().read(normalize('./dist/lib/fesm5/lib.js')), + host.scopedSync().read(normalize('./dist/lib/fesm2015/lib.js')), ); expect(content).toContain('lib works'); @@ -99,7 +99,7 @@ describe('NgPackagr Builder', () => { await run.output.pipe( tap((buildEvent) => expect(buildEvent.success).toBe(true)), map(() => { - const fileName = './dist/lib/fesm5/lib.js'; + const fileName = './dist/lib/fesm2015/lib.js'; const content = virtualFs.fileBufferToString( host.scopedSync().read(normalize(fileName)), ); diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 55b15be4d200..d81f9a1e5a70 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -27,13 +27,13 @@ "webpack-sources": "1.4.3" }, "peerDependencies": { - "@angular/compiler-cli": ">=9.0.0 < 10", + "@angular/compiler-cli": ">=10.0.0-next.0 < 11", "typescript": ">=3.6 < 3.9", "webpack": "^4.0.0" }, "devDependencies": { - "@angular/compiler": "9.1.4", - "@angular/compiler-cli": "9.1.4", + "@angular/compiler": "10.0.0-next.5", + "@angular/compiler-cli": "10.0.0-next.5", "typescript": "3.8.3", "webpack": "4.42.1" } diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts index c1e5bf891e61..12a7696e5c37 100644 --- a/packages/schematics/angular/utility/latest-versions.ts +++ b/packages/schematics/angular/utility/latest-versions.ts @@ -22,5 +22,5 @@ export const latestVersions = { DevkitBuildNgPackagr: '~0.1000.0-next.3', DevkitBuildWebpack: '~0.1000.0-next.3', - ngPackagr: '^9.0.0', + ngPackagr: '^10.0.0-next.0', }; diff --git a/yarn.lock b/yarn.lock index 3471458fe137..7d89894df0c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@angular/animations@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.1.4.tgz#22f64a062103d4903f2c7d862889a88fc6553bc7" - integrity sha512-gMo/DbCm5BDArladMAeC7/75T2DvhLr4CSUGJt/P/aimTEG2ywoAALs3pzwSSe4qxrHiR0OIksVW3l4km3iXEw== +"@angular/animations@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.0.0-next.5.tgz#77dec4e94d447ff8fd33110c45666f90832286c7" + integrity sha512-5vC265XkSPrqcUOVsv82NsLcy85e1b7EpTxX5lscDV9F4TGTPfms2zFY0kfQR4A/pZ1tSaKRUlJCxtA695EAMA== "@angular/cdk@9.2.2": version "9.2.2" @@ -14,15 +14,15 @@ optionalDependencies: parse5 "^5.0.0" -"@angular/common@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.1.4.tgz#23d7b42cd87aba634b78b8d73e12c6ebffe86043" - integrity sha512-JvCoCWVbx0tF7l/0WTi24ui/mc2SElyVSNchR4VK/FViARnkvnSBdI/Ef5QWXrsPyKU4PYBtnWWgyxRspH+FBA== +"@angular/common@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.0-next.5.tgz#579b5667606b94d4e4288d9127c777aac6f18500" + integrity sha512-kHXKm+OsqsmIv1ZPZNE4reDFGtBVEzEj3XnE3LtY4HbvfjHa+gTspjAJXoD4BkVKHIbOa8bN1fxruzXxiFnfIA== -"@angular/compiler-cli@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.1.4.tgz#24c7c7060bb13f65337fb2998322d56021e185c1" - integrity sha512-n3PzqNnPD7s/AF9mv5CnarK0sgfoq4txFncHjJWBSltuTQoz6BDZyjuEdqsSLUvgAZPeLsmohemOzEE38HYHZA== +"@angular/compiler-cli@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.0.0-next.5.tgz#03553a978dd19b2dcd82e6c5f9728cf593dd8786" + integrity sha512-yOWclq1b98AUPaFXKzEeEL62dcP7pdA5f7UwJE79wQLF4nfJ0LiJ+4vR7A2baqVrHZHiK7DL/KbU2tRd5pPV6Q== dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -37,25 +37,25 @@ sourcemap-codec "^1.4.8" yargs "15.3.0" -"@angular/compiler@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.1.4.tgz#fe833fc3b74768bdd56b1bdd0010870f38ffaedc" - integrity sha512-B+f3lviFNEJtL9V9exSKYPSz2Ddb6dxgPzQR7GSjGikDo+fKMtC1PjNwgJooS9gavhQx30uwkEEMIPYQbM6nNA== +"@angular/compiler@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.0.0-next.5.tgz#7f83feb6c477683644cf0b43b636eeae62a88644" + integrity sha512-Y15MTkSkmUryuX6NNk/tcTMGbG1YpD5FMEIdCs36WKr70g31ueuXV9f5hvN26ODOePrsXnKjHaBLn4s2GBE4Kg== -"@angular/core@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.1.4.tgz#85f5322f42cf8add597fc6b02913e8fc3308c361" - integrity sha512-ND240vncmVD2KVe/KSQU3d/DxxoRipFg1+jFOFZGt0n0orCBHk/V1fu9iaG1sRyldL0+rCQ+fTI+1N4DTmMnxA== +"@angular/core@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.0-next.5.tgz#0d2cab9f6e0eaa28d82c7e11d5a3bb7a2478fec7" + integrity sha512-2yGxpAhEggJ+rczN4T0wcUzaM5OKobleXjo7R/CGuqzz3icxtfWi+ZRzHMD7TTAfpz2blkR4fd6bfbae9IGReg== -"@angular/forms@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.1.4.tgz#7cb75b5731bd6cbcf4a45b7b2cc68b3581de8cc1" - integrity sha512-Njt+pMLfPBchL0/ayIjJqXL6ZfM4Ccvf7KO1wS1HMzh3QlmfNa0JSgc4pfrbRJAMN9g7V/FYLyKejs1bJZkenA== +"@angular/forms@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.0-next.5.tgz#a29523b64a2164d6dc8eab3da82a99d20e02c5bc" + integrity sha512-VjSjl5bN1V+yu1iRmVoZIVikUzkeJdTN+m679cBhNHGUVL31ah27VUIsTInHBkU51w3QElGuuK3FlzxuDvtbIg== -"@angular/localize@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.1.4.tgz#3073886a92a6d58918114750ec657cc40726f50d" - integrity sha512-//iE4h45ThsvtAWzk4TS2w9/AIGm5Gk+xspScdQDN3a6RlZh2f0E9fEC1PGjc/1oxxQvUiWVFdHkCgLSnRmEEQ== +"@angular/localize@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-10.0.0-next.5.tgz#4ef4c00fb808a36d0423f88dbeeebb9a8d3c4a0c" + integrity sha512-gwhf/7V5kRNiVGbtV5O2uVEOROs3jdi4oiAF1zMyUoqrXPT0mk8QOVnBeNWfer9lMCzhZjjzmVSIx47qLbZBww== dependencies: "@babel/core" "7.8.3" glob "7.1.2" @@ -66,33 +66,33 @@ resolved "https://registry.yarnpkg.com/@angular/material/-/material-9.2.2.tgz#53b2d8a62fe48b79127cdf43b3b8b082e4c3df27" integrity sha512-gdQiMJ6PtW/5fd+0mglHFyzxULDCBGjn9RTET3sUq2rkc9+jBXr4OvnsUyBWSnqqv97XqotVDIx5JgE4/YX/Rw== -"@angular/platform-browser-dynamic@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.4.tgz#bf1cde9156bd29eeeef932b683b0c993614f75d5" - integrity sha512-YtVbnxyS6FU7xNpA6A95tmSfrB8+WC7OH3mbP8M9NaGk0OYz8B/JOe1HByP4JRpEGCvBtXdJ2NSW/MpLIT8SiQ== +"@angular/platform-browser-dynamic@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.0-next.5.tgz#601c87ee00ff5a1c3975c44664f3a09d5a46d981" + integrity sha512-qRuPCYa4cMpSeRoeyTN0JROQOuWXHcMFcGaTk/ioLhU8FZAxlzU7kcQMkMuDSc4TFXZX8MyhlbSrFuWAc/JCQQ== -"@angular/platform-browser@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.1.4.tgz#c4fe868f12a6593702967a957a6bc8aa50c34f3b" - integrity sha512-mBCHfTl+5tQfaUiGlDujP7mFBzovFc54Zi2kcCE8DSdSSVQ2TPBo6hXa6y2cL3hJPFZzQ7mC4ORFrsGADhHn/w== +"@angular/platform-browser@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.0-next.5.tgz#aefd658ea3913e8648293313b7d7439a2244765a" + integrity sha512-N4ojsX/OFv/QHBXUSPei0s53R0KZILU6dqQMz1uEQK0RAEUSDmhk649G7eIzQb5DNESODgfezOCSLKZIbEIbCA== -"@angular/platform-server@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.1.4.tgz#61c704dffb250d244d6286813537b40edbf70f59" - integrity sha512-FynxZ1bmR2itvwKanUVzuUjugfZcIxZcT0Dx98BRol0Oc30RitRz8paJk9xAxySKSpZacwGJ/HkSxQdjIYWJOw== +"@angular/platform-server@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-10.0.0-next.5.tgz#e8dc76d88ea40f2c3e7aca32b7795f6965636008" + integrity sha512-edpyxn3NFVT7LVbm/VUM79D+nNpwY5H/WNIvg2XLL6Rpn3FBM0PthSiQ1Wq9SzAMgpvEbi0AO3IAp6t4Hf+SXQ== dependencies: domino "^2.1.2" xhr2 "^0.2.0" -"@angular/router@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.1.4.tgz#1bd09c84d1ec75bdc7cc75e80014eda5041ffeb7" - integrity sha512-yUyjCgG2P2Jh8MvoyC6yirmAtx1Qe7MKLuLvsa9WOB571QNEcNLTYMfAMHUKsQTcE/+o984QyLlneoibgI9wFA== +"@angular/router@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.0-next.5.tgz#ba895441305b64e44727394b14705416d393da8f" + integrity sha512-9eIvYBzs0cIO93jfL1arDpUNRwUKfYbHkwKYeCDqX5EWHs7lrNEWgyIoHjbX5JsQvgtJuBKmKXQ++g5PtIPC5w== -"@angular/service-worker@9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-9.1.4.tgz#acafd57fae1f745c42f6a3adf461c8bb032013c7" - integrity sha512-q3MIgWOeCg9DhQGDk81bDJYjauBtf3GxvtGnnZG6XEjw3r3k/ykTyRPGHgC5MTw/XFF4Y6dfpgLIXT42AXLhaw== +"@angular/service-worker@10.0.0-next.5": + version "10.0.0-next.5" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.0.0-next.5.tgz#77b83c5270f88883d4e98d8442690e2c94ab9067" + integrity sha512-6ZTVbJ96jHS7KgJD+me/ktO9K18uEAYCLCdBDFnKVtMXD0OgZgWXj36HDNE9Is49O5EIAtDpoEnZYDqwOTJmhQ== "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" @@ -1192,7 +1192,7 @@ is-module "^1.0.0" resolve "^1.14.2" -"@rollup/pluginutils@^3.0.1", "@rollup/pluginutils@^3.0.8": +"@rollup/pluginutils@^3.0.8": version "3.0.9" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.9.tgz#aa6adca2c45e5a1b950103a999e3cddfe49fd775" integrity sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg== @@ -1201,6 +1201,15 @@ estree-walker "^1.0.1" micromatch "^4.0.2" +"@rollup/pluginutils@^3.0.9": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12" + integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw== + dependencies: + "@types/estree" "0.0.39" + estree-walker "^1.0.1" + picomatch "^2.2.2" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -1342,11 +1351,6 @@ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== -"@types/estree@*": - version "0.0.44" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz#980cc5a29a3ef3bea6ff1f7d021047d7ea575e21" - integrity sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -2067,7 +2071,7 @@ acorn@^6.2.1, acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.0, acorn@^7.1.1: +acorn@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== @@ -3253,13 +3257,6 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-css@^4.1.11: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== - dependencies: - source-map "~0.6.0" - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -3449,10 +3446,10 @@ commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@~2.20.3: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== common-tags@^1.8.0: version "1.8.0" @@ -5396,15 +5393,6 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" @@ -8281,42 +8269,10 @@ next-tick@~1.0.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -ng-packagr@~9.0.0: - version "9.0.3" - resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-9.0.3.tgz#5467b7f84595c0e738444e5694614418545b6609" - integrity sha512-6TmJJWbrU6CtCwoXUvVWukWc1TMpRsDB39cQkk4zPVMY9Qsubh5gZs0LGbJ7b7dGPu3Cr2LAlaSK8BxedccPhQ== - dependencies: - "@rollup/plugin-commonjs" "^11.0.2" - "@rollup/plugin-json" "^4.0.0" - "@rollup/plugin-node-resolve" "^7.1.0" - ajv "^6.10.2" - autoprefixer "^9.6.5" - browserslist "^4.7.0" - chalk "^3.0.0" - chokidar "^3.2.1" - clean-css "^4.1.11" - commander "^4.0.0" - fs-extra "^8.1.0" - glob "^7.1.2" - injection-js "^2.2.1" - less "^3.10.3" - node-sass-tilde-importer "^1.0.0" - postcss "^7.0.18" - postcss-url "^8.0.0" - read-pkg-up "^5.0.0" - rimraf "^3.0.0" - rollup "1.32.1" - rollup-plugin-sourcemaps "^0.5.0" - rxjs "^6.5.0" - sass "^1.23.0" - stylus "^0.54.7" - terser "^4.3.8" - update-notifier "^4.0.0" - -ng-packagr@~9.1.0: - version "9.1.1" - resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-9.1.1.tgz#ba3b929ced0a8bd637e89a84ac2591d8abb53c69" - integrity sha512-20umbeklnsntUoTXBKuQQj4Oyw1tauVU7TZPRFC+n3bXuB29rb+91HIBtt8k7l0BuXN5G4HiXgmPW8xDGu7HWg== +ng-packagr@~10.0.0-next.0: + version "10.0.0-next.0" + resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-10.0.0-next.0.tgz#2a68baf73648410e644add861b00a01b6e0d5acc" + integrity sha512-eIuorjX5jZb+JeemvvhKjjcl2yMfolFrI2l2JnWGaCfiM20MJ8mLZfTtnx76R+9T1RYWe6ikwESkhnGzw5hRDg== dependencies: "@rollup/plugin-commonjs" "^11.0.2" "@rollup/plugin-json" "^4.0.0" @@ -8326,19 +8282,19 @@ ng-packagr@~9.1.0: browserslist "^4.7.0" chalk "^4.0.0" chokidar "^3.2.1" - clean-css "^4.1.11" - commander "^4.0.0" + commander "^5.0.0" + cssnano-preset-default "^4.0.7" fs-extra "^9.0.0" glob "^7.1.2" injection-js "^2.2.1" less "^3.10.3" node-sass-tilde-importer "^1.0.0" - postcss "^7.0.18" + postcss "^7.0.29" postcss-url "^8.0.0" read-pkg-up "^5.0.0" rimraf "^3.0.0" - rollup "2.6.1" - rollup-plugin-sourcemaps "^0.5.0" + rollup "2.8.0" + rollup-plugin-sourcemaps "^0.6.0" rxjs "^6.5.0" sass "^1.23.0" stylus "^0.54.7" @@ -9254,7 +9210,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: +picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== @@ -9714,7 +9670,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== -"postcss@5 - 7", postcss@7.0.27, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: +"postcss@5 - 7", postcss@7.0.27, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== @@ -9732,7 +9688,7 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@7.0.29: +postcss@7.0.29, postcss@^7.0.29: version "7.0.29" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e" integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw== @@ -10631,22 +10587,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-sourcemaps@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.5.0.tgz#898e8411c9b5b7b524b4d96c3b41d5c43f9da77e" - integrity sha512-xp2vvRvgnYiXydgf/JFFFgYxrqMaQaOrK/g6yZvgwT9R1TSYjD3HKku1pD7iQNjQHkl5yGpokvJLp7cP/lR+aQ== - dependencies: - "@rollup/pluginutils" "^3.0.1" - source-map-resolve "^0.5.3" - -rollup@1.32.1: - version "1.32.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4" - integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A== +rollup-plugin-sourcemaps@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.1.tgz#32dc6f237ee235f10de56c829f31e39bd57a3eab" + integrity sha512-XNA1KSNPL75Niu1w5cxGXwXrY3YNkdkknK20ZupcDIx7utm0fxXcDvtyfBQVLJgxJiDFN8AVNcSO1fm5/9Di4Q== dependencies: - "@types/estree" "*" - "@types/node" "*" - acorn "^7.1.0" + "@rollup/pluginutils" "^3.0.9" + source-map-resolve "^0.6.0" rollup@2.3.4: version "2.3.4" @@ -10655,13 +10602,6 @@ rollup@2.3.4: optionalDependencies: fsevents "~2.1.2" -rollup@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.6.1.tgz#8354e67caa7b8bf24c2488d9e2f64da2be62eebe" - integrity sha512-1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg== - optionalDependencies: - fsevents "~2.1.2" - rollup@2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.8.0.tgz#a1d63fa8331f5c362f025a7fee78b86d4ada5cef" @@ -11165,7 +11105,7 @@ source-map-loader@0.2.4: async "^2.5.0" loader-utils "^1.1.0" -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2, source-map-resolve@^0.5.3: +source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== @@ -11176,6 +11116,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2, source-map-resolve@^0.5.3: source-map-url "^0.4.0" urix "^0.1.0" +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@0.5.16: version "0.5.16" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"