Skip to content

Commit

Permalink
chore: run nx migration to the latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
mainawycliffe committed Jan 12, 2024
1 parent ea11919 commit 1be731b
Show file tree
Hide file tree
Showing 10 changed files with 2,191 additions and 2,519 deletions.
23 changes: 5 additions & 18 deletions apps/test-angular-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,29 @@
"executor": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "test-angular-app:build:production"
"buildTarget": "test-angular-app:build:production"
},
"development": {
"browserTarget": "test-angular-app:build:development"
"buildTarget": "test-angular-app:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "test-angular-app:build"
"buildTarget": "test-angular-app:build"
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"apps/test-angular-app/**/*.ts",
"apps/test-angular-app/**/*.html"
]
}
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/test-angular-app/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "apps/test-angular-app/jest.config.ts"
}
}
},
Expand Down
14 changes: 2 additions & 12 deletions apps/test-react-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,13 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/test-react-app/**/*.{ts,tsx,js,jsx}"]
}
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/test-react-app/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "apps/test-react-app/jest.config.ts"
}
}
},
Expand Down
115 changes: 110 additions & 5 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,117 @@
{
"migrations": [
{
"version": "17.1.0-beta.1",
"description": "Updates for @typescript-utils/utils v6.9.1+",
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
"package": "@nx/eslint",
"name": "update-typescript-eslint"
},
{
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/eslint",
"name": "simplify-eslint-patterns"
},
{
"version": "17.1.0-beta.2",
"description": "Move jest executor options to nx.json targetDefaults",
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
"package": "@nx/jest",
"name": "move-options-to-target-defaults"
},
{
"cli": "nx",
"version": "17.2.1-beta.0",
"description": "Add webpack.config.js file when webpackConfig is not defined",
"implementation": "./src/migrations/update-17-2-1/webpack-config-setup",
"package": "@nx/webpack",
"name": "update-17-2-1-webpack-config-setup"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Update the @angular/cli package version to ~17.0.0.",
"factory": "./src/migrations/update-17-1-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-17-0-0"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Rename 'browserTarget' to 'buildTarget'.",
"factory": "./src/migrations/update-17-1-0/browser-target-to-build-target",
"package": "@nx/angular",
"name": "rename-browser-target-to-build-target"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nx/js",
"name": "update-17-0-0-remove-deprecated-build-options"
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Replace usages of '@nguniversal/builders' with '@angular-devkit/build-angular'.",
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-builders",
"package": "@nx/angular",
"name": "replace-nguniversal-builders"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines",
"package": "@nx/angular",
"name": "replace-nguniversal-engines"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Replace the deep imports from 'zone.js/dist/zone' and 'zone.js/dist/zone-testing' with 'zone.js' and 'zone.js/testing'.",
"factory": "./src/migrations/update-17-1-0/update-zone-js-deep-import",
"package": "@nx/angular",
"name": "update-zone-js-deep-import"
},
{
"cli": "nx",
"version": "17.2.0-beta.2",
"description": "Rename '@nx/angular:webpack-dev-server' executor to '@nx/angular:dev-server'",
"factory": "./src/migrations/update-17-2-0/rename-webpack-dev-server",
"package": "@nx/angular",
"name": "rename-webpack-dev-server-executor"
},
{
"version": "17.0.0",
"description": "Angular v17 introduces a new control flow syntax that uses the @ and } characters. This migration replaces the existing usages with their corresponding HTML entities.",
"factory": "./migrations/block-template-entities/bundle",
"package": "@angular/core",
"name": "block-template-entities"
},
{
"version": "17.0.0",
"description": "CompilerOption.useJit and CompilerOption.missingTranslation are unused under Ivy. This migration removes their usage",
"factory": "./migrations/compiler-options/bundle",
"package": "@angular/core",
"name": "migration-v17-compiler-options"
},
{
"version": "17.0.0",
"description": "Updates `TransferState`, `makeStateKey`, `StateKey` imports from `@angular/platform-browser` to `@angular/core`.",
"factory": "./migrations/transfer-state/bundle",
"package": "@angular/core",
"name": "migration-transfer-state"
}
]
}
17 changes: 11 additions & 6 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
},
"test": {
"@nx/jest:jest": {
"cache": true,
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true
},
"e2e": {
"inputs": ["default", "^production"],
"cache": true
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
}
},
"namedInputs": {
Expand Down
75 changes: 37 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,51 @@
},
"private": true,
"dependencies": {
"@angular/animations": "16.2.10",
"@angular/common": "16.2.10",
"@angular/compiler": "16.2.10",
"@angular/core": "16.2.10",
"@angular/forms": "16.2.10",
"@angular/platform-browser": "16.2.10",
"@angular/platform-browser-dynamic": "16.2.10",
"@angular/router": "16.2.10",
"@angular/animations": "17.0.9",
"@angular/common": "17.0.9",
"@angular/compiler": "17.0.9",
"@angular/core": "17.0.9",
"@angular/forms": "17.0.9",
"@angular/platform-browser": "17.0.9",
"@angular/platform-browser-dynamic": "17.0.9",
"@angular/router": "17.0.9",
"@jscutlery/semver": "^2.29.3",
"@nx/angular": "17.0.3",
"@nx/plugin": "17.0.3",
"@nx/angular": "17.2.8",
"@nx/plugin": "17.2.8",
"@phenomnomnominal/tsquery": "^5.0.1",
"@swc/helpers": "0.5.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "0.13.0"
"zone.js": "0.14.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.2.7",
"@angular-devkit/core": "16.2.7",
"@angular-devkit/schematics": "16.2.7",
"@angular-eslint/eslint-plugin": "16.0.1",
"@angular-eslint/eslint-plugin-template": "16.0.1",
"@angular-eslint/template-parser": "16.0.1",
"@angular/cli": "~16.2.0",
"@angular/compiler-cli": "16.2.10",
"@angular/language-service": "16.2.10",
"@angular-devkit/build-angular": "17.0.10",
"@angular-devkit/core": "17.0.10",
"@angular-devkit/schematics": "17.0.10",
"@angular-eslint/eslint-plugin": "17.0.1",
"@angular-eslint/eslint-plugin-template": "17.0.1",
"@angular-eslint/template-parser": "17.0.1",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "17.0.9",
"@angular/language-service": "17.0.9",
"@babel/core": "^7.14.5",
"@babel/preset-react": "^7.14.5",
"@commitlint/cli": "^17.0.0",
"@commitlint/config-angular": "^17.0.0",
"@commitlint/config-conventional": "^17.0.0",
"@nx/cypress": "17.0.3",
"@nx/devkit": "17.0.3",
"@nx/eslint": "17.0.3",
"@nx/eslint-plugin": "17.0.3",
"@nx/jest": "17.0.3",
"@nx/js": "17.0.3",
"@nx/react": "17.0.3",
"@nx/webpack": "17.0.3",
"@nx/workspace": "17.0.3",
"@nx/cypress": "17.2.8",
"@nx/devkit": "17.2.8",
"@nx/eslint": "17.2.8",
"@nx/eslint-plugin": "17.2.8",
"@nx/jest": "17.2.8",
"@nx/js": "17.2.8",
"@nx/react": "17.2.8",
"@nx/webpack": "17.2.8",
"@nx/workspace": "17.2.8",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@schematics/angular": "16.2.7",
"@schematics/angular": "17.0.10",
"@svgr/webpack": "8.0.1",
"@swc-node/register": "1.6.8",
"@swc/cli": "0.1.62",
Expand All @@ -60,15 +60,15 @@
"@testing-library/jest-dom": "latest",
"@testing-library/react": "13.4.0",
"@types/jest": "29.4.0",
"@types/node": "18.11.9",
"@types/node": "18.16.9",
"@types/react": "18.2.24",
"@types/react-dom": "18.2.9",
"@types/testing-library__jest-dom": "latest",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@typescript-eslint/eslint-plugin": "6.18.1",
"@typescript-eslint/parser": "6.18.1",
"babel-jest": "29.4.3",
"cypress": "^13.0.0",
"eslint": "8.46.0",
"eslint": "8.48.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-import": "2.26.0",
Expand All @@ -78,15 +78,14 @@
"husky": "^8.0.0",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"jest-preset-angular": "13.1.1",
"jest-preset-angular": "13.1.6",
"jsonc-eslint-parser": "^2.1.0",
"nx": "17.0.3",
"nx": "17.2.8",
"prettier": "^2.6.2",
"react-refresh": "^0.10.0",
"ts-jest": "29.1.0",
"ts-node": "10.9.1",
"typescript": "5.1.6",
"typescript": "5.2.2",
"url-loader": "^4.1.1"
}
}

3 changes: 2 additions & 1 deletion packages/firebase-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "packages/firebase-e2e/jest.config.ts",
"runInBand": true
"runInBand": true,
"passWithNoTests": false
},
"dependsOn": ["firebase:build"]
}
Expand Down
13 changes: 2 additions & 11 deletions packages/firebase/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,13 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"packages/firebase/**/*.ts",
"packages/firebase/generators.json",
"packages/firebase/executors.json",
"packages/firebase/package.json"
]
}
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "packages/firebase/jest.config.ts",
"passWithNoTests": true
"jestConfig": "packages/firebase/jest.config.ts"
}
},
"version": {
Expand Down
3 changes: 2 additions & 1 deletion packages/testing-library-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "packages/testing-library-e2e/jest.config.ts",
"runInBand": true
"runInBand": true,
"passWithNoTests": false
},
"dependsOn": ["testing-library:build"]
}
Expand Down
Loading

0 comments on commit 1be731b

Please sign in to comment.