From ab3fd22b3bcdfd3ab7dfb774260d3d373967f524 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Nov 2020 12:11:00 +0000 Subject: [PATCH 1/3] build(deps): update angular-cli --- package.json | 4 +- yarn.lock | 138 +++++++++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 8d909ee2cb..e879e9a853 100644 --- a/package.json +++ b/package.json @@ -276,8 +276,8 @@ "zone.js": "~0.11.0" }, "devDependencies": { - "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#ef90f9afb303b1ce1e9598f95f3f8a60cc36d87b", - "@angular/cli": "github:angular/cli-builds#6ba627a26a4417bd5a2225f6360ef2ded33ad00d", + "@angular-devkit/build-angular": "github:angular/angular-devkit-build-angular-builds#5f59ac79270738b0d5017653cb399f4df30a342c", + "@angular/cli": "github:angular/cli-builds#3552504ac90a9bf563c62df7db2f84bb77e25e34", "@angular/compiler-cli": "github:angular/compiler-cli-builds#9b1cf8dceed1e1d3d3dabd264f6e1b8a2f0d3d09", "@angular/language-service": "github:angular/language-service-builds#0d9218db39a79e230ae139e1884363a78f1d0977", "@nguniversal/builders": "^10.0.1", diff --git a/yarn.lock b/yarn.lock index 084037f2f7..553755ac70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,12 +48,12 @@ "@angular-devkit/core" "10.0.2" rxjs "6.5.5" -"@angular-devkit/architect@github:angular/angular-devkit-architect-builds#c569cd0be": - version "0.1100.0-next.7+149.c569cd0" - uid "00c119ee87e94da7383f9c1871dcdd4538fd0cd7" - resolved "https://codeload.github.com/angular/angular-devkit-architect-builds/tar.gz/00c119ee87e94da7383f9c1871dcdd4538fd0cd7" +"@angular-devkit/architect@github:angular/angular-devkit-architect-builds#cc300212d": + version "0.1100.0-next.7+160.cc30021" + uid "1ead838722393cf2bfc349c13de93bbcd8402f7b" + resolved "https://codeload.github.com/angular/angular-devkit-architect-builds/tar.gz/1ead838722393cf2bfc349c13de93bbcd8402f7b" dependencies: - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" rxjs "6.6.3" "@angular-devkit/architect@~0.1001.3": @@ -64,15 +64,15 @@ "@angular-devkit/core" "10.1.4" rxjs "6.6.2" -"@angular-devkit/build-angular@github:angular/angular-devkit-build-angular-builds#ef90f9afb303b1ce1e9598f95f3f8a60cc36d87b": - version "0.1100.0-next.7+149.c569cd0" - uid ef90f9afb303b1ce1e9598f95f3f8a60cc36d87b - resolved "https://codeload.github.com/angular/angular-devkit-build-angular-builds/tar.gz/ef90f9afb303b1ce1e9598f95f3f8a60cc36d87b" +"@angular-devkit/build-angular@github:angular/angular-devkit-build-angular-builds#5f59ac79270738b0d5017653cb399f4df30a342c": + version "0.1100.0-next.7+160.cc30021" + uid "5f59ac79270738b0d5017653cb399f4df30a342c" + resolved "https://codeload.github.com/angular/angular-devkit-build-angular-builds/tar.gz/5f59ac79270738b0d5017653cb399f4df30a342c" dependencies: - "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#c569cd0be" - "@angular-devkit/build-optimizer" "github:angular/angular-devkit-build-optimizer-builds#c569cd0be" - "@angular-devkit/build-webpack" "github:angular/angular-devkit-build-webpack-builds#c569cd0be" - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" + "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#cc300212d" + "@angular-devkit/build-optimizer" "github:angular/angular-devkit-build-optimizer-builds#cc300212d" + "@angular-devkit/build-webpack" "github:angular/angular-devkit-build-webpack-builds#cc300212d" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" "@babel/core" "7.12.3" "@babel/generator" "7.12.1" "@babel/plugin-transform-runtime" "7.12.1" @@ -80,7 +80,7 @@ "@babel/runtime" "7.12.1" "@babel/template" "7.10.4" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "github:angular/ngtools-webpack-builds#c569cd0be" + "@ngtools/webpack" "github:angular/ngtools-webpack-builds#cc300212d" ansi-colors "4.1.1" autoprefixer "9.8.6" babel-loader "8.1.0" @@ -96,7 +96,7 @@ find-cache-dir "3.3.1" glob "7.1.6" inquirer "7.3.3" - jest-worker "26.6.1" + jest-worker "26.6.2" karma-source-map-support "1.4.0" less "3.12.2" less-loader "7.0.2" @@ -139,10 +139,10 @@ webpack-subresource-integrity "1.5.1" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@github:angular/angular-devkit-build-optimizer-builds#c569cd0be": - version "0.1100.0-next.7+149.c569cd0" - uid b0d4e81999470c62a8d89ed48967f9ce66efdaa2 - resolved "https://codeload.github.com/angular/angular-devkit-build-optimizer-builds/tar.gz/b0d4e81999470c62a8d89ed48967f9ce66efdaa2" +"@angular-devkit/build-optimizer@github:angular/angular-devkit-build-optimizer-builds#cc300212d": + version "0.1100.0-next.7+160.cc30021" + uid "9a868abc33fccdfed718b57b0193b00cbfe6c1a2" + resolved "https://codeload.github.com/angular/angular-devkit-build-optimizer-builds/tar.gz/9a868abc33fccdfed718b57b0193b00cbfe6c1a2" dependencies: loader-utils "2.0.0" source-map "0.7.3" @@ -150,13 +150,13 @@ typescript "4.0.5" webpack-sources "2.0.1" -"@angular-devkit/build-webpack@github:angular/angular-devkit-build-webpack-builds#c569cd0be": - version "0.1100.0-next.7+149.c569cd0" - uid fd6d9a92ebef117be3abdaeb72ccd0f226fec997 - resolved "https://codeload.github.com/angular/angular-devkit-build-webpack-builds/tar.gz/fd6d9a92ebef117be3abdaeb72ccd0f226fec997" +"@angular-devkit/build-webpack@github:angular/angular-devkit-build-webpack-builds#cc300212d": + version "0.1100.0-next.7+160.cc30021" + uid "723015ef36f175bf65ac48c6dbc07ad56dce1e60" + resolved "https://codeload.github.com/angular/angular-devkit-build-webpack-builds/tar.gz/723015ef36f175bf65ac48c6dbc07ad56dce1e60" dependencies: - "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#c569cd0be" - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" + "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#cc300212d" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" rxjs "6.6.3" "@angular-devkit/core@10.0.2", "@angular-devkit/core@^10.0.0": @@ -214,10 +214,10 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/core@github:angular/angular-devkit-core-builds#c569cd0be": - version "11.0.0-next.7+149.c569cd0" - uid "5f70b6e885f947ed016a48eae37340e9f8cf229a" - resolved "https://codeload.github.com/angular/angular-devkit-core-builds/tar.gz/5f70b6e885f947ed016a48eae37340e9f8cf229a" +"@angular-devkit/core@github:angular/angular-devkit-core-builds#cc300212d": + version "11.0.0-next.7+160.cc30021" + uid "50c2e6b4e70acdb531b89218a43b0fc56d4faf14" + resolved "https://codeload.github.com/angular/angular-devkit-core-builds/tar.gz/50c2e6b4e70acdb531b89218a43b0fc56d4faf14" dependencies: ajv "6.12.6" fast-json-stable-stringify "2.1.0" @@ -259,12 +259,12 @@ "@angular-devkit/core" "7.3.9" rxjs "6.3.3" -"@angular-devkit/schematics@github:angular/angular-devkit-schematics-builds#c569cd0be": - version "11.0.0-next.7+149.c569cd0" - uid "67e87918cc820fbb21fef29f002fa24362600332" - resolved "https://codeload.github.com/angular/angular-devkit-schematics-builds/tar.gz/67e87918cc820fbb21fef29f002fa24362600332" +"@angular-devkit/schematics@github:angular/angular-devkit-schematics-builds#cc300212d": + version "11.0.0-next.7+160.cc30021" + uid c3452144e155c700cd23210bd1d8237794ad54b4 + resolved "https://codeload.github.com/angular/angular-devkit-schematics-builds/tar.gz/c3452144e155c700cd23210bd1d8237794ad54b4" dependencies: - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" ora "5.1.0" rxjs "6.6.3" @@ -333,16 +333,16 @@ universal-analytics "0.4.20" uuid "7.0.2" -"@angular/cli@github:angular/cli-builds#6ba627a26a4417bd5a2225f6360ef2ded33ad00d": - version "11.0.0-next.7+149.c569cd0" - uid "6ba627a26a4417bd5a2225f6360ef2ded33ad00d" - resolved "https://codeload.github.com/angular/cli-builds/tar.gz/6ba627a26a4417bd5a2225f6360ef2ded33ad00d" +"@angular/cli@github:angular/cli-builds#3552504ac90a9bf563c62df7db2f84bb77e25e34": + version "11.0.0-next.7+160.cc30021" + uid "3552504ac90a9bf563c62df7db2f84bb77e25e34" + resolved "https://codeload.github.com/angular/cli-builds/tar.gz/3552504ac90a9bf563c62df7db2f84bb77e25e34" dependencies: - "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#c569cd0be" - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" - "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#c569cd0be" - "@schematics/angular" "github:angular/schematics-angular-builds#c569cd0be" - "@schematics/update" "github:angular/schematics-update-builds#c569cd0be" + "@angular-devkit/architect" "github:angular/angular-devkit-architect-builds#cc300212d" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" + "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#cc300212d" + "@schematics/angular" "github:angular/schematics-angular-builds#cc300212d" + "@schematics/update" "github:angular/schematics-update-builds#cc300212d" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" debug "4.2.0" @@ -356,7 +356,7 @@ resolve "1.18.1" rimraf "3.0.2" semver "7.3.2" - symbol-observable "2.0.3" + symbol-observable "3.0.0" universal-analytics "0.4.23" uuid "8.3.1" @@ -3849,12 +3849,12 @@ dependencies: tslib "^2.0.0" -"@ngtools/webpack@github:angular/ngtools-webpack-builds#c569cd0be": - version "11.0.0-next.7+149.c569cd0" - uid c9dd83497a0ef517826b6d4ff7c2dc5298d128da - resolved "https://codeload.github.com/angular/ngtools-webpack-builds/tar.gz/c9dd83497a0ef517826b6d4ff7c2dc5298d128da" +"@ngtools/webpack@github:angular/ngtools-webpack-builds#cc300212d": + version "11.0.0-next.7+160.cc30021" + uid be7395b344347b2305c6b22f0f9d227ea15d1e80 + resolved "https://codeload.github.com/angular/ngtools-webpack-builds/tar.gz/be7395b344347b2305c6b22f0f9d227ea15d1e80" dependencies: - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" enhanced-resolve "5.3.1" webpack-sources "2.0.1" @@ -4622,13 +4622,13 @@ "@angular-devkit/core" "8.3.20" "@angular-devkit/schematics" "8.3.20" -"@schematics/angular@github:angular/schematics-angular-builds#c569cd0be": - version "11.0.0-next.7+149.c569cd0" - uid "7503838b9280b33d2e9ac0f69885bec9b7e735ef" - resolved "https://codeload.github.com/angular/schematics-angular-builds/tar.gz/7503838b9280b33d2e9ac0f69885bec9b7e735ef" +"@schematics/angular@github:angular/schematics-angular-builds#cc300212d": + version "11.0.0-next.7+160.cc30021" + uid dfd52f26880770be260b92a981fcfdfbc71d9368 + resolved "https://codeload.github.com/angular/schematics-angular-builds/tar.gz/dfd52f26880770be260b92a981fcfdfbc71d9368" dependencies: - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" - "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#c569cd0be" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" + "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#cc300212d" jsonc-parser "2.3.1" "@schematics/angular@~10.1.3": @@ -4655,13 +4655,13 @@ semver "7.1.3" semver-intersect "1.4.0" -"@schematics/update@github:angular/schematics-update-builds#c569cd0be": - version "0.1100.0-next.7+149.c569cd0" - uid e6008d29ea63a8a3ad0d5cece446bb9b5910db8a - resolved "https://codeload.github.com/angular/schematics-update-builds/tar.gz/e6008d29ea63a8a3ad0d5cece446bb9b5910db8a" +"@schematics/update@github:angular/schematics-update-builds#cc300212d": + version "0.1100.0-next.7+160.cc30021" + uid "9e15d4c5ee243d96dea89df43e4edde2e8b88bef" + resolved "https://codeload.github.com/angular/schematics-update-builds/tar.gz/9e15d4c5ee243d96dea89df43e4edde2e8b88bef" dependencies: - "@angular-devkit/core" "github:angular/angular-devkit-core-builds#c569cd0be" - "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#c569cd0be" + "@angular-devkit/core" "github:angular/angular-devkit-core-builds#cc300212d" + "@angular-devkit/schematics" "github:angular/angular-devkit-schematics-builds#cc300212d" "@yarnpkg/lockfile" "1.1.0" ini "1.3.5" npm-package-arg "^8.0.0" @@ -10776,10 +10776,10 @@ jasminewd2@^2.1.0: resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4= -jest-worker@26.6.1: - version "26.6.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.1.tgz#c2ae8cde6802cc14056043f997469ec170d9c32a" - integrity sha512-R5IE3qSGz+QynJx8y+ICEkdI2OJ3RJjRQVEyCcFAd3yVhQSEtquziPO29Mlzgn07LOVE8u8jhJ1FqcwegiXWOw== +jest-worker@26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -16305,10 +16305,10 @@ symbol-observable@1.2.0, symbol-observable@^1.2.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -symbol-observable@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a" - integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA== +symbol-observable@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-3.0.0.tgz#eea8f6478c651018e059044268375c408c15c533" + integrity sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q== symbol-tree@^3.2.4: version "3.2.4" From 8e5b105ab9e1e2b068cc1eab946ce02a587e4033 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Wed, 4 Nov 2020 23:46:53 +0200 Subject: [PATCH 2/3] build: add support for different failing projects per JS version target This allows having projects that fail when targeting one version (for example, ES5) but not in another (for example, ES2015). --- .circleci/config.yml | 2 +- infra/build.ts | 3 ++- infra/failing-projects.json | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ef06a68e3..fd99fbdbfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ jobs: # Switch `tsconfig.base.json` to the specified target. - run: node --eval "const tsCfgPath = './tsconfig.base.json', tsCfg = require(tsCfgPath); tsCfg.compilerOptions.target = '<< parameters.target >>'; fs.writeFileSync(tsCfgPath, JSON.stringify(tsCfg))" # Run tests! - - run: yarn build --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} + - run: yarn build --target=<< parameters.target >> --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} - notify_webhook_on_fail: webhook_url_env_var: SLACK_NGCC_WEBHOOK_URL run_ngcc_standalone: diff --git a/infra/build.ts b/infra/build.ts index 81a19a1cb7..966ca63b7d 100644 --- a/infra/build.ts +++ b/infra/build.ts @@ -5,9 +5,10 @@ import { Worker } from 'worker_threads'; import { argv } from 'yargs'; import { projects } from '../angular.json'; -import * as failingProjectsList from './failing-projects.json'; +import * as failingProjectsJson from './failing-projects.json'; const allProjectNames = Object.keys(projects).sort(); +const failingProjectsList = failingProjectsJson[argv.target as keyof typeof failingProjectsJson]; const failingProjects = new Set(failingProjectsList); interface Output { diff --git a/infra/failing-projects.json b/infra/failing-projects.json index e5843ce6bf..bda7194700 100644 --- a/infra/failing-projects.json +++ b/infra/failing-projects.json @@ -1,5 +1,12 @@ -[ - "igniteui-angular-ngcc", - "nativescript-angular-ngcc", - "ng6-breadcrumbs-ngcc" -] +{ + "es2015": [ + "igniteui-angular-ngcc", + "nativescript-angular-ngcc", + "ng6-breadcrumbs-ngcc" + ], + "es5": [ + "igniteui-angular-ngcc", + "nativescript-angular-ngcc", + "ng6-breadcrumbs-ngcc" + ] +} From 5030e3d9f38cfae3483b50dc3beea585b617f4af Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Wed, 4 Nov 2020 23:49:51 +0200 Subject: [PATCH 3/3] build: add `devextreme-angular-ngcc` to the list of projects failing in ES5 --- infra/failing-projects.json | 1 + 1 file changed, 1 insertion(+) diff --git a/infra/failing-projects.json b/infra/failing-projects.json index bda7194700..1318956f45 100644 --- a/infra/failing-projects.json +++ b/infra/failing-projects.json @@ -5,6 +5,7 @@ "ng6-breadcrumbs-ngcc" ], "es5": [ + "devextreme-angular-ngcc", "igniteui-angular-ngcc", "nativescript-angular-ngcc", "ng6-breadcrumbs-ngcc"