Merge branch 'master' into dev

npm/abp-package-update-script.js

@@ -0,0 +1,24 @@
+const glob = require('glob');
+var path = require('path');
+const childProcess = require('child_process');
+
+const check = pkgJsonPath => {
+  try {
+    return childProcess.execSync(`ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u`).toString();
+  } catch (error) {
+    console.log('exec error: ' + error.message);
+    process.exit(error.status);
+  }
+};
+
+const folder = process.argv[2] || '.';
+
+glob(folder + '/**/package.json', {}, (er, files) => {
+  files.forEach(file => {
+    if (file.includes('node_modules')) {
+      return;
+    }
+
+    console.log(check(file));
+  });
+});

npm/package.json

@@ -1,8 +1,13 @@
 {
   "scripts": {
-    "lerna": "lerna"
+    "lerna": "lerna",
+    "update": "node abp-package-update-script.js .",
+    "update:templates": "node abp-package-update-script.js ../templates",
+    "ncu": "ncu"
   },
   "devDependencies": {
-    "lerna": "^2.11.0"
+    "lerna": "^2.11.0",
+    "npm-check-updates": "^3.1.25",
+    "glob": "^7.1.5"
   }
 }

npm/publish.ps1

@@ -4,4 +4,7 @@
 & cd ../../
 & yarn lerna publish --no-push
 & cd ng-packs\scripts
-& npm run sync
+& npm run sync
+& cd ../../
+& yarn update
+& yarn update:templates

templates/app/angular/package.json

@@ -44,11 +44,11 @@
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
     "karma-jasmine": "~2.0.1",
-    "karma": "~4.1.0",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "ngxs-schematic": "^1.1.9",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",

templates/module/angular/package.json

@@ -25,9 +25,6 @@
     "@angular/platform-browser": "~8.2.8",
     "@angular/platform-browser-dynamic": "~8.2.8",
     "@angular/router": "~8.2.8",
-    "@ngxs/devtools-plugin": "^3.5.0",
-    "@angularclass/hmr": "^2.1.3",
-    "@ngxs/hmr-plugin": "^3.5.0",
     "rxjs": "~6.4.0",
     "tslib": "^1.10.0",
     "zone.js": "~0.9.1"
@@ -38,17 +35,20 @@
     "@angular/cli": "~8.3.6",
     "@angular/compiler-cli": "~8.2.8",
     "@angular/language-service": "~8.2.8",
+    "@angularclass/hmr": "^2.1.3",
+    "@ngxs/hmr-plugin": "^3.5.0",
     "@types/jasmine": "~3.3.8",
+    "@ngxs/devtools-plugin": "^3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
+    "karma-jasmine": "~2.0.1",
+    "karma": "~4.1.0",
     "ng-packagr": "^5.4.0",
     "ngxs-schematic": "^1.1.9",
     "protractor": "~5.4.0",

templates/module/angular/projects/my-project-name-config/package.json

@@ -2,6 +2,6 @@
   "name": "my-project-name.config",
   "version": "0.0.1",
   "peerDependencies": {
-    "@abp/ng.core": ">=0.9.0"
+    "@abp/ng.core": ">=1.0.1"
   }
 }

templates/module/angular/projects/my-project-name/package.json

@@ -2,7 +2,7 @@
   "name": "my-project-name",
   "version": "0.0.1",
   "dependencies": {
-    "@abp/ng.theme.shared": "^0.9.0",
+    "@abp/ng.theme.shared": "^1.0.1",
     "my-project-name.config": "^0.0.1"
   }
 }