Skip to content

Commit 10f1e81

Browse files
feat: upgrade to nx 19
1 parent 2a1838e commit 10f1e81

File tree

6 files changed

+266
-739
lines changed

6 files changed

+266
-739
lines changed

apps/website/src/routes/docs/headless/select/examples/validation.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
import { component$, useStyles$, $ } from '@builder.io/qwik';
22
import { LuCheck } from '@qwikest/icons/lucide';
33
import { Select } from '@qwik-ui/headless';
4-
import { useForm, required, InitialValues } from '@modular-forms/qwik';
5-
import { routeLoader$ } from '@builder.io/qwik-city';
4+
import { useForm, required } from '@modular-forms/qwik';
65

76
type Users = {
87
firstName: string;
98
};
109

11-
export const useSelectFormLoader = routeLoader$<InitialValues<Users>>(() => ({
12-
firstName: '',
13-
}));
14-
1510
export default component$(() => {
1611
const users = ['Tim', 'Ryan', 'Jim', 'Jessie', 'Abby'];
1712
const [, { Form, Field }] = useForm<Users>({
18-
loader: useSelectFormLoader(),
13+
loader: { value: { firstName: '' } },
1914
});
2015

2116
useStyles$(styles);

apps/website/src/routes/docs/headless/select/index.mdx

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ title: Qwik UI | Select
44

55
import { FeatureList } from '~/components/feature-list/feature-list';
66
import { statusByComponent } from '~/_state/component-statuses';
7-
import { useSelectFormLoader } from './examples/validation.tsx';
8-
export { useSelectFormLoader } from './examples/validation.tsx';
97

108
<StatusBanner status={statusByComponent.headless.Select} />
119

migrations.json

+5-66
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
{
22
"migrations": [
3-
{
4-
"cli": "nx",
5-
"version": "17.3.0-beta.6",
6-
"description": "Updates the nx wrapper.",
7-
"implementation": "./src/migrations/update-17-3-0/update-nxw",
8-
"package": "nx",
9-
"name": "17.3.0-update-nx-wrapper"
10-
},
11-
{
12-
"cli": "nx",
13-
"version": "18.0.0-beta.2",
14-
"description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
15-
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
16-
"x-repair-skip": true,
17-
"package": "nx",
18-
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
19-
},
203
{
214
"version": "18.1.0-beta.3",
225
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
@@ -26,33 +9,11 @@
269
},
2710
{
2811
"cli": "nx",
29-
"version": "17.2.6-beta.1",
30-
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
31-
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
32-
"package": "@nx/eslint-plugin",
33-
"name": "update-17-2-6-rename-workspace-rules"
34-
},
35-
{
36-
"version": "17.2.0-beta.10",
37-
"description": "Update vite config.",
38-
"implementation": "./src/migrations/update-17-2-0/update-vite-config",
39-
"package": "@nx/vite",
40-
"name": "update-vite-config"
41-
},
42-
{
43-
"version": "17.3.0-beta.0",
44-
"description": "Move the vitest coverage thresholds in their own object if exists and add reporters.",
45-
"implementation": "./src/migrations/update-17-3-0/vitest-coverage-and-reporters",
46-
"package": "@nx/vite",
47-
"name": "vitest-coverage-and-reporters"
48-
},
49-
{
50-
"cli": "nx",
51-
"version": "17.3.1-beta.0",
52-
"description": "Add project property to playwright config",
53-
"implementation": "./src/migrations/update-17-3-1/add-project-to-config",
54-
"package": "@nx/playwright",
55-
"name": "17-3-1-add-project-to-config"
12+
"version": "18.1.0-beta.3",
13+
"description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
14+
"implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6",
15+
"package": "@nx/cypress",
16+
"name": "update-cypress-version-13-6-6"
5617
},
5718
{
5819
"cli": "nx",
@@ -61,28 +22,6 @@
6122
"implementation": "./src/migrations/update-18-1-0/remove-baseUrl-from-project-json",
6223
"package": "@nx/playwright",
6324
"name": "18-1-0-remove-baseUrl-from-project-json"
64-
},
65-
{
66-
"cli": "nx",
67-
"version": "18.1.0-beta.3",
68-
"description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
69-
"implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6",
70-
"package": "@nx/cypress",
71-
"name": "update-cypress-version-13-6-6"
72-
},
73-
{
74-
"version": "17.2.0-beta.0",
75-
"description": "Simplify eslintFilePatterns",
76-
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
77-
"package": "@nx/eslint",
78-
"name": "simplify-eslint-patterns"
79-
},
80-
{
81-
"version": "17.2.9",
82-
"description": "Move executor options to target defaults",
83-
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
84-
"package": "@nx/eslint",
85-
"name": "move-options-to-target-defaults"
8625
}
8726
]
8827
}

nx.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"affected": {
4-
"defaultBase": "main"
5-
},
63
"workspaceLayout": {
74
"appsDir": "apps",
85
"libsDir": "packages"
@@ -56,5 +53,7 @@
5653
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
5754
"!{projectRoot}/tsconfig.spec.json"
5855
]
59-
}
56+
},
57+
"nxCloudAccessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU=",
58+
"defaultBase": "main"
6059
}

package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959
"@img/sharp-linux-x64": "^0.33.0",
6060
"@jscutlery/semver": "^4.2.0",
6161
"@k11r/nx-cloudflare-wrangler": "3.0.0-feat-sst-upgrade.1",
62-
"@nx/cypress": "18.0.0",
63-
"@nx/devkit": "18.0.0",
64-
"@nx/eslint": "18.0.0",
65-
"@nx/eslint-plugin": "18.0.0",
66-
"@nx/jest": "18.0.0",
67-
"@nx/js": "18.0.0",
68-
"@nx/playwright": "18.0.0",
69-
"@nx/plugin": "18.0.0",
70-
"@nx/storybook": "18.0.0",
71-
"@nx/vite": "18.0.0",
72-
"@nx/workspace": "18.0.0",
62+
"@nx/cypress": "19.0.4",
63+
"@nx/devkit": "19.0.4",
64+
"@nx/eslint": "19.0.4",
65+
"@nx/eslint-plugin": "19.0.4",
66+
"@nx/jest": "19.0.4",
67+
"@nx/js": "19.0.4",
68+
"@nx/playwright": "19.0.4",
69+
"@nx/plugin": "19.0.4",
70+
"@nx/storybook": "19.0.4",
71+
"@nx/vite": "19.0.4",
72+
"@nx/workspace": "19.0.4",
7373
"@oddbird/popover-polyfill": "0.4.3",
7474
"@playwright/test": "^1.41.2",
7575
"@qwikest/icons": "0.0.13",
@@ -99,8 +99,8 @@
9999
"@types/react-dom": "18.0.11",
100100
"@typescript-eslint/eslint-plugin": "7.9.0",
101101
"@typescript-eslint/parser": "7.9.0",
102-
"@vitest/coverage-v8": "0.34.6",
103-
"@vitest/ui": "0.34.7",
102+
"@vitest/coverage-v8": "1.6.0",
103+
"@vitest/ui": "1.6.0",
104104
"all-contributors-cli": "^6.26.1",
105105
"ansis": "2.3.0",
106106
"autoprefixer": "^10.4.15",
@@ -113,7 +113,7 @@
113113
"clsx": "^2.0.0",
114114
"commitizen": "^4.3.0",
115115
"commitlint": "^17.7.1",
116-
"cypress": "^13.0.0",
116+
"cypress": "^13.6.6",
117117
"cypress-axe": "1.4.0",
118118
"cypress-ct-qwik": "0.3.0",
119119
"cypress-real-events": "1.10.3",
@@ -137,7 +137,7 @@
137137
"ngx-deploy-npm": "^7.0.1",
138138
"node-fetch": "^3.3.2",
139139
"np": "^8.0.4",
140-
"nx": "18.0.0",
140+
"nx": "19.0.4",
141141
"postcss": "^8.4.29",
142142
"prettier": "^3.2.5",
143143
"prettier-plugin-tailwindcss": "^0.4.1",
@@ -170,7 +170,7 @@
170170
"vite-plugin-inspect": "0.7.38",
171171
"vite-plugin-static-copy": "0.17.0",
172172
"vite-tsconfig-paths": "4.2.0",
173-
"vitest": "0.34.6",
173+
"vitest": "1.6.0",
174174
"wrangler": "^3.57.0",
175175
"yargs": "17.7.2"
176176
},

0 commit comments

Comments
 (0)