Merge pull request #1206 from NationalBankBelgium/greenkeeper/stark-a…

…pps/core-js-3.0.0 Update core-js in group stark-apps to the latest version 🚀
NationalBankBelgium · Apr 30, 2019 · 152f5d3 · 152f5d3
2 parents 0f466bf + 8da6515
commit 152f5d3
Show file tree

Hide file tree

Showing 19 changed files with 151 additions and 58 deletions.
diff --git a/docs/POLYFILLS.md b/docs/POLYFILLS.md
@@ -39,8 +39,11 @@ The following polyfills are suitable for most of the cases, especially when targ
  * IE11 requires all of the following polyfills.
  *
  * Polyfill: https://github.com/zloirock/core-js
+ * Add the specific lines below corresponding to the version of core-js you want to use: 2.x or 3.x
  */
 /* tslint:disable:no-import-side-effect */
+
+/******************** core-js 2.x ********************/
 import "core-js/es6";
 import "core-js/es7/reflect";
 import "core-js/es7/string";
@@ -51,6 +54,21 @@ import "core-js/stage/4";
  * More info: https://github.com/angular/angular/issues/27887
  */
 import "core-js/modules/web.dom.iterable";
+/*****************************************************/
+
+/******************** core-js 3.x ********************
+ * Make sure you add the 'paths' workaround to the tsconfig.json to support core-js 3.x with Angular CLI 7.x
+ * See: https://github.com/angular/angular-cli/issues/13954#issuecomment-475452588
+ */
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
+/**
+ * IE11 does not support iteration on certain DOM collections (NodeList).
+ * This polyfill is specifically needed for the animation on mat-menu used in stark-table.
+ * More info: https://github.com/angular/angular/issues/27887
+ */
+import "core-js/modules/web.dom-collections.iterator";
+/*****************************************************/
 
 /**
  * IE11 and Edge require this to support Server-sent events

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "codelyzer": "^4.5.0",
     "commitizen": "^3.0.5",
     "conventional-changelog-cli": "^2.0.11",
+    "core-js": "^3.0.0",
     "cz-customizable": "^6.0.0",
     "hammerjs": "^2.0.8",
     "husky": "^2.1.0",

diff --git a/packages/stark-core/base.spec.ts b/packages/stark-core/base.spec.ts
@@ -1,8 +1,7 @@
 "use strict";
 
-import "core-js/es6";
-import "core-js/es7/reflect";
-import "core-js/stage/4";
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
 
 /* tslint:disable:no-import-side-effect */
 // FIXME: change when https://github.com/monounity/karma-typescript/issues/320 is resolved

diff --git a/packages/stark-core/tsconfig-build.json b/packages/stark-core/tsconfig-build.json
@@ -9,9 +9,11 @@
       "@angular/common": ["../../node_modules/@angular/common"],
       "@angular/core": ["../../node_modules/@angular/core"],
       "@angular/router": ["../../node_modules/@angular/router"],
-      "rxjs/*": ["../../node_modules/rxjs/*"],
+      "@nationalbankbelgium/stark-core": ["."],
+      "core-js/*": ["../../node_modules/core-js/*"],
       "environments/environment": ["./src/common/environment"],
-      "@nationalbankbelgium/stark-core": ["."]
+      "rxjs/*": ["../../node_modules/rxjs/*"],
+      "zone.js/*": ["../../node_modules/zone.js/*"]
     },
     "outDir": "../../dist/packages/stark-core"
   },

diff --git a/packages/stark-rbac/base.spec.ts b/packages/stark-rbac/base.spec.ts
@@ -1,9 +1,7 @@
 "use strict";
 
-import "core-js/es6";
-import "core-js/es7/reflect";
-import "core-js/es7/string";
-import "core-js/stage/4";
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
 
 // IE polyfills
 

diff --git a/packages/stark-rbac/tsconfig-build.json b/packages/stark-rbac/tsconfig-build.json
@@ -11,19 +11,21 @@
       "@angular/common": ["../../node_modules/@angular/common"],
       "@angular/core": ["../../node_modules/@angular/core"],
       "@angular/router": ["../../node_modules/@angular/router"],
+      "@nationalbankbelgium/stark-core": ["../../dist/packages/stark-core"],
+      "@nationalbankbelgium/stark-rbac": ["."],
       "@ng-idle/*": ["../stark-core/node_modules/@ng-idle/*"],
       "@ngrx/*": ["../stark-core/node_modules/@ngrx/*"],
       "@ngx-translate/*": ["../stark-core/node_modules/@ngx-translate/*"],
       "@uirouter/*": ["../stark-core/node_modules/@uirouter/*"],
       "cerialize": ["../stark-core/node_modules/cerialize"],
       "class-validator": ["../stark-core/node_modules/class-validator"],
-      "moment": ["../stark-core/node_modules/moment"],
+      "core-js/*": ["../../node_modules/core-js/*"],
+      "environments/environment": ["../../dist/packages/stark-core/src/common/environment"],
       "ibantools": ["../stark-core/node_modules/ibantools"],
-      "lodash": ["../stark-core/node_modules/lodash"],
+      "lodash-es/*": ["../stark-core/node_modules/lodash-es/*"],
+      "moment": ["../stark-core/node_modules/moment"],
       "rxjs/*": ["../../node_modules/rxjs/*"],
-      "environments/environment": ["../../dist/packages/stark-core/src/common/environment"],
-      "@nationalbankbelgium/stark-core": ["../../dist/packages/stark-core"],
-      "@nationalbankbelgium/stark-rbac": ["."]
+      "zone.js/*": ["../../node_modules/zone.js/*"]
     },
     "outDir": "../../dist/packages/stark-rbac"
   },

diff --git a/packages/stark-ui/base.spec.ts b/packages/stark-ui/base.spec.ts
@@ -1,9 +1,7 @@
 "use strict";
 
-import "core-js/es6";
-import "core-js/es7/reflect";
-import "core-js/es7/string";
-import "core-js/stage/4";
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
 
 // IE polyfills
 

diff --git a/packages/stark-ui/tsconfig-build.json b/packages/stark-ui/tsconfig-build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "rootDir": ".",
-    "typeRoots": [
-      "./node_modules/@types",
-      "../stark-build/typings",
-      "./typings"
-    ],
+    "typeRoots": ["./node_modules/@types", "../stark-build/typings", "./typings"],
     "lib": ["dom", "dom.iterable", "es2017"],
     "paths": {
       "@angularclass/hmr": ["../stark-core/node_modules/@angularclass/hmr"],
@@ -17,19 +13,21 @@
       "@angular/core": ["../../node_modules/@angular/core"],
       "@angular/material": ["../../node_modules/@angular/material"],
       "@angular/router": ["../../node_modules/@angular/router"],
+      "@nationalbankbelgium/stark-core": ["../../dist/packages/stark-core"],
+      "@nationalbankbelgium/stark-ui": ["."],
       "@ng-idle/*": ["../stark-core/node_modules/@ng-idle/*"],
       "@ngrx/*": ["../stark-core/node_modules/@ngrx/*"],
       "@ngx-translate/*": ["../stark-core/node_modules/@ngx-translate/*"],
       "@uirouter/*": ["../stark-core/node_modules/@uirouter/*"],
       "cerialize": ["../stark-core/node_modules/cerialize"],
       "class-validator": ["../stark-core/node_modules/class-validator"],
-      "moment": ["../stark-core/node_modules/moment"],
+      "core-js/*": ["../../node_modules/core-js/*"],
+      "environments/environment": ["../../dist/packages/stark-core/src/common/environment"],
       "ibantools": ["../stark-core/node_modules/ibantools"],
       "lodash-es/*": ["../stark-core/node_modules/lodash-es/*"],
+      "moment": ["../stark-core/node_modules/moment"],
       "rxjs/*": ["../../node_modules/rxjs/*"],
-      "environments/environment": ["../../dist/packages/stark-core/src/common/environment"],
-      "@nationalbankbelgium/stark-core": ["../../dist/packages/stark-core"],
-      "@nationalbankbelgium/stark-ui": ["."]
+      "zone.js/*": ["../../node_modules/zone.js/*"]
     },
     "outDir": "../../dist/packages/stark-ui"
   },

diff --git a/showcase/base.spec.ts b/showcase/base.spec.ts
@@ -1,9 +1,7 @@
 "use strict";
 
-import "core-js/es6";
-import "core-js/es7/reflect";
-import "core-js/es7/string";
-import "core-js/stage/4";
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
 
 // IE polyfills
 

diff --git a/showcase/package-lock.json b/showcase/package-lock.json
diff --git a/showcase/package.json b/showcase/package.json
@@ -130,7 +130,7 @@
     "@uirouter/visualizer": "~7.0.0",
     "angular-in-memory-web-api": "~0.8.0",
     "basscss": "~8.0.10",
-    "core-js": "~2.6.3",
+    "core-js": "~3.0.0",
     "eligrey-classlist-js-polyfill": "~1.2.20180112",
     "event-source-polyfill": "~1.0.5",
     "http-server": "~0.11.1",

diff --git a/showcase/src/app/welcome/pages/getting-started/starter-structure.ts b/showcase/src/app/welcome/pages/getting-started/starter-structure.ts
@@ -183,6 +183,7 @@ export const starkStylesCss = `
 @import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/login/login-page.component";
 @import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/preloading/preloading-page.component";
 `;
+
 export const polyfillsBrowsersContent = `
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
@@ -199,28 +200,56 @@ export const polyfillsBrowsersContent = `
  *
  * Learn more in https://angular.io/guide/browser-support
  */
+
 /***************************************************************************************************
  * BROWSER POLYFILLS
  *
  * See: https://angular.io/guide/browser-support#optional-browser-features-to-polyfill
  */
+
 /**
  * IE11 requires all of the following polyfills.
  *
  * Polyfill: https://github.com/zloirock/core-js
+ * Add the specific lines below corresponding to the version of core-js you want to use: 2.x or 3.x
  */
 /* tslint:disable:no-import-side-effect */
+
+/******************** core-js 2.x ********************/
 import "core-js/es6";
 import "core-js/es7/reflect";
 import "core-js/es7/string";
 import "core-js/stage/4";
+/**
+ * IE11 does not support iteration on certain DOM collections (NodeList).
+ * This polyfill is specifically needed for the animation on mat-menu used in stark-table.
+ * More info: https://github.com/angular/angular/issues/27887
+ */
+import "core-js/modules/web.dom.iterable";
+/*****************************************************/
+
+/******************** core-js 3.x ********************
+ * Make sure you add the 'paths' workaround to the tsconfig.json to support core-js 3.x with Angular CLI 7.x
+ * See: https://github.com/angular/angular-cli/issues/13954#issuecomment-475452588
+ */
+import "core-js/es";
+import "core-js/proposals/reflect-metadata";
+/**
+ * IE11 does not support iteration on certain DOM collections (NodeList).
+ * This polyfill is specifically needed for the animation on mat-menu used in stark-table.
+ * More info: https://github.com/angular/angular/issues/27887
+ */
+import "core-js/modules/web.dom-collections.iterator";
+/*****************************************************/
+
 /**
  * IE11 and Edge require this to support Server-sent events
  * https://caniuse.com/#feat=eventsource
  *
  * Polyfill: https://github.com/Yaffle/EventSource
  */
 import "event-source-polyfill";
+
 /**
  * IE11 requires Element.classList for NgClass support on SVG elements
  * See: https://caniuse.com/#feat=classlist
@@ -230,6 +259,7 @@ import "event-source-polyfill";
  * Polyfill: https://github.com/eligrey/classList.js
  */
 import "eligrey-classlist-js-polyfill";
+
 /**
  * Web Animations polyfill is no longer needed for standard animation support as of Angular 6
  * IMPORTANT: It is only needed in case you use the AnimationBuilder from '@angular/animations' in the application
@@ -239,6 +269,7 @@ import "eligrey-classlist-js-polyfill";
  * Polyfill: https://github.com/web-animations/web-animations-js
  */
 // import "web-animations-js";
+
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */