fix: support Angular 6 cli

hotforfeature · Jul 18, 2018 · 649290c · 649290c
1 parent 8305b48
commit 649290c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -48,11 +48,11 @@
     "tslib": "^1.7.1"
   },
   "peerDependencies": {
-    "@angular/cli": ">=1.6.3 < 1.8",
+    "@angular/cli": ">=1.6.3",
     "@angular/core": ">=4.0.0",
     "@angular/forms": ">=4.0.0",
     "@angular/platform-browser": ">=4.0.0",
-    "rxjs": "^5.0.1"
+    "rxjs": ">=5.0.1"
   },
   "devDependencies": {
     "@angular/common": "^5.0.0",

diff --git a/patch-cli.js b/patch-cli.js
@@ -1,10 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 
-const commonPath = path.resolve(
+let commonPath = path.resolve(
   __dirname,
   '../../@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/common.js'
 );
+
 const isNg6 = fs.existsSync(commonPath);
 if (!isNg6) {
   commonPath = path.resolve(
@@ -14,14 +15,10 @@ if (!isNg6) {
 }
 const stylesPath = path.resolve(
   __dirname,
-  '../../@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/styles.js'
+  isNg6
+    ? '../../@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/styles.js'
+    : '../../@angular/cli/models/webpack-configs/styles.js'
 );
-if (!fs.existsSync(stylesPath)) {
-  stylesPath = path.resolve(
-    __dirname,
-    '../../@angular/cli/models/webpack-configs/styles.js'
-  );
-}
 
 let data = fs.readFileSync(commonPath, 'utf8');
 if (!data.includes('/* Origami Patched */')) {