Skip to content

Commit 087d58d

Browse files
committed
fix(ie): running IE on A5 and old nodejs
1 parent a7a2948 commit 087d58d

File tree

16 files changed

+100
-72
lines changed

16 files changed

+100
-72
lines changed

.circleci/config.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -909,34 +909,47 @@ jobs:
909909
shell: bash.exe
910910
steps:
911911
- checkout
912-
- run: nvm install $(cat .nvmrc)
913-
- run: nvm use $(cat .nvmrc)
912+
- run: nvm install $(cat e2e/a5es5/.nvmrc)
913+
- run: nvm use $(cat e2e/a5es5/.nvmrc)
914914
- attach_workspace:
915915
at: dist
916916
- run:
917917
name: NPM Shell
918918
command: npm config set script-shell bash.exe
919919
- restore_cache:
920-
key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }}
920+
key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package-lock.json" }}
921921
- run:
922922
name: NPM Install
923923
command: |
924-
if [ ! -d "e2e/a12/node_modules/" ]; then
925-
cd e2e/a12 && npm ci --no-optional --ignore-scripts && ./node_modules/.bin/ngcc
924+
if [ ! -d "e2e/a5es5/node_modules/" ]; then
925+
npm run i:a5es5 -- --ignore-scripts
926926
fi
927927
- save_cache:
928-
key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }}
928+
key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package-lock.json" }}
929929
paths:
930-
- ./e2e/a12/node_modules
930+
- ./e2e/a5es5/node_modules
931931
- run:
932932
name: Spreading Build
933-
command: npm run s:a12
933+
command: |
934+
P=e2e/a5es5/node_modules/ng-mocks
935+
rm -Rf $P
936+
mkdir -p $P
937+
cp -R dist/libs/ng-mocks/. $P
934938
- run:
935939
name: Spreading Tests
936-
command: npm run s:test:a12
940+
command: |
941+
P=e2e/a5es5/src/test
942+
rm -Rf $P
943+
mkdir -p $P
944+
cp -R tests $P
945+
cp -R examples $P
946+
rm $P/examples/TestRoutingGuard/test.spec.ts
947+
rm $P/examples/TestRoutingResolver/test.spec.ts
937948
- run:
938949
name: Unit Tests
939-
command: cd e2e/a12 && npm run test:jasmine:es5:ivy
950+
command: |
951+
cd e2e/a5es5
952+
npm run test:jasmine
940953
environment:
941954
IE_BIN: 'C:\Program Files\Internet Explorer\iexplore.exe'
942955
workflows:

e2e/a12/karma.conf.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module.exports = function (config) {
1010
plugins: [
1111
require('karma-jasmine'),
1212
require('karma-chrome-launcher'),
13-
require('karma-ie-launcher'),
1413
require('karma-jasmine-html-reporter'),
1514
require('@angular-devkit/build-angular/plugins/karma'),
1615
],
@@ -25,17 +24,13 @@ module.exports = function (config) {
2524
base: 'ChromeHeadless',
2625
flags: ['--headless', '--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'],
2726
},
28-
IECi: {
29-
base: 'IE',
30-
flags: ['-extoff'],
31-
},
3227
},
3328
reporters: ['kjhtml'],
3429
port: 9876,
3530
colors: true,
3631
logLevel: config.LOG_INFO,
3732
autoWatch: false,
38-
browsers: [process.env.IE_BIN ? 'IECi' : 'ChromeCi'],
33+
browsers: ['ChromeCi'],
3934
singleRun: true,
4035
});
4136
};

e2e/a12/package-lock.json

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/a12/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"jest-preset-angular": "8.3.2",
4747
"karma": "6.1.2",
4848
"karma-chrome-launcher": "3.1.0",
49-
"karma-ie-launcher": "1.0.0",
5049
"karma-jasmine": "4.0.1",
5150
"karma-jasmine-html-reporter": "1.5.4",
5251
"puppeteer": "10.4.0",

e2e/a5es2015/src/polyfills.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919
*/
2020

2121
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
// import 'core-js/es6/symbol';
23-
// import 'core-js/es6/object';
24-
// import 'core-js/es6/function';
25-
// import 'core-js/es6/parse-int';
26-
// import 'core-js/es6/parse-float';
27-
// import 'core-js/es6/number';
28-
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
30-
// import 'core-js/es6/date';
31-
// import 'core-js/es6/array';
32-
// import 'core-js/es6/regexp';
33-
// import 'core-js/es6/map';
34-
// import 'core-js/es6/weak-map';
35-
// import 'core-js/es6/set';
22+
import 'core-js/es6/symbol';
23+
import 'core-js/es6/object';
24+
import 'core-js/es6/function';
25+
import 'core-js/es6/parse-int';
26+
import 'core-js/es6/parse-float';
27+
import 'core-js/es6/number';
28+
import 'core-js/es6/math';
29+
import 'core-js/es6/string';
30+
import 'core-js/es6/date';
31+
import 'core-js/es6/array';
32+
import 'core-js/es6/regexp';
33+
import 'core-js/es6/map';
34+
import 'core-js/es6/weak-map';
35+
import 'core-js/es6/set';
3636

3737
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3838
// import 'classlist.js'; // Run `npm install --save classlist.js`.
3939

4040
/** IE10 and IE11 requires the following for the Reflect API. */
41-
// import 'core-js/es6/reflect';
41+
import 'core-js/es6/reflect';
4242

4343
/** Evergreen browsers require these. **/
4444
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.

e2e/a5es5/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.17.1

e2e/a5es5/karma.conf.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = function (config) {
1010
plugins: [
1111
require('@angular/cli/plugins/karma'),
1212
require('karma-chrome-launcher'),
13+
require('karma-ie-launcher'),
1314
require('karma-jasmine'),
1415
require('karma-jasmine-html-reporter'),
1516
],
@@ -24,6 +25,10 @@ module.exports = function (config) {
2425
base: 'ChromeHeadless',
2526
flags: ['--headless', '--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'],
2627
},
28+
IECi: {
29+
base: 'IE',
30+
flags: ['-extoff'],
31+
},
2732
},
2833
angularCli: {
2934
environment: 'dev',
@@ -33,7 +38,7 @@ module.exports = function (config) {
3338
colors: true,
3439
logLevel: config.LOG_INFO,
3540
autoWatch: false,
36-
browsers: ['ChromeCi'],
41+
browsers: [process.env.IE_BIN ? 'IECi' : 'ChromeCi'],
3742
singleRun: true,
3843
});
3944
};

e2e/a5es5/package-lock.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/a5es5/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"jest-preset-angular": "5.2.3",
4545
"karma": "3.1.4",
4646
"karma-chrome-launcher": "2.2.0",
47+
"karma-ie-launcher": "1.0.0",
4748
"karma-jasmine": "1.1.2",
4849
"karma-jasmine-html-reporter": "0.2.2",
4950
"puppeteer": "1.20.0",

e2e/a5es5/src/polyfills.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919
*/
2020

2121
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
// import 'core-js/es6/symbol';
23-
// import 'core-js/es6/object';
24-
// import 'core-js/es6/function';
25-
// import 'core-js/es6/parse-int';
26-
// import 'core-js/es6/parse-float';
27-
// import 'core-js/es6/number';
28-
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
30-
// import 'core-js/es6/date';
31-
// import 'core-js/es6/array';
32-
// import 'core-js/es6/regexp';
33-
// import 'core-js/es6/map';
34-
// import 'core-js/es6/weak-map';
35-
// import 'core-js/es6/set';
22+
import 'core-js/es6/symbol';
23+
import 'core-js/es6/object';
24+
import 'core-js/es6/function';
25+
import 'core-js/es6/parse-int';
26+
import 'core-js/es6/parse-float';
27+
import 'core-js/es6/number';
28+
import 'core-js/es6/math';
29+
import 'core-js/es6/string';
30+
import 'core-js/es6/date';
31+
import 'core-js/es6/array';
32+
import 'core-js/es6/regexp';
33+
import 'core-js/es6/map';
34+
import 'core-js/es6/weak-map';
35+
import 'core-js/es6/set';
3636

3737
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3838
// import 'classlist.js'; // Run `npm install --save classlist.js`.
3939

4040
/** IE10 and IE11 requires the following for the Reflect API. */
41-
// import 'core-js/es6/reflect';
41+
import 'core-js/es6/reflect';
4242

4343
/** Evergreen browsers require these. **/
4444
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.

0 commit comments

Comments
 (0)