Skip to content

Commit 0d0d124

Browse files
clydinmgechev
authored andcommitted
build: yarn upgrade lock update (#15589)
* build: yarn upgrade lock update * build: change sauce connect proxy name to avoid npm package shadowing `sauce-connect` is an old npm package. Using the name for the saucelabs proxy tool causes false security vulnerability warnings. * build: update license exceptions mainly removal of now unneeded exceptions
1 parent 4aaec9c commit 0d0d124

File tree

9 files changed

+1098
-2788
lines changed

9 files changed

+1098
-2788
lines changed

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
"typescript": "3.5.3"
8181
},
8282
"devDependencies": {
83-
"@angular/compiler": "~9.0.0-next.4",
84-
"@angular/compiler-cli": "~9.0.0-next.4",
83+
"@angular/compiler": "9.0.0-next.4",
84+
"@angular/compiler-cli": "9.0.0-next.4",
8585
"@bazel/bazel": "0.29.0",
8686
"@bazel/buildifier": "0.28.0",
8787
"@bazel/jasmine": "0.37.0",
@@ -127,7 +127,7 @@
127127
"pidtree": "^0.3.0",
128128
"pidusage": "^2.0.17",
129129
"rxjs": "~6.4.0",
130-
"sauce-connect": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
130+
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
131131
"semver": "6.3.0",
132132
"source-map": "^0.7.3",
133133
"source-map-support": "^0.5.0",

packages/angular_devkit/build_angular/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@
6565
"worker-plugin": "3.2.0"
6666
},
6767
"devDependencies": {
68-
"@angular/animations": "~9.0.0-next.4",
68+
"@angular/animations": "9.0.0-next.4",
6969
"@angular/cdk": "~8.2.0",
70-
"@angular/common": "~9.0.0-next.4",
71-
"@angular/compiler": "~9.0.0-next.4",
72-
"@angular/compiler-cli": "~9.0.0-next.4",
73-
"@angular/core": "~9.0.0-next.4",
74-
"@angular/forms": "~9.0.0-next.4",
70+
"@angular/common": "9.0.0-next.4",
71+
"@angular/compiler": "9.0.0-next.4",
72+
"@angular/compiler-cli": "9.0.0-next.4",
73+
"@angular/core": "9.0.0-next.4",
74+
"@angular/forms": "9.0.0-next.4",
7575
"@angular/material": "~8.2.0",
76-
"@angular/platform-browser": "~9.0.0-next.4",
77-
"@angular/platform-browser-dynamic": "~9.0.0-next.4",
78-
"@angular/platform-server": "~9.0.0-next.4",
79-
"@angular/router": "~9.0.0-next.4",
80-
"@angular/service-worker": "~9.0.0-next.4",
76+
"@angular/platform-browser": "9.0.0-next.4",
77+
"@angular/platform-browser-dynamic": "9.0.0-next.4",
78+
"@angular/platform-server": "9.0.0-next.4",
79+
"@angular/router": "9.0.0-next.4",
80+
"@angular/service-worker": "9.0.0-next.4",
8181
"codelyzer": "^5.0.0",
8282
"bootstrap": "^4.0.0",
8383
"font-awesome": "^4.7.0",

packages/angular_devkit/build_ng_packagr/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"ng-packagr": "^4.0.0 || ^5.0.0"
1515
},
1616
"devDependencies": {
17-
"@angular/compiler": "~9.0.0-next.4",
18-
"@angular/compiler-cli": "~9.0.0-next.4",
17+
"@angular/compiler": "9.0.0-next.4",
18+
"@angular/compiler-cli": "9.0.0-next.4",
1919
"@angular-devkit/core": "0.0.0",
2020
"ng-packagr": "~5.5.0",
2121
"tslib": "^1.10.0"

packages/ngtools/webpack/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"webpack": "^4.0.0"
3434
},
3535
"devDependencies": {
36-
"@angular/compiler": "~9.0.0-next.4",
37-
"@angular/compiler-cli": "~9.0.0-next.4",
36+
"@angular/compiler": "9.0.0-next.4",
37+
"@angular/compiler-cli": "9.0.0-next.4",
3838
"typescript": "3.5.3",
3939
"webpack": "4.40.2"
4040
}

scripts/saucelabs/start-tunnel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ fi
3232

3333
echo "Starting Sauce Connect. Passed arguments: ${sauceArgs}"
3434

35-
${currentDir}/../../node_modules/sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs}
35+
${currentDir}/../../node_modules/sauce-connect-proxy/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs}

scripts/validate-licenses.ts

+2-15
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,14 @@ const ignoredPackages = [
6464
// Us.
6565
'@angular/[email protected]', // Hey, that's us!
6666
// * Development only
67-
'[email protected].1', // CC0 but it's content only (index.json, no code) and not distributed.
67+
'[email protected].5', // CC0 but it's content only (index.json, no code) and not distributed.
6868
'[email protected]', // LGPL-3.0 but only used as a tool, not linked in the build.
6969

7070
// * Broken license fields
71-
'[email protected]', // MIT but no license field in package.json
72-
'[email protected]', // MIT but broken license in package.json
73-
'[email protected]', // Apache-2.0 but broken license in package.json
74-
'[email protected]', // zlib license
75-
76-
// * Need to publish these with LICENSE files
77-
// see https://github.com/bazelbuild/rules_nodejs/pull/696
78-
// TODO(alexeagle): remove these after a release that fixes it
79-
80-
81-
82-
83-
71+
'[email protected]', // MIT but broken license in package.json
8472

8573
// * Other
8674
'[email protected]', // (OFL-1.1 AND MIT)
87-
'[email protected]', // 'New BSD'
8875
];
8976

9077
// Ignore own packages (all MIT)

tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts

-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747
/** IE10 and IE11 requires the following for the Reflect API. */
4848
// import 'core-js/es6/reflect';
4949

50-
51-
/** Evergreen browsers require these. **/
52-
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
53-
import 'core-js/es7/reflect';
54-
55-
5650
/**
5751
* Required to support Web Animations `@angular/platform-browser/animations`.
5852
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation

tests/legacy-cli/e2e/assets/webpack/test-app/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "~9.0.0-next.4",
6-
"@angular/compiler": "~9.0.0-next.4",
7-
"@angular/compiler-cli": "~9.0.0-next.4",
8-
"@angular/core": "~9.0.0-next.4",
9-
"@angular/platform-browser": "~9.0.0-next.4",
10-
"@angular/platform-browser-dynamic": "~9.0.0-next.4",
11-
"@angular/platform-server": "~9.0.0-next.4",
12-
"@angular/router": "~9.0.0-next.4",
5+
"@angular/common": "9.0.0-next.4",
6+
"@angular/compiler": "9.0.0-next.4",
7+
"@angular/compiler-cli": "9.0.0-next.4",
8+
"@angular/core": "9.0.0-next.4",
9+
"@angular/platform-browser": "9.0.0-next.4",
10+
"@angular/platform-browser-dynamic": "9.0.0-next.4",
11+
"@angular/platform-server": "9.0.0-next.4",
12+
"@angular/router": "9.0.0-next.4",
1313
"@ngtools/webpack": "0.0.0",
1414
"core-js": "^3.0.0",
1515
"rxjs": "^6.4.0",

0 commit comments

Comments
 (0)