#1506 Bump Zone.js to remove warnings when using angular >=6. (#1522)

* 1506 allow zonejs 0.7.x and 0.8.x to support a wider range of angular versions * #1506 Removed zone.js as peer since it comes with angular itself * #1506 Removed zone.js as peer since it comes with angular itself
OpenAPITools · Nov 24, 2018 · 0ba9278 · 0ba9278
1 parent e91d6d7
commit 0ba9278
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache
@@ -29,8 +29,7 @@
     "@angular/compiler": "^{{ngVersion}}",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "{{#useRxJS6}}^6.1.0{{/useRxJS6}}{{^useRxJS6}}^5.4.0{{/useRxJS6}}",
-    "zone.js": "^0.7.6"
+    "rxjs": "{{#useRxJS6}}^6.1.0{{/useRxJS6}}{{^useRxJS6}}^5.4.0{{/useRxJS6}}"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^{{ngVersion}}",
@@ -42,7 +41,7 @@
     "ng-packagr": {{#useOldNgPackagr}}"^1.6.0"{{/useOldNgPackagr}}{{^useOldNgPackagr}}"^2.4.1"{{/useOldNgPackagr}},{{/useNgPackagr}}
     "reflect-metadata": "^0.1.3",
     "rxjs": "{{#useRxJS6}}^6.1.0{{/useRxJS6}}{{^useRxJS6}}^5.4.0{{/useRxJS6}}",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}

diff --git a/samples/client/petstore/typescript-angular-v2/npm/package.json b/samples/client/petstore/typescript-angular-v2/npm/package.json
@@ -22,8 +22,7 @@
     "@angular/compiler": "^2.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
+    "rxjs": "^5.4.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^2.0.0",
@@ -34,7 +33,7 @@
     "@angular/platform-browser": "^2.0.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   },
   "publishConfig": {

diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/package.json b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
@@ -18,8 +18,7 @@
     "@angular/compiler": "^4.3.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
+    "rxjs": "^5.4.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^4.3.0",
@@ -31,7 +30,7 @@
     "ng-packagr": "^1.6.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   },
   "publishConfig": {

diff --git a/samples/client/petstore/typescript-angular-v4/npm/package.json b/samples/client/petstore/typescript-angular-v4/npm/package.json
@@ -18,8 +18,7 @@
     "@angular/compiler": "^4.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
+    "rxjs": "^5.4.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^4.0.0",
@@ -31,7 +30,7 @@
     "ng-packagr": "^1.6.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   },
   "publishConfig": {

diff --git a/...s/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json b/...s/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
@@ -18,8 +18,7 @@
     "@angular/compiler": "^6.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^6.1.0",
-    "zone.js": "^0.7.6"
+    "rxjs": "^6.1.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^6.0.0",
@@ -31,7 +30,7 @@
     "ng-packagr": "^2.4.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   },
   "publishConfig": {

diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
@@ -18,8 +18,7 @@
     "@angular/compiler": "^6.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^6.1.0",
-    "zone.js": "^0.7.6"
+    "rxjs": "^6.1.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^6.0.0",
@@ -31,7 +30,7 @@
     "ng-packagr": "^2.4.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
-    "zone.js": "^0.7.6",
+    "zone.js": "^0.7.6 || ^0.8.26",
     "typescript": ">=2.1.5 <2.8"
   },
   "publishConfig": {