chore: nx migrate latest

This commit is contained in:
Nathan Walker
2022-06-09 21:51:03 -05:00
parent f5e637d3d5
commit 698052230b
19 changed files with 134 additions and 98 deletions

View File

@ -1,5 +1,5 @@
{ {
"root": "apps/automated/", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/automated/app", "sourceRoot": "apps/automated/app",
"projectType": "application", "projectType": "application",
"prefix": "nativescript", "prefix": "nativescript",

View File

@ -1,5 +1,5 @@
{ {
"root": "apps/toolbox/", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/toolbox/src", "sourceRoot": "apps/toolbox/src",
"projectType": "application", "projectType": "application",
"prefix": "nativescript", "prefix": "nativescript",

View File

@ -1,5 +1,5 @@
{ {
"root": "apps/ui/", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ui/src", "sourceRoot": "apps/ui/src",
"projectType": "application", "projectType": "application",
"prefix": "nativescript", "prefix": "nativescript",

View File

@ -1,3 +1,3 @@
const { getJestProjects } = require('@nrwl/jest'); const { getJestProjects } = require('@nrwl/jest');
module.exports = { projects: getJestProjects() }; export default { projects: getJestProjects() };

View File

@ -1,4 +1,4 @@
const nxPreset = require('@nrwl/jest/preset'); const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { module.exports = {
...nxPreset, ...nxPreset,
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'], testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

16
nx.json
View File

@ -11,8 +11,17 @@
"nx.json": "*", "nx.json": "*",
".eslintrc.json": "*" ".eslintrc.json": "*"
}, },
"cli": { "tasksRunnerOptions": {
"defaultCollection": "@nrwl/workspace" "default": {
"runner": "nx/tasks-runners/default",
"options": {
"useDaemonProcess": false,
"cacheableOperations": ["build", "lint", "test", "e2e"],
"canTrackAnalytics": false,
"showUsageWarnings": true,
"parallel": 1
}
}
}, },
"generators": { "generators": {
"@nrwl/workspace": { "@nrwl/workspace": {
@ -72,5 +81,6 @@
}, },
"affected": { "affected": {
"defaultBase": "master" "defaultBase": "master"
} },
"$schema": "./node_modules/nx/schemas/nx-schema.json"
} }

View File

@ -22,22 +22,21 @@
"devDependencies": { "devDependencies": {
"@nativescript/eslint-plugin": "~0.0.4", "@nativescript/eslint-plugin": "~0.0.4",
"@nativescript/hook": "^2.0.0", "@nativescript/hook": "^2.0.0",
"@nativescript/nx": "~2.0.8", "@nativescript/nx": "~3.0.18",
"@nrwl/cli": "13.4.1", "@nrwl/cli": "14.2.4",
"@nrwl/eslint-plugin-nx": "13.4.1", "@nrwl/eslint-plugin-nx": "14.2.4",
"@nrwl/jest": "13.4.1", "@nrwl/jest": "14.2.4",
"@nrwl/node": "13.4.1", "@nrwl/node": "14.2.4",
"@nrwl/tao": "13.4.1", "@nrwl/workspace": "14.2.4",
"@nrwl/workspace": "13.4.1", "@nstudio/focus": "^14.0.1",
"@nstudio/focus": "^13.4.1",
"@nstudio/nps-i": "~2.0.0", "@nstudio/nps-i": "~2.0.0",
"@prettier/plugin-xml": "^0.13.1", "@prettier/plugin-xml": "^2.2.0",
"@types/chai": "^4.2.11", "@types/chai": "^4.2.11",
"@types/jest": "27.0.2", "@types/jest": "27.4.1",
"@types/mocha": "^7.0.2", "@types/mocha": "^7.0.2",
"@types/node": "14.14.33", "@types/node": "17.0.41",
"@typescript-eslint/eslint-plugin": "4.19.0", "@typescript-eslint/eslint-plugin": "~5.24.0",
"@typescript-eslint/parser": "4.19.0", "@typescript-eslint/parser": "~5.24.0",
"chai": "^4.2.0", "chai": "^4.2.0",
"conventional-changelog-cli": "^2.1.1", "conventional-changelog-cli": "^2.1.1",
"copyfiles": "^2.4.0", "copyfiles": "^2.4.0",
@ -48,31 +47,32 @@
"eslint-config-prettier": "8.1.0", "eslint-config-prettier": "8.1.0",
"eslint-plugin-prettier": "^3.3.1", "eslint-plugin-prettier": "^3.3.1",
"gonzales": "^1.0.7", "gonzales": "^1.0.7",
"husky": "^5.1.3", "husky": "^8.0.1",
"jest": "27.2.3", "jest": "27.5.1",
"lint-staged": "^10.5.0", "lint-staged": "^13.0.1",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"mocha-typescript": "^1.1.17", "mocha-typescript": "^1.1.17",
"module-alias": "^2.2.2", "module-alias": "^2.2.2",
"nativescript": "~8.1.5", "nativescript": "~8.2.0",
"nativescript-typedoc-theme": "1.1.0", "nativescript-typedoc-theme": "1.1.0",
"parse-css": "git+https://github.com/tabatkins/parse-css.git", "parse-css": "git+https://github.com/tabatkins/parse-css.git",
"parserlib": "^1.1.1", "parserlib": "^1.1.1",
"prettier": "2.5.1", "prettier": "2.6.2",
"reduce-css-calc": "~2.1.7", "reduce-css-calc": "~2.1.7",
"sass": "^1.45.2", "sass": "^1.45.2",
"shady-css-parser": "^0.1.0", "shady-css-parser": "^0.1.0",
"terser-webpack-plugin": "~3.0.6", "terser-webpack-plugin": "~3.0.6",
"tree-kill": "^1.2.2", "tree-kill": "^1.2.2",
"ts-jest": "27.0.5", "ts-jest": "27.1.4",
"ts-node": "9.1.1", "ts-node": "10.8.1",
"ts-patch": "^1.3.0", "ts-patch": "^1.3.0",
"tslint": "6.1.3", "tslint": "6.1.3",
"typedoc": "^0.20.14", "typedoc": "^0.22.17",
"typescript": "4.5.4", "typescript": "4.7.3",
"webpack": "~4.44.1", "webpack": "~4.44.1",
"webpack-cli": "~3.3.12", "webpack-cli": "~3.3.12",
"zx": "^4.2.0" "zx": "^4.2.0",
"nx": "14.2.4"
}, },
"lint-staged": { "lint-staged": {
"**/*": [ "**/*": [
@ -80,4 +80,3 @@
] ]
} }
} }

View File

@ -1,4 +1,5 @@
module.exports = { /* eslint-disable */
export default {
preset: '../../jest.preset.js', preset: '../../jest.preset.js',
displayName: 'core', displayName: 'core',
}; };

View File

@ -1,5 +1,5 @@
{ {
"root": "packages/core", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/core", "sourceRoot": "packages/core",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},
@ -13,7 +13,7 @@
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",
"options": { "options": {
"jestConfig": "packages/core/jest.config.js", "jestConfig": "packages/core/jest.config.ts",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/packages/core"] "outputs": ["coverage/packages/core"]

View File

@ -4,5 +4,5 @@
"baseUrl": "." "baseUrl": "."
}, },
"include": ["**/*.ts", "./references.d.ts"], "include": ["**/*.ts", "./references.d.ts"],
"exclude": ["dist", "__tests__"] "exclude": ["dist", "__tests__", "jest.config.ts"]
} }

View File

@ -1,14 +1,20 @@
{ {
"root": "packages/types-android", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/types-android/src", "sourceRoot": "packages/types-android/src",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},
"targets": { "targets": {
"build": { "build": {
"executor": "@nrwl/workspace:run-commands", "executor": "@nrwl/workspace:run-commands",
"outputs": ["dist/packages"], "outputs": [
"dist/packages"
],
"options": { "options": {
"commands": ["mkdir -p ../../dist/packages/types-android", "cp -R src/* ../../dist/packages/types-android", "cp package.json *.md ../../dist/packages/types-android"], "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", "cwd": "packages/types-android",
"parallel": false "parallel": false
} }

View File

@ -1,14 +1,22 @@
{ {
"root": "packages/types-ios", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/types-ios/src", "sourceRoot": "packages/types-ios/src",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},
"targets": { "targets": {
"build": { "build": {
"executor": "@nrwl/workspace:run-commands", "executor": "@nrwl/workspace:run-commands",
"outputs": ["dist/packages"], "outputs": [
"dist/packages"
],
"options": { "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"], "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 "parallel": false
} }
} }

View File

@ -1,14 +1,22 @@
{ {
"root": "packages/types-minimal", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/types-minimal/src", "sourceRoot": "packages/types-minimal/src",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},
"targets": { "targets": {
"build": { "build": {
"executor": "@nrwl/workspace:run-commands", "executor": "@nrwl/workspace:run-commands",
"outputs": ["dist/packages"], "outputs": [
"dist/packages"
],
"options": { "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"], "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 "parallel": false
} }
} }

View File

@ -1,5 +1,5 @@
{ {
"root": "packages/types", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/types", "sourceRoot": "packages/types",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},

View File

@ -1,5 +1,5 @@
{ {
"root": "packages/ui-mobile-base", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/ui-mobile-base", "sourceRoot": "packages/ui-mobile-base",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},
@ -7,7 +7,10 @@
"build": { "build": {
"executor": "@nrwl/workspace:run-commands", "executor": "@nrwl/workspace:run-commands",
"options": { "options": {
"commands": ["./build.sh", "cp -R dist/package/platforms/* ../../packages/core/platforms"], "commands": [
"./build.sh",
"cp -R dist/package/platforms/* ../../packages/core/platforms"
],
"cwd": "packages/ui-mobile-base", "cwd": "packages/ui-mobile-base",
"parallel": false "parallel": false
} }

View File

@ -1,5 +1,5 @@
{ {
"root": "packages/webpack", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/webpack", "sourceRoot": "packages/webpack",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},

View File

@ -1,5 +1,5 @@
{ {
"root": "packages/webpack5", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/webpack5", "sourceRoot": "packages/webpack5",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},

View File

@ -1,5 +1,5 @@
{ {
"root": "tools/scripts", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "tools/scripts", "sourceRoot": "tools/scripts",
"projectType": "library", "projectType": "library",
"generators": {}, "generators": {},

View File

@ -13,5 +13,6 @@
"ui-mobile-base": "packages/ui-mobile-base", "ui-mobile-base": "packages/ui-mobile-base",
"webpack": "packages/webpack", "webpack": "packages/webpack",
"webpack5": "packages/webpack5" "webpack5": "packages/webpack5"
} },
"$schema": "./node_modules/nx/schemas/workspace-schema.json"
} }