Skip to content

Commit

Permalink
Merge pull request #56 from bigBear713/revert-53-revert-51-issue/50
Browse files Browse the repository at this point in the history
Revert "Revert "Issue/50""
  • Loading branch information
bigBear713 authored Jun 9, 2024
2 parents b0bf120 + af6d1fc commit 55c3da9
Show file tree
Hide file tree
Showing 101 changed files with 1,032 additions and 708 deletions.
79 changes: 79 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"root": true,
"ignorePatterns": [],
"overrides": [
{
"files": ["*.ts"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:prettier/recommended"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"style": "kebab-case"
}
],
"@angular-eslint/no-empty-lifecycle-method": ["off"]
}
},
{
"files": ["projects/**/*.ts"],
"excludedFiles": ["*.spec.ts"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "nb",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "nb",
"style": "kebab-case"
}
],
"@angular-eslint/pipe-prefix": [
"error",
{
"prefixes": ["nb"]
}
],
"@angular-eslint/no-input-rename": ["off"]
}
},
{
"files": ["*.html"],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:@angular-eslint/template/accessibility",
"plugin:prettier/recommended"
],
"rules": {}
},
{
"files": ["*.html"],
"excludedFiles": ["*inline-template-*.component.html"],
"extends": ["plugin:prettier/recommended"],
"rules": {
"prettier/prettier": ["error", { "parser": "angular" }]
}
}
]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ testem.log
# System Files
.DS_Store
Thumbs.db

.nx
49 changes: 49 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

package-lock.json

# Compiled output
/dist
/tmp
/out-tsc
/bazel-out

# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings
/docs
*.md

# System files
.DS_Store
Thumbs.db

.nx
21 changes: 21 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"tabWidth": 2,
"useTabs": false,
"singleQuote": true,
"semi": true,
"bracketSpacing": true,
"arrowParens": "avoid",
"trailingComma": "es5",
"bracketSameLine": true,
"printWidth": 100,
"endOfLine": "auto",
"overrides": [
{
"files": "*.html",
"options": {
"parser": "angular",
"singleQuote": false
}
}
]
}
6 changes: 6 additions & 0 deletions CHANGELOG.CN.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v18.0.0
## 破坏性更新
- feat: `angular`升级到`v18`;

---

# v17.0.0
## 破坏性更新
- feat: `angular`升级到`v17`;
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v18.0.0
## Breaking Changes
- feat: Upgrade `angular` to `v18`;

---

# v17.0.0
## Breaking Changes
- feat: Upgrade `angular` to `v17`;
Expand Down
1 change: 1 addition & 0 deletions README.CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Angular common lib by bigBear713, include some common `component`, `directive`,
| ^15.0.0 | ^15.0.0 |
| ^16.0.0 | ^16.0.0 |
| ^17.0.0 | ^17.0.0 |
| ^18.0.0 | ^18.0.0 |

---

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Angular common lib by bigBear713, include some common `component`, `directive`,
| ^15.0.0 | ^15.0.0 |
| ^16.0.0 | ^16.0.0 |
| ^17.0.0 | ^17.0.0 |
| ^18.0.0 | ^18.0.0 |

---

Expand Down
57 changes: 49 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/nb-common-demo",
"outputPath": {
"base": "dist/nb-common-demo"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand All @@ -38,7 +41,8 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -62,10 +66,34 @@
],
"outputHashing": "all"
},
"deploy": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all",
"outputPath":{
"base": "docs",
"browser": ""
},
"baseHref": "/nb-common/"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand Down Expand Up @@ -108,6 +136,12 @@
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
}
},
Expand Down Expand Up @@ -142,11 +176,18 @@
"progress": true,
"codeCoverage": true
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["projects/**/*.ts", "projects/**/*.html"]
}
}
}
}
},
"cli": {
"analytics": "0a71bc32-fdb3-4945-91c6-417b0dd5d2f4"
"analytics": "0a71bc32-fdb3-4945-91c6-417b0dd5d2f4",
"schematicCollections": ["@angular-eslint/schematics"]
}
}
1 change: 0 additions & 1 deletion docs/153.741b2b784256b353.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/363.3c483319babd76f2.js

This file was deleted.

Loading

0 comments on commit 55c3da9

Please sign in to comment.