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

Upgrade: Angular 17 #116

Merged
merged 10 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"

# [Optional] Uncomment if you want to install more global node modules
RUN su node -c "npm install -g typescript @angular/cli@15 @angular-devkit/schematics-cli@15"
RUN su node -c "npm install -g typescript @angular/cli@17 @angular-devkit/schematics-cli@17"
16 changes: 15 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
"prefix": "app",
"style": "kebab-case"
}
],
"@typescript-eslint/consistent-type-imports": [
"error",
{
"fixStyle": "inline-type-imports",
"prefer": "type-imports"
}
]
}
},
Expand Down Expand Up @@ -76,7 +83,14 @@
{
"files": ["*.json"],
"extends": ["plugin:json/recommended", "plugin:prettier/recommended"],
"rules": { "json/*": ["error", { "allowComments": true }] }
"rules": {
"json/*": [
"error",
{
"allowComments": true
}
]
}
}
]
}
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "token-atm-spa:build:production"
"buildTarget": "token-atm-spa:build:production"
},
"development": {
"browserTarget": "token-atm-spa:build:development"
"buildTarget": "token-atm-spa:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "token-atm-spa:build"
"buildTarget": "token-atm-spa:build"
}
},
"test": {
Expand Down
95 changes: 52 additions & 43 deletions custom-schematics/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions custom-schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"license": "MIT",
"schematics": "./src/collection.json",
"dependencies": {
"@angular-devkit/core": "^15.2.11",
"@angular-devkit/schematics": "^15.2.11",
"typescript": "~4.9.3"
"@angular-devkit/core": "^17.3.8",
"@angular-devkit/schematics": "^17.3.8",
"typescript": "~5.4.5"
},
"devDependencies": {
"@types/node": "^14.15.0",
"@types/jasmine": "~4.3.0",
"jasmine": "^4.0.0"
"@types/node": "^14.15.0",
"jasmine": "^4.5.0"
}
}
12 changes: 11 additions & 1 deletion custom-schematics/src/token-option/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
import { normalize } from '@angular-devkit/core';
import { apply, chain, MergeStrategy, mergeWith, move, Rule, url, strings, template } from '@angular-devkit/schematics';
import {
apply,
chain,
MergeStrategy,
mergeWith,
move,
type Rule,
url,
strings,
template
} from '@angular-devkit/schematics';

interface GenerateTokenOptionOptions {
name: string;
Expand Down
Loading
Loading