Skip to content

[pull] master from angular:master #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Jun 11, 2021
Merged

[pull] master from angular:master #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b17937a
build: update all non-major dependencies
renovate-bot Jun 11, 2021
7d57e5a
build: update dependency postcss-loader to v6
renovate-bot Jun 11, 2021
cc4afa2
refactor(@angular-devkit/build-angular): ignore postcss-loader warning
alan-agius4 Jun 11, 2021
071c8d1
fix(@angular-devkit/build-angular): don't parse `new Worker` syntax w…
alan-agius4 Jun 10, 2021
8360251
fix(@angular-devkit/build-angular): explicitly set compilation target…
alan-agius4 Jun 11, 2021
29f65c9
build: update angular to 59b3590
renovate-bot Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@angular/compiler": "12.1.0-next.5",
"@angular/compiler-cli": "12.1.0-next.5",
"@angular/core": "12.1.0-next.5",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#941d67490391ab1a385796fd34e588f7416e3ebb",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#7b783ae5493d40941fbe48f766b9e4ac1b214f42",
"@angular/forms": "12.1.0-next.5",
"@angular/localize": "12.1.0-next.5",
"@angular/material": "12.1.0-next.0",
Expand Down Expand Up @@ -174,7 +174,7 @@
"karma-jasmine-html-reporter": "^1.5.0",
"karma-source-map-support": "1.4.0",
"less": "4.1.1",
"less-loader": "9.0.0",
"less-loader": "9.1.0",
"license-checker": "^25.0.0",
"license-webpack-plugin": "2.3.19",
"loader-utils": "2.0.0",
Expand All @@ -192,9 +192,9 @@
"pidtree": "^0.5.0",
"pidusage": "^2.0.17",
"popper.js": "^1.14.1",
"postcss": "8.3.1",
"postcss": "8.3.2",
"postcss-import": "14.0.2",
"postcss-loader": "5.3.0",
"postcss-loader": "6.1.0",
"postcss-preset-env": "6.7.0",
"prettier": "^2.0.0",
"protractor": "~7.0.0",
Expand All @@ -205,7 +205,7 @@
"resolve-url-loader": "4.0.0",
"rxjs": "6.6.7",
"sass": "1.34.1",
"sass-loader": "12.0.0",
"sass-loader": "12.1.0",
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz",
"semver": "7.3.5",
"source-map": "0.7.3",
Expand All @@ -214,7 +214,7 @@
"spdx-satisfies": "^5.0.0",
"style-loader": "2.0.0",
"stylus": "0.54.8",
"stylus-loader": "6.0.0",
"stylus-loader": "6.1.0",
"symbol-observable": "4.0.0",
"tar": "^6.0.0",
"temp": "^0.9.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@
"jest-worker": "27.0.2",
"karma-source-map-support": "1.4.0",
"less": "4.1.1",
"less-loader": "9.0.0",
"less-loader": "9.1.0",
"license-webpack-plugin": "2.3.19",
"loader-utils": "2.0.0",
"mini-css-extract-plugin": "1.6.0",
"minimatch": "3.0.4",
"open": "8.2.0",
"ora": "5.4.1",
"parse5-html-rewriting-stream": "6.0.1",
"postcss": "8.3.1",
"postcss": "8.3.2",
"postcss-import": "14.0.2",
"postcss-loader": "5.3.0",
"postcss-loader": "6.1.0",
"postcss-preset-env": "6.7.0",
"raw-loader": "4.0.2",
"regenerator-runtime": "0.13.7",
"resolve-url-loader": "4.0.0",
"rxjs": "6.6.7",
"sass": "1.34.1",
"sass-loader": "12.0.0",
"sass-loader": "12.1.0",
"semver": "7.3.5",
"source-map": "0.7.3",
"source-map-loader": "3.0.0",
"source-map-support": "0.5.19",
"style-loader": "2.0.0",
"stylus": "0.54.8",
"stylus-loader": "6.0.0",
"stylus-loader": "6.1.0",
"terser": "5.7.0",
"terser-webpack-plugin": "5.1.3",
"text-table": "0.2.0",
Expand Down
11 changes: 9 additions & 2 deletions packages/angular_devkit/build_angular/src/webpack/configs/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import {
getWatchOptions,
normalizeExtraEntryPoints,
} from '../utils/helpers';
import { IGNORE_WARNINGS } from '../utils/stats';

// eslint-disable-next-line max-lines-per-function
export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
Expand Down Expand Up @@ -430,7 +429,15 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
performance: {
hints: false,
},
ignoreWarnings: IGNORE_WARNINGS,
ignoreWarnings: [
// Webpack 5+ has no facility to disable this warning.
// System.import is used in @angular/core for deprecated string-form lazy routes
/System.import\(\) is deprecated and will be removed soon/i,
// https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
/Failed to parse source map from/,
// https://github.com/webpack-contrib/postcss-loader/blob/bd261875fdf9c596af4ffb3a1a73fe3c549befda/src/index.js#L153-L158
/Add postcss as project dependency/,
],
module: {
// Show an error for missing exports instead of a warning.
strictExportPresence: true,
Expand Down
13 changes: 12 additions & 1 deletion packages/angular_devkit/build_angular/src/webpack/configs/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import * as glob from 'glob';
import * as path from 'path';
import { ScriptTarget } from 'typescript';
import * as webpack from 'webpack';
import { WebpackConfigOptions, WebpackTestOptions } from '../../utils/build-options';
import { getSourceMapDevTool, isPolyfillsEntry } from '../utils/helpers';
Expand All @@ -16,7 +17,7 @@ export function getTestConfig(
wco: WebpackConfigOptions<WebpackTestOptions>,
): webpack.Configuration {
const {
buildOptions: { codeCoverage, codeCoverageExclude, main, sourceMap },
buildOptions: { codeCoverage, codeCoverageExclude, main, sourceMap, webWorkerTsConfig },
root,
sourceRoot,
} = wco;
Expand Down Expand Up @@ -51,6 +52,7 @@ export function getTestConfig(

return {
mode: 'development',
target: wco.tsConfig.options.target === ScriptTarget.ES5 ? ['web', 'es5'] : 'web',
resolve: {
mainFields: ['es2015', 'browser', 'module', 'main'],
},
Expand All @@ -60,6 +62,15 @@ export function getTestConfig(
},
module: {
rules: extraRules,
parser:
webWorkerTsConfig === undefined
? undefined
: {
javascript: {
worker: false,
url: false,
},
},
},
plugins: extraPlugins,
optimization: {
Expand Down
8 changes: 0 additions & 8 deletions packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,6 @@ function statsToString(
}
}

export const IGNORE_WARNINGS = [
// Webpack 5+ has no facility to disable this warning.
// System.import is used in @angular/core for deprecated string-form lazy routes
/System.import\(\) is deprecated and will be removed soon/i,
// https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
/Failed to parse source map from/,
];

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function statsWarningsToString(json: StatsCompilation, statsConfig: any): string {
const colors = statsConfig.colors;
Expand Down
32 changes: 16 additions & 16 deletions tests/legacy-cli/e2e/ng-snapshot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"description": "snapshot versions of Angular for e2e testing",
"private": true,
"dependencies": {
"@angular/animations": "github:angular/animations-builds#d6934959b38caf347701388583cd6ac7614dd2fb",
"@angular/cdk": "github:angular/cdk-builds#2b484399826fc7c6053fc0a93ee7136f80f2e0fa",
"@angular/common": "github:angular/common-builds#f790871708d15075b91a6cdf5c8a2fdcfa09b192",
"@angular/compiler": "github:angular/compiler-builds#a7d762d50ba77e5de96ed76dfa6a1be5ee1a7560",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#bc4bd3aad6a395ec3cc8e83630e436fc6e19db82",
"@angular/core": "github:angular/core-builds#2b36b30bed8f4cbff166fca07e2dee5d9398b3ec",
"@angular/forms": "github:angular/forms-builds#ff11e6f367f2cf45c939b91e42ce4d1b256c5fb8",
"@angular/language-service": "github:angular/language-service-builds#3ae4540be82ad38c4394d332d5b149187c2c88a4",
"@angular/localize": "github:angular/localize-builds#b34a66c9ed9af4fb42d60903e1182e3ddb4f3a6d",
"@angular/material": "github:angular/material2-builds#b8620062a3962599e10ce90d0fef8c8c3675ae6f",
"@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#33055a2722735a60766f822512070045f4e35359",
"@angular/platform-browser": "github:angular/platform-browser-builds#93022613f6ad26db6585f3e5eaf0ab4af15ae44f",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#8f82ff061f75dfd1af3c41e539fa105734c03177",
"@angular/platform-server": "github:angular/platform-server-builds#1e860658da01c47cdd929d170e8f1d46adadfca2",
"@angular/router": "github:angular/router-builds#34ef66563ecae3c693cc8d47fe90489f81edc6e3",
"@angular/service-worker": "github:angular/service-worker-builds#01b82686ab48d9b7a9d18b22dba37086489b705d"
"@angular/animations": "github:angular/animations-builds#59b359068c6bdd814a3c4527109b50cf674fbd1d",
"@angular/cdk": "github:angular/cdk-builds#71522f6dc686276c9aeb55db88835afdbe10a117",
"@angular/common": "github:angular/common-builds#08d3bac2da59e22c218b52c655a77e543518aa23",
"@angular/compiler": "github:angular/compiler-builds#dd01f6eede900e09764068ef32ca958982271e76",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#c9b5efe32c4ddf75e2167b3d0f8d2078a7809d94",
"@angular/core": "github:angular/core-builds#c01caa223b6c70eb5ea0f86bcf4e6bd0eb92ab67",
"@angular/forms": "github:angular/forms-builds#1acc5d2ca727a594d2ffcfc2a0cbd8c165afba1f",
"@angular/language-service": "github:angular/language-service-builds#baaf3ff8f0613a42a65566a0c6ce7001330f7ed0",
"@angular/localize": "github:angular/localize-builds#f4e3dc7a7e5f7688feb14966a6ef547e663c6a2b",
"@angular/material": "github:angular/material2-builds#93a7fd2751078788d26c656a85e02a61fc3d4415",
"@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#28a45f0efbba9d45c1fd81cec94e21aec2cadab2",
"@angular/platform-browser": "github:angular/platform-browser-builds#00a7aa07e005988441b06d61f73d9b4a0457d8d1",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ecb2f4dd8cb807b940cafc8e3f785429292078a0",
"@angular/platform-server": "github:angular/platform-server-builds#c45c594ebed6acf80ef6baf086a13c9a68e79360",
"@angular/router": "github:angular/router-builds#a83f07c45db49899d8de85b125415dc2338f7c1a",
"@angular/service-worker": "github:angular/service-worker-builds#e4adebbcd677a484806e384adeaecf7ca04afe02"
}
}
47 changes: 24 additions & 23 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@
dependencies:
tslib "^2.0.0"

"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#941d67490391ab1a385796fd34e588f7416e3ebb":
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#7b783ae5493d40941fbe48f766b9e4ac1b214f42":
version "0.0.0"
resolved "https://github.com/angular/dev-infra-private-builds.git#7308e71916da94b51a9b558693c49a04bfc98beb"
uid "7b783ae5493d40941fbe48f766b9e4ac1b214f42"
resolved "https://github.com/angular/dev-infra-private-builds.git#7b783ae5493d40941fbe48f766b9e4ac1b214f42"
dependencies:
"@angular/benchpress" "0.2.1"
"@bazel/buildifier" "^4.0.1"
Expand Down Expand Up @@ -7226,10 +7227,10 @@ klona@^2.0.4:
resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==

less-loader@9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-9.0.0.tgz#71a0b530174bddf89bb11a5019dd725f54df4791"
integrity sha512-bPen1xeGTZuYFFobcdz9kMUVgSSSDZQJtyhawtCtcz1QboQOwhkI7uCwp5UO+IZpO+LJS1W73YwxsufbBT6SBQ==
less-loader@9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-9.1.0.tgz#5568a30637edadfebcb576c648ae8336b04b11e7"
integrity sha512-/BPur/W4NaDBvw4A7pTGMtKpAsAnexeJdw2VWRVzWEQCNX2FboFa1GUIFwkzBFwX5x/q7M/Srtng96QnhV5wIA==
dependencies:
klona "^2.0.4"

Expand Down Expand Up @@ -9227,14 +9228,14 @@ postcss-lab-function@^2.0.1:
postcss "^7.0.2"
postcss-values-parser "^2.0.0"

postcss-loader@5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-5.3.0.tgz#1657f869e48d4fdb018a40771c235e499ee26244"
integrity sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==
postcss-loader@6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.0.tgz#13c800a00b3c7d434a1319a73d85e2df0714cdde"
integrity sha512-yA/cXBfACkthZNA2hQxOnaReVfQ6uLmvbEDQzNafpbK40URZJvP/28dL1DG174Gvz3ptkkHbbwDBCh+gXR94CA==
dependencies:
cosmiconfig "^7.0.0"
klona "^2.0.4"
semver "^7.3.4"
semver "^7.3.5"

postcss-logical@^3.0.0:
version "3.0.0"
Expand Down Expand Up @@ -9594,10 +9595,10 @@ postcss@7.x.x, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@8.3.1:
version "8.3.1"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.1.tgz#71f380151c227f83b898294a46481f689f86b70a"
integrity sha512-9qH0MGjsSm+fjxOi3GnwViL1otfi7qkj+l/WX5gcRGmZNGsIcqc+A5fBkE6PUobEQK4APqYVaES+B3Uti98TCw==
postcss@8.3.2:
version "8.3.2"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.2.tgz#ed3ec489f5428af5740cd6effcc216b4d455ee64"
integrity sha512-y1FK/AWdZlBF5lusS5j5l4/vF67+vQZt1SXPVJ32y1kRGDQyrs1zk32hG1cInRTu14P0V+orPz+ifwW/7rR4bg==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.23"
Expand Down Expand Up @@ -10445,10 +10446,10 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

sass-loader@12.0.0:
version "12.0.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.0.0.tgz#ba91df5725cb9676c8e0937002a647ab011eb94a"
integrity sha512-LJQMyDdNdhcvoO2gJFw7KpTaioVFDeRJOuatRDUNgCIqyu4s4kgDsNofdGzAZB1zFOgo/p3fy+aR/uGXamcJBg==
sass-loader@12.1.0:
version "12.1.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.1.0.tgz#b73324622231009da6fba61ab76013256380d201"
integrity sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==
dependencies:
klona "^2.0.4"
neo-async "^2.6.2"
Expand Down Expand Up @@ -11289,10 +11290,10 @@ stylehacks@^5.0.1:
browserslist "^4.16.0"
postcss-selector-parser "^6.0.4"

stylus-loader@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.0.0.tgz#ea3c4adb4cee492ebf6d63dea2e1743480ca29a4"
integrity sha512-cB3Mtu2+JGZYm5WUzGyo4En6r087F11eaZK+EUn/6Fj8Eo4mY5DpWH82lvTfjAV2EP42Fd7NWvWG20sJYCyuFw==
stylus-loader@6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.1.0.tgz#7a3a719a27cb2b9617896d6da28fda94c3ed9762"
integrity sha512-qKO34QCsOtSJrXxQQmXsPeaVHh6hMumBAFIoJTcsSr2VzrA6o/CW9HCGR8spCjzJhN8oKQHdj/Ytx0wwXyElkw==
dependencies:
fast-glob "^3.2.5"
klona "^2.0.4"
Expand Down