From 698052230b70ec00f048bbe267f74b712ec179fd Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Thu, 9 Jun 2022 21:51:03 -0500 Subject: [PATCH] chore: nx migrate latest --- apps/automated/project.json | 2 +- apps/toolbox/project.json | 2 +- apps/ui/project.json | 2 +- jest.config.js => jest.config.ts | 2 +- jest.preset.js | 2 +- nx.json | 16 +++++-- package.json | 47 +++++++++---------- .../core/{jest.config.js => jest.config.ts} | 3 +- packages/core/project.json | 4 +- packages/core/tsconfig.json | 2 +- packages/types-android/project.json | 36 ++++++++------ packages/types-ios/project.json | 36 ++++++++------ packages/types-minimal/project.json | 36 ++++++++------ packages/types/project.json | 2 +- packages/ui-mobile-base/project.json | 31 ++++++------ packages/webpack/project.json | 2 +- packages/webpack5/project.json | 2 +- tools/scripts/project.json | 2 +- workspace.json | 3 +- 19 files changed, 134 insertions(+), 98 deletions(-) rename jest.config.js => jest.config.ts (50%) rename packages/core/{jest.config.js => jest.config.ts} (60%) diff --git a/apps/automated/project.json b/apps/automated/project.json index 485232a5b..514cc7d26 100644 --- a/apps/automated/project.json +++ b/apps/automated/project.json @@ -1,5 +1,5 @@ { - "root": "apps/automated/", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/automated/app", "projectType": "application", "prefix": "nativescript", diff --git a/apps/toolbox/project.json b/apps/toolbox/project.json index 8ace20a83..cc7c1e29e 100644 --- a/apps/toolbox/project.json +++ b/apps/toolbox/project.json @@ -1,5 +1,5 @@ { - "root": "apps/toolbox/", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/toolbox/src", "projectType": "application", "prefix": "nativescript", diff --git a/apps/ui/project.json b/apps/ui/project.json index 217179afe..1c69b84d3 100644 --- a/apps/ui/project.json +++ b/apps/ui/project.json @@ -1,5 +1,5 @@ { - "root": "apps/ui/", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/ui/src", "projectType": "application", "prefix": "nativescript", diff --git a/jest.config.js b/jest.config.ts similarity index 50% rename from jest.config.js rename to jest.config.ts index d08e9812c..1dcd5a03f 100644 --- a/jest.config.js +++ b/jest.config.ts @@ -1,3 +1,3 @@ const { getJestProjects } = require('@nrwl/jest'); -module.exports = { projects: getJestProjects() }; +export default { projects: getJestProjects() }; diff --git a/jest.preset.js b/jest.preset.js index 0ab15bec5..63bd8f3e4 100644 --- a/jest.preset.js +++ b/jest.preset.js @@ -1,4 +1,4 @@ -const nxPreset = require('@nrwl/jest/preset'); +const nxPreset = require('@nrwl/jest/preset').default; module.exports = { ...nxPreset, testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'], diff --git a/nx.json b/nx.json index 2dbd55d3c..fd44f6a26 100644 --- a/nx.json +++ b/nx.json @@ -11,8 +11,17 @@ "nx.json": "*", ".eslintrc.json": "*" }, - "cli": { - "defaultCollection": "@nrwl/workspace" + "tasksRunnerOptions": { + "default": { + "runner": "nx/tasks-runners/default", + "options": { + "useDaemonProcess": false, + "cacheableOperations": ["build", "lint", "test", "e2e"], + "canTrackAnalytics": false, + "showUsageWarnings": true, + "parallel": 1 + } + } }, "generators": { "@nrwl/workspace": { @@ -72,5 +81,6 @@ }, "affected": { "defaultBase": "master" - } + }, + "$schema": "./node_modules/nx/schemas/nx-schema.json" } diff --git a/package.json b/package.json index 830efdbc0..7938f5956 100644 --- a/package.json +++ b/package.json @@ -22,22 +22,21 @@ "devDependencies": { "@nativescript/eslint-plugin": "~0.0.4", "@nativescript/hook": "^2.0.0", - "@nativescript/nx": "~2.0.8", - "@nrwl/cli": "13.4.1", - "@nrwl/eslint-plugin-nx": "13.4.1", - "@nrwl/jest": "13.4.1", - "@nrwl/node": "13.4.1", - "@nrwl/tao": "13.4.1", - "@nrwl/workspace": "13.4.1", - "@nstudio/focus": "^13.4.1", + "@nativescript/nx": "~3.0.18", + "@nrwl/cli": "14.2.4", + "@nrwl/eslint-plugin-nx": "14.2.4", + "@nrwl/jest": "14.2.4", + "@nrwl/node": "14.2.4", + "@nrwl/workspace": "14.2.4", + "@nstudio/focus": "^14.0.1", "@nstudio/nps-i": "~2.0.0", - "@prettier/plugin-xml": "^0.13.1", + "@prettier/plugin-xml": "^2.2.0", "@types/chai": "^4.2.11", - "@types/jest": "27.0.2", + "@types/jest": "27.4.1", "@types/mocha": "^7.0.2", - "@types/node": "14.14.33", - "@typescript-eslint/eslint-plugin": "4.19.0", - "@typescript-eslint/parser": "4.19.0", + "@types/node": "17.0.41", + "@typescript-eslint/eslint-plugin": "~5.24.0", + "@typescript-eslint/parser": "~5.24.0", "chai": "^4.2.0", "conventional-changelog-cli": "^2.1.1", "copyfiles": "^2.4.0", @@ -48,31 +47,32 @@ "eslint-config-prettier": "8.1.0", "eslint-plugin-prettier": "^3.3.1", "gonzales": "^1.0.7", - "husky": "^5.1.3", - "jest": "27.2.3", - "lint-staged": "^10.5.0", + "husky": "^8.0.1", + "jest": "27.5.1", + "lint-staged": "^13.0.1", "mocha": "^8.0.1", "mocha-typescript": "^1.1.17", "module-alias": "^2.2.2", - "nativescript": "~8.1.5", + "nativescript": "~8.2.0", "nativescript-typedoc-theme": "1.1.0", "parse-css": "git+https://github.com/tabatkins/parse-css.git", "parserlib": "^1.1.1", - "prettier": "2.5.1", + "prettier": "2.6.2", "reduce-css-calc": "~2.1.7", "sass": "^1.45.2", "shady-css-parser": "^0.1.0", "terser-webpack-plugin": "~3.0.6", "tree-kill": "^1.2.2", - "ts-jest": "27.0.5", - "ts-node": "9.1.1", + "ts-jest": "27.1.4", + "ts-node": "10.8.1", "ts-patch": "^1.3.0", "tslint": "6.1.3", - "typedoc": "^0.20.14", - "typescript": "4.5.4", + "typedoc": "^0.22.17", + "typescript": "4.7.3", "webpack": "~4.44.1", "webpack-cli": "~3.3.12", - "zx": "^4.2.0" + "zx": "^4.2.0", + "nx": "14.2.4" }, "lint-staged": { "**/*": [ @@ -80,4 +80,3 @@ ] } } - diff --git a/packages/core/jest.config.js b/packages/core/jest.config.ts similarity index 60% rename from packages/core/jest.config.js rename to packages/core/jest.config.ts index a831fe51b..41ed50eb0 100644 --- a/packages/core/jest.config.js +++ b/packages/core/jest.config.ts @@ -1,4 +1,5 @@ -module.exports = { +/* eslint-disable */ +export default { preset: '../../jest.preset.js', displayName: 'core', }; diff --git a/packages/core/project.json b/packages/core/project.json index 06a72f824..47f237b6d 100644 --- a/packages/core/project.json +++ b/packages/core/project.json @@ -1,5 +1,5 @@ { - "root": "packages/core", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/core", "projectType": "library", "generators": {}, @@ -13,7 +13,7 @@ "test": { "executor": "@nrwl/jest:jest", "options": { - "jestConfig": "packages/core/jest.config.js", + "jestConfig": "packages/core/jest.config.ts", "passWithNoTests": true }, "outputs": ["coverage/packages/core"] diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index d1689fde9..2f7cc35e4 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -4,5 +4,5 @@ "baseUrl": "." }, "include": ["**/*.ts", "./references.d.ts"], - "exclude": ["dist", "__tests__"] + "exclude": ["dist", "__tests__", "jest.config.ts"] } diff --git a/packages/types-android/project.json b/packages/types-android/project.json index d7a1a62bc..fce4dd0ad 100644 --- a/packages/types-android/project.json +++ b/packages/types-android/project.json @@ -1,17 +1,23 @@ { - "root": "packages/types-android", - "sourceRoot": "packages/types-android/src", - "projectType": "library", - "generators": {}, - "targets": { - "build": { - "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/packages"], - "options": { - "commands": ["mkdir -p ../../dist/packages/types-android", "cp -R src/* ../../dist/packages/types-android", "cp package.json *.md ../../dist/packages/types-android"], - "cwd": "packages/types-android", - "parallel": false - } - } - } + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/types-android/src", + "projectType": "library", + "generators": {}, + "targets": { + "build": { + "executor": "@nrwl/workspace:run-commands", + "outputs": [ + "dist/packages" + ], + "options": { + "commands": [ + "mkdir -p ../../dist/packages/types-android", + "cp -R src/* ../../dist/packages/types-android", + "cp package.json *.md ../../dist/packages/types-android" + ], + "cwd": "packages/types-android", + "parallel": false + } + } + } } diff --git a/packages/types-ios/project.json b/packages/types-ios/project.json index 6ba53b059..4804cb274 100644 --- a/packages/types-ios/project.json +++ b/packages/types-ios/project.json @@ -1,16 +1,24 @@ { - "root": "packages/types-ios", - "sourceRoot": "packages/types-ios/src", - "projectType": "library", - "generators": {}, - "targets": { - "build": { - "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/packages"], - "options": { - "commands": ["./tools/scripts/typings-gen.sh latest", "mkdir -p dist/packages/types-ios", "cp -R packages/types-ios/src/* dist/packages/types-ios", "cp packages/types-ios/package.json dist/packages/types-ios", "cp packages/types-ios/README.md dist/packages/types-ios/README.md"], - "parallel": false - } - } - } + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/types-ios/src", + "projectType": "library", + "generators": {}, + "targets": { + "build": { + "executor": "@nrwl/workspace:run-commands", + "outputs": [ + "dist/packages" + ], + "options": { + "commands": [ + "./tools/scripts/typings-gen.sh latest", + "mkdir -p dist/packages/types-ios", + "cp -R packages/types-ios/src/* dist/packages/types-ios", + "cp packages/types-ios/package.json dist/packages/types-ios", + "cp packages/types-ios/README.md dist/packages/types-ios/README.md" + ], + "parallel": false + } + } + } } diff --git a/packages/types-minimal/project.json b/packages/types-minimal/project.json index 5a7021e99..656bf9099 100644 --- a/packages/types-minimal/project.json +++ b/packages/types-minimal/project.json @@ -1,16 +1,24 @@ { - "root": "packages/types-minimal", - "sourceRoot": "packages/types-minimal/src", - "projectType": "library", - "generators": {}, - "targets": { - "build": { - "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/packages"], - "options": { - "commands": ["./tools/scripts/typings-minimal-copy.sh", "mkdir -p dist/packages/types-minimal", "cp -R packages/types-minimal/src/* dist/packages/types-minimal", "cp packages/types-minimal/package.json dist/packages/types-minimal", "cp packages/types-minimal/README.md dist/packages/types-minimal/README.md"], - "parallel": false - } - } - } + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/types-minimal/src", + "projectType": "library", + "generators": {}, + "targets": { + "build": { + "executor": "@nrwl/workspace:run-commands", + "outputs": [ + "dist/packages" + ], + "options": { + "commands": [ + "./tools/scripts/typings-minimal-copy.sh", + "mkdir -p dist/packages/types-minimal", + "cp -R packages/types-minimal/src/* dist/packages/types-minimal", + "cp packages/types-minimal/package.json dist/packages/types-minimal", + "cp packages/types-minimal/README.md dist/packages/types-minimal/README.md" + ], + "parallel": false + } + } + } } diff --git a/packages/types/project.json b/packages/types/project.json index 3616cfddc..59a260e02 100644 --- a/packages/types/project.json +++ b/packages/types/project.json @@ -1,5 +1,5 @@ { - "root": "packages/types", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/types", "projectType": "library", "generators": {}, diff --git a/packages/ui-mobile-base/project.json b/packages/ui-mobile-base/project.json index 46f6fd7b6..db69e70f7 100644 --- a/packages/ui-mobile-base/project.json +++ b/packages/ui-mobile-base/project.json @@ -1,16 +1,19 @@ { - "root": "packages/ui-mobile-base", - "sourceRoot": "packages/ui-mobile-base", - "projectType": "library", - "generators": {}, - "targets": { - "build": { - "executor": "@nrwl/workspace:run-commands", - "options": { - "commands": ["./build.sh", "cp -R dist/package/platforms/* ../../packages/core/platforms"], - "cwd": "packages/ui-mobile-base", - "parallel": false - } - } - } + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/ui-mobile-base", + "projectType": "library", + "generators": {}, + "targets": { + "build": { + "executor": "@nrwl/workspace:run-commands", + "options": { + "commands": [ + "./build.sh", + "cp -R dist/package/platforms/* ../../packages/core/platforms" + ], + "cwd": "packages/ui-mobile-base", + "parallel": false + } + } + } } diff --git a/packages/webpack/project.json b/packages/webpack/project.json index 3d87956c2..7b8ca6b51 100644 --- a/packages/webpack/project.json +++ b/packages/webpack/project.json @@ -1,5 +1,5 @@ { - "root": "packages/webpack", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/webpack", "projectType": "library", "generators": {}, diff --git a/packages/webpack5/project.json b/packages/webpack5/project.json index b83ad29cd..11abcb5e9 100644 --- a/packages/webpack5/project.json +++ b/packages/webpack5/project.json @@ -1,5 +1,5 @@ { - "root": "packages/webpack5", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/webpack5", "projectType": "library", "generators": {}, diff --git a/tools/scripts/project.json b/tools/scripts/project.json index a5aa21ebd..c964b731a 100644 --- a/tools/scripts/project.json +++ b/tools/scripts/project.json @@ -1,5 +1,5 @@ { - "root": "tools/scripts", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "tools/scripts", "projectType": "library", "generators": {}, diff --git a/workspace.json b/workspace.json index 750bd951f..0d93a2399 100644 --- a/workspace.json +++ b/workspace.json @@ -13,5 +13,6 @@ "ui-mobile-base": "packages/ui-mobile-base", "webpack": "packages/webpack", "webpack5": "packages/webpack5" - } + }, + "$schema": "./node_modules/nx/schemas/workspace-schema.json" }