Skip to content

Commit c38570b

Browse files
authored
Merge pull request #35 from bigBear713/dev
Dev
2 parents 2f47159 + b0a7edc commit c38570b

71 files changed

Lines changed: 1016 additions & 753 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"extends": [
8+
"eslint:recommended",
9+
"plugin:@typescript-eslint/recommended",
10+
"plugin:@angular-eslint/recommended",
11+
"plugin:@angular-eslint/template/process-inline-templates",
12+
"plugin:prettier/recommended"
13+
],
14+
"rules": {
15+
"@angular-eslint/directive-selector": [
16+
"error",
17+
{
18+
"type": "attribute",
19+
"style": "camelCase"
20+
}
21+
],
22+
"@angular-eslint/component-selector": [
23+
"error",
24+
{
25+
"type": "element",
26+
"style": "kebab-case"
27+
}
28+
],
29+
"@angular-eslint/no-empty-lifecycle-method": ["off"]
30+
}
31+
},
32+
{
33+
"files": ["projects/**/*.ts"],
34+
"excludedFiles": ["*.spec.ts"],
35+
"rules": {
36+
"@angular-eslint/directive-selector": [
37+
"error",
38+
{
39+
"type": "attribute",
40+
"prefix": "nb",
41+
"style": "camelCase"
42+
}
43+
],
44+
"@angular-eslint/component-selector": [
45+
"error",
46+
{
47+
"type": "element",
48+
"prefix": "nb",
49+
"style": "kebab-case"
50+
}
51+
],
52+
"@angular-eslint/pipe-prefix": [
53+
"error",
54+
{
55+
"prefixes": ["nb"]
56+
}
57+
],
58+
"@angular-eslint/no-input-rename": ["off"]
59+
}
60+
},
61+
{
62+
"files": ["*.html"],
63+
"extends": [
64+
"plugin:@angular-eslint/template/recommended",
65+
"plugin:@angular-eslint/template/accessibility",
66+
"plugin:prettier/recommended"
67+
],
68+
"rules": {}
69+
},
70+
{
71+
"files": ["*.html"],
72+
"excludedFiles": ["*inline-template-*.component.html"],
73+
"extends": ["plugin:prettier/recommended"],
74+
"rules": {
75+
"prettier/prettier": ["error", { "parser": "angular" }]
76+
}
77+
}
78+
]
79+
}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ testem.log
4646
# System Files
4747
.DS_Store
4848
Thumbs.db
49+
50+
.nx/cache
51+
.nx/workspace-data

.prettierignore

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
package-lock.json
4+
5+
# Compiled output
6+
/dist
7+
/tmp
8+
/out-tsc
9+
/bazel-out
10+
11+
# Node
12+
/node_modules
13+
npm-debug.log
14+
yarn-error.log
15+
16+
# IDEs and editors
17+
.idea/
18+
.project
19+
.classpath
20+
.c9/
21+
*.launch
22+
.settings/
23+
*.sublime-workspace
24+
25+
# Visual Studio Code
26+
.vscode
27+
.vscode/*
28+
!.vscode/settings.json
29+
!.vscode/tasks.json
30+
!.vscode/launch.json
31+
!.vscode/extensions.json
32+
.history/*
33+
34+
# Miscellaneous
35+
/.angular/cache
36+
.sass-cache/
37+
/connect.lock
38+
/coverage
39+
/libpeerconnection.log
40+
testem.log
41+
/typings
42+
/docs
43+
*.md
44+
45+
# System files
46+
.DS_Store
47+
Thumbs.db
48+
49+
.nx

.prettierrc.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"tabWidth": 2,
3+
"useTabs": false,
4+
"singleQuote": true,
5+
"semi": true,
6+
"bracketSpacing": true,
7+
"arrowParens": "avoid",
8+
"trailingComma": "es5",
9+
"bracketSameLine": true,
10+
"printWidth": 100,
11+
"endOfLine": "auto",
12+
"overrides": [
13+
{
14+
"files": "*.html",
15+
"options": {
16+
"parser": "angular",
17+
"singleQuote": false
18+
}
19+
}
20+
]
21+
}

CHANGELOG.CN.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v18.0.0
2+
## 破坏性更新
3+
- feat: `angular`升级到`^18.0.0`;
4+
- feat: `@bigbear713/nb-common`升级到`^18.0.0`;
5+
6+
---
7+
18
# v17.0.0
29
## 破坏性更新
310
- feat: `angular`升级到`^17.0.0`;

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v18.0.0
2+
## Breaking Changes
3+
- feat: Upgrade `angular` to `^18.0.0`;
4+
- feat: Upgrade `@bigbear713/nb-common` to `^18.0.0`;
5+
6+
---
7+
18
# v17.0.0
29
## Breaking Changes
310
- feat: Upgrade `angular` to `^17.0.0`;

README.CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Angular common form lib by bigBear713.
5151
| ^15.0.0 | ^15.0.0 |
5252
| ^16.0.0 | ^16.0.0 |
5353
| ^17.0.0 | ^17.0.0 |
54+
| ^18.0.0 | ^18.0.0 |
5455

5556
---
5657

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Angular common form lib by bigBear713.
5151
| ^15.0.0 | ^15.0.0 |
5252
| ^16.0.0 | ^16.0.0 |
5353
| ^17.0.0 | ^17.0.0 |
54+
| ^18.0.0 | ^18.0.0 |
5455

5556
---
5657

angular.json

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
1818
"prefix": "app",
1919
"architect": {
2020
"build": {
21-
"builder": "@angular-devkit/build-angular:browser",
21+
"builder": "@angular-devkit/build-angular:application",
2222
"options": {
23-
"outputPath": "dist/nb-form-demo",
23+
"outputPath": {
24+
"base": "dist/nb-form-demo"
25+
},
2426
"index": "src/index.html",
25-
"main": "src/main.ts",
26-
"polyfills": "src/polyfills.ts",
27+
"polyfills": ["src/polyfills.ts"],
2728
"tsConfig": "tsconfig.app.json",
2829
"inlineStyleLanguage": "scss",
29-
"assets": [
30-
"src/favicon.ico",
31-
"src/assets"
32-
],
33-
"styles": [
34-
"src/styles.scss"
35-
],
36-
"scripts": []
30+
"assets": ["src/favicon.ico", "src/assets"],
31+
"styles": ["src/styles.scss"],
32+
"scripts": [],
33+
"browser": "src/main.ts"
3734
},
3835
"configurations": {
3936
"production": {
@@ -57,10 +54,34 @@
5754
],
5855
"outputHashing": "all"
5956
},
57+
"deploy": {
58+
"budgets": [
59+
{
60+
"type": "initial",
61+
"maximumWarning": "500kb",
62+
"maximumError": "1mb"
63+
},
64+
{
65+
"type": "anyComponentStyle",
66+
"maximumWarning": "2kb",
67+
"maximumError": "4kb"
68+
}
69+
],
70+
"fileReplacements": [
71+
{
72+
"replace": "src/environments/environment.ts",
73+
"with": "src/environments/environment.prod.ts"
74+
}
75+
],
76+
"outputHashing": "all",
77+
"outputPath": {
78+
"base": "docs",
79+
"browser": ""
80+
},
81+
"baseHref": "/nb-form/"
82+
},
6083
"development": {
61-
"buildOptimizer": false,
6284
"optimization": false,
63-
"vendorChunk": true,
6485
"extractLicenses": false,
6586
"sourceMap": true,
6687
"namedChunks": true
@@ -94,15 +115,16 @@
94115
"tsConfig": "tsconfig.spec.json",
95116
"karmaConfig": "karma.conf.js",
96117
"inlineStyleLanguage": "scss",
97-
"assets": [
98-
"src/favicon.ico",
99-
"src/assets"
100-
],
101-
"styles": [
102-
"src/styles.scss"
103-
],
118+
"assets": ["src/favicon.ico", "src/assets"],
119+
"styles": ["src/styles.scss"],
104120
"scripts": []
105121
}
122+
},
123+
"lint": {
124+
"builder": "@angular-eslint/builder:lint",
125+
"options": {
126+
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
127+
}
106128
}
107129
}
108130
},
@@ -137,11 +159,18 @@
137159
"progress": true,
138160
"codeCoverage": true
139161
}
162+
},
163+
"lint": {
164+
"builder": "@angular-eslint/builder:lint",
165+
"options": {
166+
"lintFilePatterns": ["projects/**/*.ts", "projects/**/*.html"]
167+
}
140168
}
141169
}
142170
}
143171
},
144172
"cli": {
145-
"analytics": "1cceb65c-79ed-4662-aa22-8753ae9cec46"
173+
"analytics": "1cceb65c-79ed-4662-aa22-8753ae9cec46",
174+
"schematicCollections": ["@angular-eslint/schematics"]
146175
}
147-
}
176+
}

0 commit comments

Comments
 (0)