diff --git a/docs/zh-Hans/Entities.md b/docs/zh-Hans/Entities.md index ba567b2584..9c3066fef4 100644 --- a/docs/zh-Hans/Entities.md +++ b/docs/zh-Hans/Entities.md @@ -41,7 +41,7 @@ public class UserRole : Entity public DateTime CreationTime { get; set; } - public Phone() + public UserRole() { } diff --git a/npm/ng-packs/README.md b/npm/ng-packs/README.md index 5f73c2589e..b5347a18df 100644 --- a/npm/ng-packs/README.md +++ b/npm/ng-packs/README.md @@ -1,2 +1,24 @@

Abp Ng Packages

-[docs.abp.io](https://docs.abp.io) + + +## Getting started + +Run `yarn` to install all dependencies, then run `yarn prepare:workspace` to prepare the ABP packages (might take 2 minutes). + +Run `yarn start` to start the `dev-app`. Navigate to http://localhost:4200/. + +## Development + +### Package +[Symlink Manager](https://github.com/mehmet-erim/symlink-manager) is used to manage symbolic link processes. Run `yarn symlink copy` to select the packages to develop. + +> Ignore the changes in the dist folder. The changes should be discarded. + +### Application +The `dev-app` project is the same as the Angular UI template project. `dev-app` is used to see changes instantly. + +If you will only develop the `dev-app`, you don't need to run `symlink-manager`. + +> Reminder! If you have developed the `dev-app` template, you should do the same for the application and module templates. + +For more information, see the [docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index eada7a3cee..98871a1fc9 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -8,7 +8,8 @@ "commit": "git-cz", "lint": "ng lint", "scripts:build": "cd scripts && npm install && yarn build", - "ci": "yarn scripts:build --noCommit && yarn ci:test && yarn ng lint", + "prepare:workspace": "yarn scripts:build --noCommit", + "ci": "yarn prepare:workspace && yarn ci:test && yarn ng lint", "ci:test": "ng test --coverage=false" }, "devDependencies": { diff --git a/npm/ng-packs/scripts/build.js b/npm/ng-packs/scripts/build.js index 8258d85ff5..dca954af42 100644 --- a/npm/ng-packs/scripts/build.js +++ b/npm/ng-packs/scripts/build.js @@ -31,9 +31,9 @@ import program from 'commander'; await fse.writeJSON('../package.json', packageJson, { spaces: 2 }); try { - await execa('yarn', { + await execa('yarn', ['install', '--ignore-scripts'], { stdout: 'inherit', - cwd: '..', + cwd: '../', }); execa.sync( diff --git a/npm/ng-packs/scripts/package-lock.json b/npm/ng-packs/scripts/package-lock.json index 36bf73d5b9..fcce2fbb08 100644 --- a/npm/ng-packs/scripts/package-lock.json +++ b/npm/ng-packs/scripts/package-lock.json @@ -507,7 +507,8 @@ "esm": { "version": "3.2.25", "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" + "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", + "dev": true }, "esutils": { "version": "2.0.2", diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index 5e070a2c2c..26dcb1d4a6 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -1,7 +1,7 @@ { "name": "scripts", "version": "1.0.0", - "description": "Abp publish helper scripts", + "description": "ABP helper scripts", "main": "index.js", "modules": "[build.js, sync.js]", "scripts": { @@ -10,13 +10,14 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", "dependencies": { "babel-preset-node6": "^11.0.0", "commander": "^4.0.1", - "esm": "^3.2.25", "execa": "^2.0.3", "fs-extra": "^8.1.0", "prompt-confirm": "^2.0.4" + }, + "devDependencies": { + "esm": "^3.2.25" } }