Skip to content

Commit 5e11f63

Browse files
committed
chore: rename scopes
1 parent 37fda45 commit 5e11f63

File tree

10 files changed

+2861
-373
lines changed

10 files changed

+2861
-373
lines changed

.eslintrc.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"**/*"
5+
],
6+
"plugins": [
7+
"@nrwl/nx"
8+
],
9+
"overrides": [
10+
{
11+
"files": [
12+
"*.ts",
13+
"*.tsx",
14+
"*.js",
15+
"*.jsx"
16+
],
17+
"rules": {
18+
"@nrwl/nx/enforce-module-boundaries": [
19+
"error",
20+
{
21+
"enforceBuildableLibDependency": true,
22+
"allow": [],
23+
"depConstraints": [
24+
{
25+
"sourceTag": "*",
26+
"onlyDependOnLibsWithTags": [
27+
"*"
28+
]
29+
}
30+
]
31+
}
32+
]
33+
}
34+
},
35+
{
36+
"files": [
37+
"*.ts",
38+
"*.tsx"
39+
],
40+
"extends": [
41+
"plugin:@nrwl/nx/typescript"
42+
],
43+
"rules": {}
44+
},
45+
{
46+
"files": [
47+
"*.js"
48+
],
49+
"extends": [
50+
"plugin:@nrwl/nx/javascript"
51+
],
52+
"rules": {}
53+
}
54+
]
55+
}

angular.json

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4-
"newProjectRoot": "projects",
54
"projects": {
65
"mc-web": {
76
"projectType": "application",
@@ -22,7 +21,7 @@
2221
"main": "apps/mc-web/src/main.ts",
2322
"polyfills": "apps/mc-web/src/polyfills.ts",
2423
"tsConfig": "apps/mc-web/tsconfig.app.json",
25-
"aot": false,
24+
"aot": true,
2625
"assets": [
2726
"apps/mc-web/src/favicon.ico",
2827
"apps/mc-web/src/assets",
@@ -48,9 +47,7 @@
4847
"optimization": true,
4948
"outputHashing": "all",
5049
"sourceMap": false,
51-
"extractCss": true,
5250
"namedChunks": false,
53-
"aot": true,
5451
"extractLicenses": true,
5552
"vendorChunk": false,
5653
"buildOptimizer": true,
@@ -59,6 +56,11 @@
5956
"type": "initial",
6057
"maximumWarning": "2mb",
6158
"maximumError": "5mb"
59+
},
60+
{
61+
"type": "anyComponentStyle",
62+
"maximumWarning": "6kb",
63+
"maximumError": "10kb"
6264
}
6365
]
6466
}
@@ -92,15 +94,11 @@
9294
}
9395
},
9496
"lint": {
95-
"builder": "@angular-devkit/build-angular:tslint",
97+
"builder": "@nrwl/linter:eslint",
9698
"options": {
97-
"tsConfig": [
98-
"apps/mc-web/tsconfig.app.json",
99-
"apps/mc-web/tsconfig.spec.json",
100-
"apps/mc-web/e2e/tsconfig.json"
101-
],
102-
"exclude": [
103-
"**/node_modules/**"
99+
"lintFilePatterns": [
100+
"apps/mc-web/src/**/*.ts",
101+
"apps/mc-web/src/**/*.html"
104102
]
105103
}
106104
}
@@ -187,5 +185,23 @@
187185
}
188186
}
189187
},
190-
"defaultProject": "mc-web"
188+
"cli": {
189+
"defaultCollection": "@nrwl/angular"
190+
},
191+
"defaultProject": "mc-web",
192+
"schematics": {
193+
"@nrwl/angular:application": {
194+
"style": "css",
195+
"linter": "eslint",
196+
"unitTestRunner": "karma"
197+
},
198+
"@nrwl/angular:library": {
199+
"style": "css",
200+
"linter": "eslint",
201+
"unitTestRunner": "karma"
202+
},
203+
"@nrwl/angular:component": {
204+
"style": "scss"
205+
}
206+
}
191207
}

apps/mc-web/src/app/app-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const routes: Routes = [
1010
},
1111
{
1212
path: 'welcome',
13-
loadChildren: () => import('@mc-web/welcome/shell').then(m => m.ManagementShellModule)
13+
loadChildren: () => import('@pt-starter/welcome/shell').then(m => m.ManagementShellModule)
1414
}
1515
];
1616

libs/welcome/shell/src/lib/welcome-shell.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const routes: Routes = [
77
{
88
path: '',
99
loadChildren: () =>
10-
import('@mc-web/welcome/feature-welcome').then(
10+
import('@pt-starter/welcome/feature-welcome').then(
1111
(m) => m.WelcomeFeatureWelcomeModule
1212
)
1313
}

nx.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,25 @@
1111
"tsconfig.base.json": "*",
1212
".eslintrc.json": "*"
1313
},
14+
"tasksRunnerOptions": {
15+
"default": {
16+
"runner": "@nrwl/workspace/tasks-runners/default",
17+
"options": {
18+
"cacheableOperations": [
19+
"build",
20+
"lint",
21+
"test",
22+
"e2e"
23+
]
24+
}
25+
}
26+
},
1427
"projects": {
1528
"mc-web": {
16-
"tags": ["domain:app", "type:app"]
29+
"tags": [
30+
"domain:app",
31+
"type:app"
32+
]
1733
}
1834
}
1935
}

package.json

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
22
"name": "pt-starter",
3-
"version": "1.0.0",
3+
"version": "0.0.0",
4+
"private": true,
5+
"license": "MIT",
46
"scripts": {
57
"ng": "nx",
68
"nx": "nx",
7-
"start": "nx serve -- --ssl true --proxy-config proxy.conf.json",
9+
"start": "ng serve -- --ssl true --proxy-config proxy.conf.json",
810
"start:mock": "ng serve --proxy-config conf/proxy.conf.mock.json",
911
"start-es5": "nx serve --configuration es5",
1012
"build": "nx build",
@@ -19,14 +21,12 @@
1921
"update:check": "ng update",
2022
"dep-graph": "nx dep-graph",
2123
"help": "nx help",
22-
"preinstall": "node ./tools/npm/check-npm.js",
23-
"postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main",
24+
"postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
2425
"mock:server": "ts-node --project apps/mc-mocks-server/tsconfig.json -r tsconfig-paths/register apps/mc-mocks-server/src/main.ts",
2526
"mock:server:debug": "nodemon --config apps/mc-mocks-server/nodemon-debug.json",
2627
"build:tokens-default": "node ./tools/design-tokens/build.js",
2728
"workspace-generator": "nx workspace-generator"
2829
},
29-
"private": true,
3030
"husky": {
3131
"hooks": {
3232
"commit-msg": "commitlint --config ./tools/commitlint.config.js -E HUSKY_GIT_PARAMS"
@@ -59,14 +59,18 @@
5959
"luxon": "^1.27.0",
6060
"messageformat": "^2.2.1",
6161
"moment": "^2.24.0",
62-
"rxjs": "^6.6.7",
62+
"reflect-metadata": "^0.1.13",
63+
"rxjs": "~6.6.3",
6364
"sqlite": "^4.0.23",
64-
"tslib": "^1.9.0",
65+
"tslib": "^2.3.1",
6566
"typeorm": "^0.2.37",
6667
"zone.js": "~0.11.4"
6768
},
6869
"devDependencies": {
6970
"@angular-devkit/build-angular": "~0.1102.14",
71+
"@angular-eslint/eslint-plugin": "~1.0.0",
72+
"@angular-eslint/eslint-plugin-template": "~1.0.0",
73+
"@angular-eslint/template-parser": "~1.0.0",
7074
"@angular/cli": "~11.2.14",
7175
"@angular/compiler-cli": "^11.2.14",
7276
"@angular/language-service": "^11.2.14",
@@ -78,38 +82,44 @@
7882
"@ngrx/store-devtools": "^11.1.1",
7983
"@nrwl/angular": "^11.6.3",
8084
"@nrwl/cli": "^11.6.3",
85+
"@nrwl/eslint-plugin-nx": "11.6.3",
86+
"@nrwl/jest": "11.6.3",
87+
"@nrwl/linter": "11.6.3",
8188
"@nrwl/nest": "^11.6.3",
8289
"@nrwl/node": "^11.6.3",
8390
"@nrwl/tao": "^11.6.3",
8491
"@nrwl/workspace": "^11.6.3",
8592
"@ptsecurity/commitlint-config": "^1.0.0",
86-
"@ptsecurity/tslint-config": "~0.12.0",
8793
"@types/express": "^4.16.0",
8894
"@types/faker": "^5.5.8",
8995
"@types/jasmine": "^3.8.2",
9096
"@types/jasminewd2": "^2.0.10",
97+
"@types/jest": "26.0.8",
9198
"@types/node": "~8.9.4",
99+
"@typescript-eslint/eslint-plugin": "4.3.0",
100+
"@typescript-eslint/parser": "4.3.0",
101+
"eslint": "^7.10.0",
102+
"eslint-config-prettier": "^8.1.0",
92103
"husky": "^7.0.1",
93104
"jasmine-core": "^3.8.0",
94105
"jasmine-marbles": "^0.8.3",
95106
"jasmine-spec-reporter": "^7.0.0",
107+
"jest": "26.2.2",
108+
"jest-preset-angular": "8.3.2",
96109
"karma": "^6.3.4",
97110
"karma-coverage": "^2.0.3",
98111
"karma-coverage-istanbul-reporter": "^3.0.3",
99112
"karma-jasmine": "^4.0.1",
100113
"karma-jasmine-html-reporter": "^1.7.0",
114+
"ng-packagr": "^11.0.0",
101115
"nodemon": "^2.0.12",
102-
"reflect-metadata": "^0.1.12",
103-
"rimraf": "^3.0.2",
104-
"sass": "^1.32.6",
105116
"style-dictionary": "^3.0.1",
106117
"stylelint": "^13.13.1",
107118
"stylelint-scss": "^3.20.1",
119+
"ts-jest": "26.4.0",
108120
"ts-node": "~10.2.1",
109121
"tsconfig-paths": "^3.10.1",
110-
"tslint": "~5.15.0",
111122
"typescript": "~4.1.6",
112-
"wait-on": "^6.0.0",
113123
"wallaby-webpack": "^3.9.16"
114124
}
115125
}

tools/npm/check-npm.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

tsconfig.base.json

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
"baseUrl": ".",
55
"rootDir": ".",
66
"target": "es2015",
7-
"lib": ["dom", "es2018"],
8-
"typeRoots": ["node_modules/@types"],
7+
"lib": [
8+
"dom",
9+
"es2018"
10+
],
11+
"typeRoots": [
12+
"node_modules/@types"
13+
],
914
"sourceMap": true,
1015
"declaration": false,
1116
"downlevelIteration": true,
@@ -19,15 +24,30 @@
1924
"resolveJsonModule": true,
2025
"esModuleInterop": true,
2126
"paths": {
22-
"@libs/api-models": ["libs/api-models/src/index.ts"],
23-
"@mc-web/welcome/feature-welcome": ["libs/welcome/feature-welcome/src/index.ts"],
24-
"@mc-web/welcome/shell": ["libs/welcome/shell/src/index.ts"],
25-
"@libs/mocks/users": ["libs/mocks/features/users/src/index.ts"],
26-
"@libs/mocks/entities": ["libs/mocks/repositories/src/index.ts"],
27-
"@libs/mocks/dto": ["libs/mocks/dto/src/index.ts"]
27+
"@libs/api-models": [
28+
"libs/api-models/src/index.ts"
29+
],
30+
"@pt-starter/welcome/feature-welcome": [
31+
"libs/welcome/feature-welcome/src/index.ts"
32+
],
33+
"@pt-starter/welcome/shell": [
34+
"libs/welcome/shell/src/index.ts"
35+
],
36+
"@libs/mocks/users": [
37+
"libs/mocks/features/users/src/index.ts"
38+
],
39+
"@libs/mocks/entities": [
40+
"libs/mocks/repositories/src/index.ts"
41+
],
42+
"@libs/mocks/dto": [
43+
"libs/mocks/dto/src/index.ts"
44+
]
2845
}
2946
},
30-
"exclude": ["node_modules", "tmp"],
47+
"exclude": [
48+
"node_modules",
49+
"tmp"
50+
],
3151
"angularCompilerOptions": {
3252
"fullTemplateTypeCheck": true,
3353
"strictInjectionParameters": true

tslint.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)