Skip to content

Commit

Permalink
Merge pull request #71 from mmjmanders/v18
Browse files Browse the repository at this point in the history
Upgraded nx
  • Loading branch information
mmjmanders authored Oct 16, 2024
2 parents 5c3fb20 + 9783ef1 commit fa21752
Show file tree
Hide file tree
Showing 9 changed files with 4,710 additions and 2,702 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ testem.log
Thumbs.db

.nx/cache
.nx/workspace-data
.angular
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm exec lint-staged
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
/coverage
/.nx/cache
.angular

/.nx/workspace-data
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
2 changes: 1 addition & 1 deletion ngx-iban/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-iban",
"version": "18.0.1",
"version": "18.1.0",
"peerDependencies": {
"@angular/common": "^18.0.0",
"@angular/core": "^18.0.0",
Expand Down
4 changes: 2 additions & 2 deletions ngx-iban/src/lib/ngx-iban/iban.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ export const ibanValidator: (countryCode?: string) => ValidatorFn = (
return (control: AbstractControl): ValidationErrors | null => {
if (countryCode && control.value) {
return new RegExp(`^${countryCode}.*$`, 'i').test(control.value) &&
isValidIBAN(electronicFormatIBAN(control.value)!)
isValidIBAN(electronicFormatIBAN(control.value) as string)
? null
: { iban: { value: control.value } };
} else if (control.value) {
return isValidIBAN(electronicFormatIBAN(control.value)!)
return isValidIBAN(electronicFormatIBAN(control.value) as string)
? null
: { iban: { value: control.value } };
}
Expand Down
28 changes: 7 additions & 21 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,16 @@
"targetDefaults": {
"build": {
"cache": true,
"dependsOn": [
"^build"
],
"inputs": [
"production",
"^production"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"e2e": {
"cache": true,
"inputs": [
"default",
"^production"
]
"inputs": ["default", "^production"]
},
"@nx/jest:jest": {
"cache": true,
"inputs": [
"default",
"^production",
"{workspaceRoot}/jest.preset.js"
],
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"options": {
"passWithNoTests": true
},
Expand All @@ -46,10 +34,7 @@
}
},
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
Expand Down Expand Up @@ -77,5 +62,6 @@
"style": "scss"
}
},
"useInferencePlugins": false
"useInferencePlugins": false,
"useLegacyCache": true
}
89 changes: 45 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,78 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"prepare": "husky install",
"prepare": "husky",
"demo-app:start": "nx run demo-app:serve --ssl",
"demo-app:e2e": "nx run demo-app-e2e:e2e --ui"
},
"private": true,
"dependencies": {
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular/animations": "18.2.8",
"@angular/common": "18.2.8",
"@angular/compiler": "18.2.8",
"@angular/core": "18.2.8",
"@angular/forms": "18.2.8",
"@angular/platform-browser": "18.2.8",
"@angular/platform-browser-dynamic": "18.2.8",
"@angular/router": "18.2.8",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@nx/angular": "19.1.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@nx/angular": "20.0.1",
"bootstrap": "^5.3.3",
"highlight.js": "^11.9.0",
"i18n-iso-countries": "^7.11.2",
"highlight.js": "^11.10.0",
"i18n-iso-countries": "^7.12.0",
"ibantools": "^4.5.1",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"zone.js": "0.14.6"
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "18.0.1",
"@angular-devkit/core": "18.0.1",
"@angular-devkit/schematics": "18.0.1",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "^18.0.1",
"@angular/compiler-cli": "^18.0.0",
"@angular/language-service": "^18.0.0",
"@nx/devkit": "19.1.0",
"@nx/eslint": "19.1.0",
"@nx/eslint-plugin": "19.1.0",
"@nx/jest": "19.1.0",
"@nx/js": "19.1.0",
"@nx/playwright": "19.1.0",
"@nx/workspace": "19.1.0",
"@angular-devkit/build-angular": "18.2.8",
"@angular-devkit/core": "18.2.8",
"@angular-devkit/schematics": "18.2.8",
"@angular-eslint/eslint-plugin": "18.3.1",
"@angular-eslint/eslint-plugin-template": "18.3.1",
"@angular-eslint/template-parser": "18.3.1",
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "18.2.8",
"@angular/language-service": "18.2.8",
"@nx/devkit": "20.0.1",
"@nx/eslint": "20.0.1",
"@nx/eslint-plugin": "20.0.1",
"@nx/jest": "20.0.1",
"@nx/js": "20.0.1",
"@nx/playwright": "20.0.1",
"@nx/workspace": "20.0.1",
"@playwright/test": "^1.44.1",
"@schematics/angular": "18.0.1",
"@swc-node/register": "1.8.0",
"@swc/core": "~1.3.107",
"@types/jest": "^29.5.12",
"@schematics/angular": "18.2.8",
"@swc-node/register": "1.9.2",
"@swc/core": "1.5.7",
"@types/jest": "29.5.13",
"@types/node": "^20.12.12",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@typescript-eslint/utils": "^7.16.0",
"autoprefixer": "^10.4.19",
"eslint": "8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-playwright": "^0.15.3",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"husky": "^9.1.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "14.1.0",
"jsonc-eslint-parser": "^2.4.0",
"lint-staged": "^15.2.5",
"ng-packagr": "18.0.0",
"nx": "19.1.0",
"lint-staged": "^15.2.10",
"ng-packagr": "18.2.1",
"nx": "20.0.1",
"postcss": "^8.4.38",
"postcss-import": "~14.1.0",
"postcss-preset-env": "~7.5.0",
"postcss-url": "~10.1.3",
"prettier": "^2.8.8",
"ts-jest": "^29.1.3",
"ts-node": "10.9.1",
"typescript": "5.4.5"
"typescript": "5.5.4"
},
"engines": {
"node": "^18.13.0 || ^20.9.0",
Expand Down
Loading

0 comments on commit fa21752

Please sign in to comment.