Skip to content

Commit 2a1838e

Browse files
authored
Merge pull request #743 from maiieul/update-to-nx-18
chore: update to nx 18
2 parents f240fb0 + 7554883 commit 2a1838e

File tree

8 files changed

+12854
-16152
lines changed

8 files changed

+12854
-16152
lines changed

.github/actions/setup/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
node_version:
77
description: Node Version
88
required: false
9-
default: '16'
9+
default: '18'
1010

1111
runs:
1212
using: composite
@@ -25,7 +25,7 @@ runs:
2525
- name: Setup pnpm
2626
uses: pnpm/[email protected]
2727
with:
28-
version: 7
28+
version: 8
2929

3030
- name: Use Node
3131
uses: actions/setup-node@v4

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node_version: [16, 18, 20, 21]
14+
node_version: [18, 20, 21, 22]
1515

1616
steps:
1717
- uses: actions/checkout@v3

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
node_version: [16, 18, 20, 21]
13+
node_version: [18, 20, 21, 22]
1414

1515
steps:
1616
- name: Cancel Previous Runs

migrations.json

+61-29
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,87 @@
22
"migrations": [
33
{
44
"cli": "nx",
5-
"version": "17.0.0-beta.1",
6-
"description": "Updates the default cache directory to .nx/cache",
7-
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
5+
"version": "17.3.0-beta.6",
6+
"description": "Updates the nx wrapper.",
7+
"implementation": "./src/migrations/update-17-3-0/update-nxw",
88
"package": "nx",
9-
"name": "17.0.0-move-cache-directory"
9+
"name": "17.3.0-update-nx-wrapper"
1010
},
1111
{
1212
"cli": "nx",
13-
"version": "17.0.0-beta.3",
14-
"description": "Use minimal config for tasksRunnerOptions",
15-
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
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,
1617
"package": "nx",
17-
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
18+
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
1819
},
1920
{
20-
"version": "17.0.0-rc.1",
21-
"description": "Migration for v17.0.0-rc.1",
22-
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
21+
"version": "18.1.0-beta.3",
22+
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
23+
"implementation": "./src/migrations/update-17-2-0/move-default-base",
2324
"package": "nx",
24-
"name": "rm-default-collection-npm-scope"
25+
"name": "move-default-base-to-nx-json-root"
2526
},
2627
{
27-
"version": "17.1.0-beta.2",
28-
"description": "Move target defaults",
29-
"implementation": "./src/migrations/update-17-1-0/move-target-defaults",
28+
"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",
3046
"package": "@nx/vite",
31-
"name": "move-target-defaults"
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"
56+
},
57+
{
58+
"cli": "nx",
59+
"version": "18.1.0-beta.3",
60+
"description": "Remove invalid baseUrl option from @nx/playwright:playwright targets in project.json.",
61+
"implementation": "./src/migrations/update-18-1-0/remove-baseUrl-from-project-json",
62+
"package": "@nx/playwright",
63+
"name": "18-1-0-remove-baseUrl-from-project-json"
3264
},
3365
{
3466
"cli": "nx",
35-
"version": "17.0.2",
36-
"description": "Remove deprecated build options",
37-
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
38-
"package": "@nx/js",
39-
"name": "update-17-0-0-remove-deprecated-build-options"
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"
4072
},
4173
{
42-
"version": "17.0.0-beta.7",
43-
"description": "update-17-0-0-rename-to-eslint",
44-
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
74+
"version": "17.2.0-beta.0",
75+
"description": "Simplify eslintFilePatterns",
76+
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
4577
"package": "@nx/eslint",
46-
"name": "update-17-0-0-rename-to-eslint"
78+
"name": "simplify-eslint-patterns"
4779
},
4880
{
49-
"version": "17.1.0-beta.1",
50-
"description": "Updates for @typescript-utils/utils v6.9.1+",
51-
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
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",
5284
"package": "@nx/eslint",
53-
"name": "update-typescript-eslint"
85+
"name": "move-options-to-target-defaults"
5486
}
5587
]
5688
}

package.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"test.headless.ci": "nx component-test-ci headless",
4141
"test.utils": "nx test utils"
4242
},
43-
"packageManager": "pnpm@9.1.1",
43+
"packageManager": "pnpm@8.15.8",
4444
"devDependencies": {
45-
"@axe-core/playwright": "4.8.5",
45+
"@axe-core/playwright": "4.9.0",
4646
"@builder.io/qwik": "^1.5.4",
4747
"@builder.io/qwik-city": "^1.5.4",
4848
"@builder.io/qwik-react": "0.5.3",
@@ -58,23 +58,23 @@
5858
"@fontsource-variable/inter": "5.0.8",
5959
"@img/sharp-linux-x64": "^0.33.0",
6060
"@jscutlery/semver": "^4.2.0",
61-
"@k11r/nx-cloudflare-wrangler": "2.7.1",
62-
"@nx/cypress": "17.1.3",
63-
"@nx/devkit": "17.1.3",
64-
"@nx/eslint": "17.1.3",
65-
"@nx/eslint-plugin": "17.1.3",
66-
"@nx/jest": "17.1.3",
67-
"@nx/js": "17.1.3",
68-
"@nx/playwright": "17.1.3",
69-
"@nx/plugin": "17.2.3",
70-
"@nx/storybook": "17.1.3",
71-
"@nx/vite": "17.1.3",
72-
"@nx/workspace": "17.1.3",
61+
"@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",
7373
"@oddbird/popover-polyfill": "0.4.3",
7474
"@playwright/test": "^1.41.2",
7575
"@qwikest/icons": "0.0.13",
7676
"@radix-ui/react-scroll-area": "1.0.5",
77-
"@shikijs/transformers": "1.1.7",
77+
"@shikijs/transformers": "1.5.2",
7878
"@storybook/addon-a11y": "7.6.0",
7979
"@storybook/addon-coverage": "^0.0.9",
8080
"@storybook/addon-essentials": "7.6.0",
@@ -87,20 +87,20 @@
8787
"@storybook/jest": "0.2.3",
8888
"@storybook/test-runner": "0.13.0",
8989
"@storybook/testing-library": "0.2.2",
90-
"@swc-node/register": "~1.6.7",
90+
"@swc-node/register": "1.8.0",
9191
"@swc/core": "~1.3.85",
9292
"@testing-library/cypress": "9.0.0",
9393
"@types/decompress": "4.2.7",
9494
"@types/eslint": "^8.44.2",
9595
"@types/estree-jsx": "^1.0.3",
9696
"@types/jest": "^29.4.0",
97-
"@types/node": "^20.5.7",
97+
"@types/node": "^20.12.12",
9898
"@types/react": "18.0.28",
9999
"@types/react-dom": "18.0.11",
100-
"@typescript-eslint/eslint-plugin": "6.13.1",
101-
"@typescript-eslint/parser": "6.13.1",
102-
"@vitest/coverage-v8": "~0.34.6",
103-
"@vitest/ui": "^0.34.3",
100+
"@typescript-eslint/eslint-plugin": "7.9.0",
101+
"@typescript-eslint/parser": "7.9.0",
102+
"@vitest/coverage-v8": "0.34.6",
103+
"@vitest/ui": "0.34.7",
104104
"all-contributors-cli": "^6.26.1",
105105
"ansis": "2.3.0",
106106
"autoprefixer": "^10.4.15",
@@ -121,7 +121,7 @@
121121
"danger": "^11.2.8",
122122
"decompress": "4.2.1",
123123
"dotenv": "16.3.1",
124-
"eslint": "^8.48.0",
124+
"eslint": "8.57.0",
125125
"eslint-config-prettier": "9.0.0",
126126
"eslint-plugin-cypress": "^2.14.0",
127127
"eslint-plugin-playwright": "^1.3.0",
@@ -137,19 +137,19 @@
137137
"ngx-deploy-npm": "^7.0.1",
138138
"node-fetch": "^3.3.2",
139139
"np": "^8.0.4",
140-
"nx": "17.1.3",
140+
"nx": "18.0.0",
141141
"postcss": "^8.4.29",
142142
"prettier": "^3.2.5",
143143
"prettier-plugin-tailwindcss": "^0.4.1",
144144
"pretty-quick": "^4.0.0",
145-
"qwik-nx": "^1.0.8",
145+
"qwik-nx": "^2.2.1",
146146
"qwik-themes": "^0.2.0",
147147
"react": "18.2.0",
148148
"react-dom": "18.2.0",
149149
"rehype-pretty-code": "^0.13.0",
150150
"rollup-plugin-pure": "0.2.1",
151151
"sass": "^1.66.1",
152-
"shiki": "1.1.7",
152+
"shiki": "1.5.2",
153153
"specificity": "^1.0.0",
154154
"storybook": "^7.4.0",
155155
"storybook-framework-qwik": "^0.2.3",
@@ -159,19 +159,19 @@
159159
"ts-jest": "^29.1.0",
160160
"ts-node": "10.9.1",
161161
"tslib": "^2.6.2",
162-
"typescript": "^5.2.2",
162+
"typescript": "5.4.5",
163163
"undici": "^5.23.0",
164164
"unified": "^11.0.4",
165165
"unist-util-visit": "^5.0.0",
166166
"verdaccio": "^5.0.4",
167-
"vite": "^5.1.6",
167+
"vite": "5.2.11",
168168
"vite-plugin-dts": "^3.5.3",
169169
"vite-plugin-eslint": "^1.8.1",
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.3",
174-
"wrangler": "^3.11.0",
173+
"vitest": "0.34.6",
174+
"wrangler": "^3.57.0",
175175
"yargs": "17.7.2"
176176
},
177177
"config": {

packages/kit-headless/src/components/accordion/accordion.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export const Accordion: FunctionComponent<AccordionProps> = (props) => {
3737

3838
if (child.type === AccordionItem) {
3939
const { label } = child.props as AccordionItemProps;
40-
console.log('label', label);
4140
if (label) {
4241
const currentContent = child.children;
4342
child.props.children = child.children = [

packages/kit-styled/src/templates/global.css

+16-8
Original file line numberDiff line numberDiff line change
@@ -1240,11 +1240,19 @@
12401240

12411241
*::-webkit-scrollbar-thumb {
12421242
/* Thumb color */
1243-
background-color: var(--qwikui-slate-500);
1243+
background-color: hsla(var(--foreground) / 0.25);
12441244
border-radius: 0.5rem;
12451245
background-clip: padding-box;
1246-
border-left: 0.3rem solid transparent;
1247-
border-right: 0.3rem solid transparent;
1246+
border-left: 0.15rem solid transparent;
1247+
border-right: 0.15rem solid transparent;
1248+
}
1249+
1250+
.navigation-docs::-webkit-scrollbar-thumb {
1251+
background-color: hsla(var(--foreground) / 0.1);
1252+
}
1253+
1254+
.dark .navigation-docs::-webkit-scrollbar-thumb {
1255+
background-color: hsla(var(--foreground) / 0.2);
12481256
}
12491257

12501258
*::-webkit-scrollbar-corner {
@@ -1256,10 +1264,6 @@
12561264
border-left: 1px solid var(--qwikui-slate-300);
12571265
}
12581266

1259-
.dark *::-webkit-scrollbar-thumb {
1260-
background-color: var(--qwikui-slate-500);
1261-
}
1262-
12631267
.dark *::-webkit-scrollbar-track {
12641268
background: transparent;
12651269
border-left: 1px solid var(--qwikui-slate-800);
@@ -1272,7 +1276,7 @@
12721276
}
12731277

12741278
.code-example *::-webkit-scrollbar-thumb {
1275-
background: var(--qwikui-slate-500);
1279+
background-color: var(--qwikui-slate-600);
12761280
border-radius: 0.5rem;
12771281
background-clip: padding-box;
12781282
}
@@ -1290,6 +1294,10 @@
12901294
.dark .note-link a {
12911295
border-bottom: 1px solid white !important;
12921296
}
1297+
1298+
.gif-container {
1299+
border-radius: var(--border-radius);
1300+
}
12931301
}
12941302

12951303
:root {

0 commit comments

Comments
 (0)