Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Angular UI: Migrated the ng-packs project into an Nx workspace #9837

Merged
merged 38 commits into from
Aug 18, 2021
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
8954f5b
create nx workspace
mehmet-erim Aug 11, 2021
2a9123b
Merge branch 'dev' of https://github.com/abpframework/abp into feat/9783
mehmet-erim Aug 11, 2021
81ba131
clone core module to nx repo
mehmet-erim Aug 11, 2021
c30a330
clone theme-shared package to nx workspace
mehmet-erim Aug 12, 2021
453f3a6
copy theme-basic package to the nx workspace
mehmet-erim Aug 12, 2021
3ce5c01
update ng package versions
mehmet-erim Aug 12, 2021
40ed517
rename libs folder as packages
mehmet-erim Aug 12, 2021
37b7d32
add account-core package to nx workspace
mehmet-erim Aug 13, 2021
325b442
add components package to nx workspace
mehmet-erim Aug 13, 2021
2a66bb4
add feature-management to nx workspace
mehmet-erim Aug 13, 2021
da9c154
add permission-management to nx workspace
mehmet-erim Aug 13, 2021
2a98800
add setting-management to nx workspace
mehmet-erim Aug 13, 2021
d75a5c3
add account package to nx workspace
mehmet-erim Aug 13, 2021
96bae73
add identity package to nx workspace
mehmet-erim Aug 13, 2021
79e0dab
add tenant-management to nx workspace
mehmet-erim Aug 13, 2021
48ec289
add schematics package to nx workspace
mehmet-erim Aug 16, 2021
c1ddc41
copy dev-app to nx workspace
mehmet-erim Aug 16, 2021
47eddc6
fix theme-shared testing errors
mehmet-erim Aug 16, 2021
6963337
fix all testing problems
mehmet-erim Aug 16, 2021
682d8ab
fix all lint errors
mehmet-erim Aug 16, 2021
c4eab67
reformat all files
mehmet-erim Aug 16, 2021
762344b
remove tslint comments
mehmet-erim Aug 17, 2021
1468ba1
update angular action
mehmet-erim Aug 17, 2021
3da3448
fix schematics building erros
mehmet-erim Aug 17, 2021
c3fcd30
fix setting-management building error
mehmet-erim Aug 17, 2021
545ade7
Merge branch 'dev' of https://github.com/abpframework/abp into feat/9783
mehmet-erim Aug 17, 2021
cb0968f
organize config.state imports
mehmet-erim Aug 17, 2021
07965a8
improve publish script
mehmet-erim Aug 17, 2021
15b98ce
move nx workspace to ng-packs folder
mehmet-erim Aug 17, 2021
971cc36
update angular gh action
mehmet-erim Aug 17, 2021
2c63a82
Update angular.yml
mehmet-erim Aug 17, 2021
0dc9c2f
remove ngxs-logger-plugin from dev-app
mehmet-erim Aug 17, 2021
195b815
Merge branch 'feat/9783' of https://github.com/abpframework/abp into …
mehmet-erim Aug 17, 2021
2d52fd4
increase dev-app bundle budget
mehmet-erim Aug 17, 2021
9c705af
add prod flag to nx run-many command
mehmet-erim Aug 17, 2021
d7223c3
fix some package paths
mehmet-erim Aug 17, 2021
96be03d
change package tsconfig structure
mehmet-erim Aug 18, 2021
9b2199f
Merge branch 'dev' of https://github.com/abpframework/abp into feat/9783
mehmet-erim Aug 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 8 additions & 18 deletions .github/workflows/angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ on:
- 'dev'
jobs:
build-test-lint:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 0

- uses: actions/cache@v2
with:
Expand All @@ -31,25 +33,13 @@ jobs:
working-directory: npm/ng-packs

- name: Run lint
run: yarn ng lint
run: yarn affected:lint --base=remotes/origin/${{ github.base_ref }}
working-directory: npm/ng-packs

- name: Run prepare workspace
run: yarn prepare:workspace
- name: Run build
run: yarn affected:build --base=remotes/origin/${{ github.base_ref }}
working-directory: npm/ng-packs

- name: Run test
run: yarn ci:test
working-directory: npm/ng-packs

- name: Build dev-app
run: yarn build --prod
run: yarn affected:test --base=remotes/origin/${{ github.base_ref }}
working-directory: npm/ng-packs

- name: Install packages of app template
run: yarn install
working-directory: templates/app/angular

- name: Build app template
run: yarn build --prod
working-directory: templates/app/angular
2 changes: 1 addition & 1 deletion npm/ng-packs/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see https://editorconfig.org
# Editor configuration, see http://editorconfig.org
root = true

[*]
Expand Down
1 change: 1 addition & 0 deletions npm/ng-packs/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.d.ts
38 changes: 38 additions & 0 deletions npm/ng-packs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-empty-function": ["warn"]
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
}
4 changes: 4 additions & 0 deletions npm/ng-packs/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Add files here to ignore them from prettier formatting

/dist
/coverage
3 changes: 3 additions & 0 deletions npm/ng-packs/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"recommendations": [
"angular.ng-template",
"nrwl.angular-console",
"esbenp.prettier-vscode",
"firsttris.vscode-jest-runner",
"dbaeumer.vscode-eslint",
"ms-vscode.vscode-typescript-tslint-plugin",
"visualstudioexptteam.vscodeintellicode",
"christian-kohler.path-intellisense",
Expand Down
5 changes: 0 additions & 5 deletions npm/ng-packs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ Run `yarn` to install all dependencies, then run `yarn prepare:workspace` to pr

Run `yarn start` to start the `dev-app`. Navigate to http://localhost:4200/.

## 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.

## 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)
Expand Down
7 changes: 1 addition & 6 deletions npm/ng-packs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,15 @@

## Getting started

Run `yarn` to install all dependencies, then run `yarn prepare:workspace` to prepare the ABP packages (might take 2 minutes).
Run `yarn` to install all dependencies.

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.

### 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)
Expand Down