Merge f06008c into 54bb4bb

easyops-cn · Dec 17, 2018 · 789c090 · 789c090
2 parents 54bb4bb + f06008c
commit 789c090
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/__tests__/app.js b/__tests__/app.js
@@ -96,7 +96,8 @@ describe('generator-console-package:app:@easyops', () => {
       `packages/${packageName}/package.json`,
       {
         scripts: {
-          start: "ng-packagr -w -p package.json"
+          start: "WATCH_MODE=true node ../../ng-packagr",
+          build: "node ../../ng-packagr && rimraf dist/package.json"
         }
       }
     );
@@ -221,7 +222,7 @@ describe('generator-console-package:app:@brick', () => {
       `@brick/${packageName}/package.json`,
       {
         scripts: {
-          start: "ng-packagr -w -p package.json"
+          start: "WATCH_MODE=true node ../../ng-packagr"
         }
       }
     );
@@ -344,7 +345,8 @@ describe('generator-console-package:app:@plugin-common', () => {
       `@plugin-common/${packageName}/package.json`,
       {
         scripts: {
-          start: "ng-packagr -w -p package.json"
+          start: "WATCH_MODE=true node ../../ng-packagr",
+          build: "node ../../ng-packagr && rimraf dist/package.json"
         }
       }
     );

diff --git a/generators/app/templates/library/ng-package.js b/generators/app/templates/library/ng-package.js
@@ -0,0 +1,2 @@
+/* eslint-env node */
+module.exports = require("../../ng-package");
diff --git a/generators/app/templates/library/package.json.ejs b/generators/app/templates/library/package.json.ejs
@@ -6,25 +6,13 @@
   "license": "UNLICENSED",
   "files": ["dist/"],
   "scripts": {
-<% if (!removeScriptsStart) { %>
-    "start": "ng-packagr -w -p package.json",
-<% } %>
-    "prebuild": "rimraf dist",
-    "build": "ng-packagr -p package.json && rimraf dist/package.json",
+<% if (!removeScriptsStart) { %> "start": "WATCH_MODE=true node ../../ng-packagr",<% } %>
+    "build": "node ../../ng-packagr && rimraf dist/package.json",
     "prepublishOnly": "npm run build"
   },
-  "ngPackage": {
-    "lib": {
-      "entryFile": "public_api.ts",
-      "languageLevel": [
-        "dom",
-        "esnext"
-      ]
-    }
-  },
   "peerDependencies": {
-    "@angular/common": "^6.0.3",
-    "@angular/core": "^6.0.3",
+    "@angular/common": "^6.1.4",
+    "@angular/core": "^6.1.4",
     "@easyops/console-plugin-core": "^4.1.0"
   },
   "devDependencies": {