Skip to content

Commit eab726b

Browse files
NathanWalkerNathanWalker
authored
chore: TypeScript 5.8, nx migrate, dep updates (NativeScript#10759)
1 parent 32f2dd1 commit eab726b

File tree

20 files changed

+2959
-1622
lines changed

20 files changed

+2959
-1622
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,6 @@ ios-typings-prj
5959
.nx/cache
6060
.nx/workspace-data
6161
vite.config.*.timestamp*
62-
vitest.config.*.timestamp*
62+
vitest.config.*.timestamp*
63+
.cursor/rules/nx-rules.mdc
64+
.github/instructions/nx.instructions.md

‎apps/automated/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
1212
},
1313
"devDependencies": {
14-
"@nativescript/android": "~8.8.0",
15-
"@nativescript/ios": "~8.8.0",
16-
"@nativescript/visionos": "~8.8.0",
14+
"@nativescript/android": "~8.9.0",
15+
"@nativescript/ios": "~8.9.0",
16+
"@nativescript/visionos": "~8.9.0",
1717
"@nativescript/webpack": "file:../../dist/packages/webpack5",
1818
"circular-dependency-plugin": "^5.2.2",
19-
"typescript": "~5.6.0"
19+
"typescript": "~5.8.0"
2020
},
2121
"gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3",
2222
"readme": "NativeScript Application"

‎apps/toolbox/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
1313
},
1414
"devDependencies": {
15-
"@nativescript/android": "~8.8.0",
16-
"@nativescript/ios": "~8.8.0",
17-
"@nativescript/visionos": "~8.8.0",
15+
"@nativescript/android": "~8.9.0",
16+
"@nativescript/ios": "~8.9.0",
17+
"@nativescript/visionos": "~8.9.0",
1818
"@nativescript/webpack": "file:../../dist/packages/webpack5",
19-
"typescript": "~5.6.0"
19+
"typescript": "~5.8.0"
2020
}
2121
}

‎apps/ui/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
1212
},
1313
"devDependencies": {
14-
"@nativescript/android": "~8.8.0",
15-
"@nativescript/ios": "~8.8.0",
16-
"@nativescript/visionos": "~8.8.0",
14+
"@nativescript/android": "~8.9.0",
15+
"@nativescript/ios": "~8.9.0",
16+
"@nativescript/visionos": "~8.9.0",
1717
"@nativescript/webpack": "file:../../dist/packages/webpack5",
18-
"typescript": "~5.6.0"
18+
"typescript": "~5.8.0"
1919
},
2020
"gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4",
2121
"readme": "NativeScript Application",

‎migrations.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{
22
"migrations": [
3-
{ "version": "20.0.0-beta.7", "description": "Migration for v20.0.0-beta.7", "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process", "package": "nx", "name": "move-use-daemon-process" },
4-
{ "version": "20.0.1", "description": "Set `useLegacyCache` to true for migrating workspaces", "implementation": "./src/migrations/update-20-0-1/use-legacy-cache", "x-repair-skip": true, "package": "nx", "name": "use-legacy-cache" },
5-
{ "cli": "nx", "version": "20.0.0-beta.5", "description": "replace getJestProjects with getJestProjectsAsync", "implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync", "package": "@nx/jest", "name": "replace-getJestProjects-with-getJestProjectsAsync" }
3+
{ "version": "21.0.0-beta.8", "description": "Removes the legacy cache configuration from nx.json", "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", "package": "nx", "name": "remove-legacy-cache" },
4+
{ "version": "21.0.0-beta.8", "description": "Removes the legacy cache configuration from nx.json", "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", "package": "nx", "name": "remove-custom-tasks-runner" },
5+
{ "version": "21.0.0-beta.11", "description": "Updates release version config based on the breaking changes in Nx v21", "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", "package": "nx", "name": "release-version-config-changes" },
6+
{ "version": "21.0.0-beta.11", "description": "Updates release changelog config based on the breaking changes in Nx v21", "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", "package": "nx", "name": "release-changelog-config-changes" },
7+
{ "version": "21.1.0-beta.2", "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", "package": "nx", "name": "21-1-0-add-ignore-entries-for-nx-rule-files" },
8+
{ "version": "20.5.0-beta.2", "description": "Install jiti as a devDependency to allow vite to parse TS postcss files.", "implementation": "./src/migrations/update-20-5-0/install-jiti", "package": "@nx/vite", "name": "update-20-5-0-install-jiti" },
9+
{ "version": "20.5.0-beta.3", "description": "Update resolve.conditions to include defaults that are no longer provided by Vite.", "implementation": "./src/migrations/update-20-5-0/update-resolve-conditions", "package": "@nx/vite", "name": "update-20-5-0-update-resolve-conditions" },
10+
{ "version": "20.5.0-beta.3", "description": "Add vite config temporary files to the ESLint configuration ignore patterns if ESLint is used.", "implementation": "./src/migrations/update-20-5-0/eslint-ignore-vite-temp-files", "package": "@nx/vite", "name": "eslint-ignore-vite-temp-files" },
11+
{ "cli": "nx", "version": "21.0.0-beta.9", "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.", "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync", "package": "@nx/jest", "name": "replace-getJestProjects-with-getJestProjectsAsync-v21" },
12+
{ "version": "21.0.0-beta.10", "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.", "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor", "package": "@nx/jest", "name": "remove-tsconfig-option-from-jest-executor" }
613
]
714
}

‎nx.json‎

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,37 +69,17 @@
6969
},
7070
"$schema": "./node_modules/nx/schemas/nx-schema.json",
7171
"namedInputs": {
72-
"default": [
73-
"{projectRoot}/**/*",
74-
"sharedGlobals"
75-
],
76-
"sharedGlobals": [
77-
"{workspaceRoot}/workspace.json",
78-
"{workspaceRoot}/tsconfig.json",
79-
"{workspaceRoot}/nx.json"
80-
],
81-
"production": [
82-
"default",
83-
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
84-
"!{projectRoot}/tsconfig.spec.json",
85-
"!{projectRoot}/jest.config.[jt]s",
86-
"!{projectRoot}/src/test-setup.[jt]s"
87-
]
72+
"default": ["{projectRoot}/**/*", "sharedGlobals"],
73+
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.json", "{workspaceRoot}/nx.json"],
74+
"production": ["default", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s", "!{projectRoot}/src/test-setup.[jt]s"]
8875
},
8976
"targetDefaults": {
9077
"build": {
91-
"inputs": [
92-
"production",
93-
"^production"
94-
],
78+
"inputs": ["production", "^production"],
9579
"cache": true
9680
},
9781
"test": {
98-
"inputs": [
99-
"default",
100-
"^production",
101-
"{workspaceRoot}/jest.preset.js"
102-
],
82+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
10383
"cache": true
10484
},
10585
"lint": {
@@ -115,11 +95,7 @@
11595
"cache": true
11696
},
11797
"@nx/jest:jest": {
118-
"inputs": [
119-
"default",
120-
"^production",
121-
"{workspaceRoot}/jest.preset.js"
122-
],
98+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
12399
"cache": true,
124100
"options": {
125101
"passWithNoTests": true
@@ -133,25 +109,16 @@
133109
},
134110
"@nx/vite:test": {
135111
"cache": true,
136-
"inputs": [
137-
"default",
138-
"^production"
139-
]
112+
"inputs": ["default", "^production"]
140113
}
141114
},
142115
"useDaemonProcess": false,
143116
"parallel": 1,
144117
"useInferencePlugins": false,
145118
"defaultBase": "master",
146-
"useLegacyCache": true,
147119
"release": {
148120
"releaseTagPattern": "{version}-{projectName}",
149-
"projects": [
150-
"packages/*",
151-
"!packages/ui-mobile-base",
152-
"!packages/types-minimal",
153-
"!packages/winter-tc"
154-
],
121+
"projects": ["packages/*", "!packages/ui-mobile-base", "!packages/types-minimal", "!packages/winter-tc"],
155122
"projectsRelationship": "independent",
156123
"changelog": {
157124
"workspaceChangelog": false,
@@ -165,4 +132,4 @@
165132
}
166133
},
167134
"nxCloudId": "680a89d49c76d63ce41eb397"
168-
}
135+
}

0 commit comments

Comments
 (0)