Skip to content

Commit

Permalink
refactor: update to latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Jefiozie committed Dec 20, 2024
1 parent 20b4565 commit 15b5bc4
Show file tree
Hide file tree
Showing 17 changed files with 16,973 additions and 12,256 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/ngx-aws-deploy-s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x, 22.x]

env:
NX_BRANCH: ${{ github.event.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ngx-aws-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x, 22.x]

env:
NX_BRANCH: ${{ github.event.number }}
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ testem.log
.DS_Store
Thumbs.db

migrations.json
migrations.json
.nx
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@

/dist
/coverage

/.nx/cache
/.nx/workspace-data
11 changes: 4 additions & 7 deletions apps/demo-app-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/demo-app-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["demo-app"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -18,12 +20,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo-app-e2e/**/*.{js,ts}"]
}
"executor": "@nx/eslint:lint"
}
},
"tags": [],
"implicitDependencies": ["demo-app"]
}
}
6 changes: 6 additions & 0 deletions apps/demo-app/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
{
"files": ["*.js", "*.jsx"],
"rules": {}
},
{
"files": ["*.ts"],
"rules": {
"@angular-eslint/prefer-standalone": "off"
}
}
]
}
22 changes: 9 additions & 13 deletions apps/demo-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
"name": "demo-app",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/demo-app/src",
"prefix": "ngx-aws-deploy",
"tags": [],
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/demo-app/src",
"prefix": "ngx-aws-deploy",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -62,31 +63,27 @@
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "demo-app:build"
"buildTarget": "demo-app:build"
},
"configurations": {
"production": {
"browserTarget": "demo-app:build:production"
"buildTarget": "demo-app:build:production"
}
}
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "demo-app:build"
"buildTarget": "demo-app:build"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo-app/src/**/*.ts"]
}
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "apps/demo-app/jest.config.ts",
"passWithNoTests": true
"jestConfig": "apps/demo-app/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/apps/demo-app"]
},
Expand All @@ -100,6 +97,5 @@
}
}
}
},
"tags": []
}
}
4 changes: 2 additions & 2 deletions apps/demo-app/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ <h2>Next Steps</h2>
<summary>Add UI library</summary>
<pre>
# Generate UI lib
ng g @nx/angular:lib ui
ng g &#64;nx/angular:lib ui

# Add a component
ng g @nx/angular:component xyz --project ui</pre
ng g &#64;nx/angular:component xyz --project ui</pre
>
</details>
<details>
Expand Down
7 changes: 4 additions & 3 deletions apps/demo-app/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Component } from '@angular/core';

@Component({
selector: 'ngx-aws-deploy-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
selector: 'ngx-aws-deploy-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
standalone: false
})
export class AppComponent {
title = 'demo-app';
Expand Down
4 changes: 2 additions & 2 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nx/jest');
const { getJestProjectsAsync } = require('@nx/jest');

export default { projects: getJestProjects() };
export default async () => ({ projects: await getJestProjectsAsync() });
6 changes: 3 additions & 3 deletions libs/ngx-aws-deploy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"author": "Jeffrey Bosch",
"license": "MIT",
"dependencies": {
"@angular-devkit/architect": ">=0.1402.6",
"@angular-devkit/core": ">=14.2.6",
"@angular-devkit/schematics": ">=14.2.6",
"@angular-devkit/architect": ">=0.0.1800.0",
"@angular-devkit/core": ">=18.0.0",
"@angular-devkit/schematics": ">=18.0.0",
"aws-sdk": "^2.1238.0",
"glob": "^10.3.3",
"mime-types": "^2.1.35"
Expand Down
15 changes: 5 additions & 10 deletions libs/ngx-aws-deploy/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/ngx-aws-deploy/src",
"projectType": "library",
"tags": [],
"generators": {},
"targets": {
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["libs/ngx-aws-deploy/**/*.ts"]
}
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "libs/ngx-aws-deploy/jest.config.ts",
"passWithNoTests": true
"jestConfig": "libs/ngx-aws-deploy/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/libs/ngx-aws-deploy"]
},
Expand Down Expand Up @@ -48,11 +45,9 @@
"glob": "src/lib/**/**/*.d.ts",
"output": "."
}
],
"updateBuildableProjectDepsInPackageJson": true
]
},
"outputs": ["{options.outputPath}"]
}
},
"tags": []
}
}
Loading

0 comments on commit 15b5bc4

Please sign in to comment.