Skip to content

Commit e2eed2c

Browse files
alan-agius4dgp1130
authored andcommitted
build: update several packages
1 parent d008cf2 commit e2eed2c

10 files changed

Lines changed: 180 additions & 130 deletions

File tree

integration/angular_cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test": "ng test",
99
"lint": "ng lint",
1010
"e2e": "ng e2e --prod",
11-
"postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 80.0.3987.106"
11+
"postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 81.0.4044.0"
1212
},
1313
"private": true,
1414
"dependencies": {
@@ -38,10 +38,10 @@
3838
"karma": "~4.4.1",
3939
"karma-chrome-launcher": "~3.1.0",
4040
"karma-coverage-istanbul-reporter": "~2.1.0",
41-
"karma-jasmine": "~3.0.1",
41+
"karma-jasmine": "~3.1.1",
4242
"karma-jasmine-html-reporter": "^1.4.2",
4343
"protractor": "~5.4.3",
44-
"puppeteer": "2.1.1",
44+
"puppeteer": "3.0.2",
4545
"ts-node": "~8.3.0",
4646
"tslint": "~6.1.0",
4747
"typescript": "~3.8.3"

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"preinstall": "node ./tools/yarn/check-yarn.js",
3838
"postinstall": "yarn webdriver-update && yarn ngcc",
3939
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
40-
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 79.0.3945.16",
40+
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 81.0.4044.0",
4141
"ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
4242
},
4343
"repository": {
@@ -161,8 +161,7 @@
161161
"karma-jasmine": "~3.1.0",
162162
"karma-jasmine-html-reporter": "^1.4.0",
163163
"karma-source-map-support": "1.4.0",
164-
"less": "3.11.1",
165-
"less-loader": "5.0.0",
164+
"less-loader": "6.0.0",
166165
"license-checker": "^25.0.0",
167166
"license-checker-webpack-plugin": "0.1.4",
168167
"loader-utils": "2.0.0",
@@ -186,7 +185,7 @@
186185
"postcss-loader": "3.0.0",
187186
"prettier": "^2.0.0",
188187
"protractor": "~5.4.0",
189-
"puppeteer": "2.1.1",
188+
"puppeteer": "3.0.2",
190189
"quicktype-core": "^6.0.15",
191190
"raw-loader": "4.0.0",
192191
"regenerator-runtime": "0.13.5",
@@ -210,7 +209,7 @@
210209
"tar": "^6.0.0",
211210
"temp": "^0.9.0",
212211
"terser": "4.6.11",
213-
"terser-webpack-plugin": "2.3.5",
212+
"terser-webpack-plugin": "3.0.0",
214213
"through2": "^3.0.0",
215214
"tree-kill": "1.2.2",
216215
"ts-api-guardian": "0.5.0",

packages/angular_devkit/build_angular/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ ts_library(
135135
"@npm//jest-worker",
136136
"@npm//karma",
137137
"@npm//karma-source-map-support",
138-
"@npm//less",
139138
"@npm//less-loader",
140139
"@npm//license-checker-webpack-plugin",
141140
"@npm//loader-utils",

packages/angular_devkit/build_angular/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
"glob": "7.1.6",
3434
"jest-worker": "25.5.0",
3535
"karma-source-map-support": "1.4.0",
36-
"less": "3.11.1",
37-
"less-loader": "5.0.0",
36+
"less-loader": "6.0.0",
3837
"license-checker-webpack-plugin": "0.1.4",
3938
"loader-utils": "2.0.0",
4039
"mini-css-extract-plugin": "0.9.0",
@@ -62,7 +61,7 @@
6261
"stylus": "0.54.7",
6362
"stylus-loader": "3.0.2",
6463
"terser": "4.6.13",
65-
"terser-webpack-plugin": "2.3.6",
64+
"terser-webpack-plugin": "3.0.0",
6665
"tree-kill": "1.2.2",
6766
"webpack": "4.43.0",
6867
"webpack-dev-middleware": "3.7.2",

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,14 +434,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
434434
mangle: allowMangle && buildOptions.platform !== 'server' && !differentialLoadingMode,
435435
};
436436

437+
const globalScriptsNames = globalScriptsByBundleName.map(s => s.bundleName);
437438
extraMinimizers.push(
438439
new TerserPlugin({
439440
sourceMap: scriptsSourceMap,
440441
parallel: maxWorkers,
441442
cache: !cachingDisabled && findCachePath('terser-webpack'),
442443
extractComments: false,
443-
chunkFilter: (chunk: compilation.Chunk) =>
444-
!globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
444+
exclude: globalScriptsNames,
445445
terserOptions,
446446
}),
447447
// Script bundles are fully optimized here in one step since they are never downleveled.
@@ -451,8 +451,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
451451
parallel: maxWorkers,
452452
cache: !cachingDisabled && findCachePath('terser-webpack'),
453453
extractComments: false,
454-
chunkFilter: (chunk: compilation.Chunk) =>
455-
globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
454+
include: globalScriptsNames,
456455
terserOptions: {
457456
...terserOptions,
458457
compress: allowMinify && {

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,10 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
158158
loader: require.resolve('less-loader'),
159159
options: {
160160
sourceMap: cssSourceMap,
161-
javascriptEnabled: true,
162-
...lessPathOptions,
161+
lessOptions: {
162+
javascriptEnabled: true,
163+
...lessPathOptions,
164+
},
163165
},
164166
},
165167
],

packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,20 @@ describe('Karma Builder code coverage', () => {
118118
thresholds: {
119119
emitWarning: false,
120120
global: {
121-
statements: 200
122-
}
121+
statements: 100,
122+
lines: 100,
123+
branches: 100,
124+
functions: 100
125+
},
123126
}`,
124127
);
125128

129+
host.appendToFile('src/app/app.component.ts', `
130+
export function nonCovered(): boolean {
131+
return true;
132+
}
133+
`);
134+
126135
const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
127136
await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
128137
await run.stop();

packages/schematics/angular/workspace/files/package.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"karma": "~5.0.0",
3737
"karma-chrome-launcher": "~3.1.0",
3838
"karma-coverage-istanbul-reporter": "~2.1.0",
39-
"karma-jasmine": "~3.0.1",
39+
"karma-jasmine": "~3.1.1",
4040
"karma-jasmine-html-reporter": "^1.4.2",
4141
"protractor": "~5.4.3",<% } %>
4242
"ts-node": "~8.3.0",

tests/legacy-cli/e2e/utils/project.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export function useCIDefaults(projectName = 'test-project') {
247247
// https://github.com/GoogleChrome/puppeteer/releases
248248
// http://chromedriver.chromium.org/downloads
249249
json['scripts']['webdriver-update'] = 'webdriver-manager update' +
250-
` --standalone false --gecko false --versions.chrome 79.0.3945.16`; // Supports Chrome 79
250+
` --standalone false --gecko false --versions.chrome 81.0.4044.0`; // Supports Chrome 81
251251

252252
}))
253253
.then(() => npm('run', 'webdriver-update'));
@@ -263,8 +263,8 @@ export function useCIChrome(projectDir: string) {
263263
// Use matching versions of Chromium (via puppeteer) and ChromeDriver.
264264
// https://github.com/GoogleChrome/puppeteer/releases
265265
// http://chromedriver.chromium.org/downloads
266-
json['devDependencies']['puppeteer'] = '2.0.0'; // Chromium 79.0.3942.0 (r706915)
267-
json['devDependencies']['karma-chrome-launcher'] = '~2.2.0'; // Minimum for ChromeHeadless.
266+
json['devDependencies']['puppeteer'] = '3.0.2'; // Chromium 81.0.4044.0 (r737027)
267+
json['devDependencies']['karma-chrome-launcher'] = '~3.1.0';
268268
}))
269269
// Use Pupeteer in protractor if a config is found on the project.
270270
.then(() => {

0 commit comments

Comments
 (0)