Skip to content

Commit f7a90fa

Browse files
authored
Merge branch 'main' into fix-json-devtools
2 parents 2a98be7 + 0f9b36b commit f7a90fa

File tree

109 files changed

+2848
-1452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2848
-1452
lines changed

.changeset/curly-moons-shave.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'eslint-plugin-qwik': minor
3+
'create-qwik': minor
4+
'@builder.io/qwik-city': minor
5+
'@builder.io/qwik': minor
6+
---
7+
8+
feat: bump Vite to v7

.changeset/dirty-dolls-heal.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

.changeset/gold-colts-change.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/social-kings-visit.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-qwik': patch
3+
---
4+
5+
fix: fix up TypeScript compatibility in the localize starter

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cimg/rust:1.73-node
1+
FROM cimg/rust:1.88.0-node
22

33
RUN rustup --version; \
44
cargo --version; \

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.11
1+
22

CONTRIBUTING.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ You need to have these tools up and running in your local machine:
6969
- one of the following:
7070
- [Nix](https://nixos.org)
7171
- [Docker](https://www.docker.com/)
72-
- Locally installed NodeJS v18+ and optionally Rust
72+
- Locally installed NodeJS v22+ and optionally Rust
7373

7474
#### Nix
7575

@@ -95,6 +95,15 @@ Alternatively you can use [devcontainers/cli](https://github.com/devcontainers/c
9595
- In your terminal navigate to the Qwik's project root directory.
9696
- Then run `devcontainer up --workspace-folder .`. This command will start a Docker container with all required environment dependencies.
9797

98+
> [!TIP]
99+
> If you are using Podman, be sure to update the [VSCode dev container settings](https://code.visualstudio.com/remote/advancedcontainers/docker-options#_podman). Don't forget to allocate enough resources to the Podman machine to avoid slow builds.
100+
101+
> [!NOTE]
102+
> You may run into an `EEXISTS` error when the Dev Container runs the "updateContentCommand" script. This may happen if pnpm gets installed automatically during the setup process. You can ignore the error because the container will be setup correctly, then run `pnpm install` in the project root once the container is connected and the terminal is available.
103+
104+
> [!CAUTION]
105+
> The Dev Container may not work on Windows properly due to a difference with Windows container host volume permissions and ownership. It's recommended to use Mac or Linux instead, or configure your environment to build the project without Dev Containers.
106+
98107
##### Using development container without Dev Containers and VSCode
99108

100109
If you would like to make use of the development container solution, but don't use VSCode or Dev Containers, you still can do so, by following steps:
@@ -145,7 +154,7 @@ Furthermore, to build the optimizer you optionally need Rust.
145154

146155
1. Make sure [Rust](https://www.rust-lang.org/tools/install) is installed.
147156
2. Install [wasm-pack](https://rustwasm.github.io/wasm-pack/installer/) with `cargo install wasm-pack` .
148-
3. Node version >= `18`.
157+
3. Node version >= `22`.
149158
4. Make sure you have [pnpm](https://pnpm.io/installation) installed.
150159
5. run `pnpm install`
151160

@@ -164,6 +173,9 @@ pnpm install && pnpm build.local
164173

165174
If you want to work on the Rust code, use `build.full` instead of `build.local`.
166175

176+
> [!NOTE]
177+
> After running `build.local`, you may see Git diffs for API-related files and `JSXNode`. You should run the `api.update` script to resolve them.
178+
167179
### Fast build
168180

169181
This will build only Qwik and Qwik City and their types. This is not enough to run the docs.

e2e/adapters-e2e/vite.config.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@ errorOnDuplicatesPkgDeps(devDependencies, dependencies);
2020
* Note that Vite normally starts from `index.html` but the qwikCity plugin makes start at
2121
* `src/entry.ssr.tsx` instead.
2222
*/
23-
export default defineConfig(({ command, mode }): UserConfig => {
23+
export default defineConfig((): UserConfig => {
2424
return {
25-
plugins: [
26-
qwikCity(),
27-
qwikVite(),
28-
tsconfigPaths({
29-
root: '.',
30-
}),
31-
],
25+
plugins: [qwikCity(), qwikVite(), tsconfigPaths({ root: '.' })],
3226
// This tells Vite which dependencies to pre-build in dev mode.
3327
optimizeDeps: {
3428
// Put problematic deps that break bundling here, mostly those with binaries.

e2e/qwik-cli-e2e/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if (process.env.CI) {
2626
}
2727

2828
export default defineConfig({
29-
plugins: [tsconfigPaths({ ignoreConfigErrors: true, root: '../../' })],
29+
plugins: [tsconfigPaths({ root: '../../' })],
3030
test: {
3131
include: ['./tests/*.spec.?(c|m)[jt]s?(x)'],
3232
setupFiles: ['./utils/setup.ts'],

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dependencies": [
1919
"vite"
2020
],
21-
"pinVersion": "^5"
21+
"pinVersion": ">=5 <8"
2222
},
2323
{
2424
"label": "use workspace protocol for local packages and allow patch versions (used in e.g. qwik-react)",
@@ -95,7 +95,7 @@
9595
}
9696
],
9797
"dependencies": {
98-
"esbuild-plugin-raw": "^0.1.8"
98+
"esbuild-plugin-raw": "^0.2.0"
9999
},
100100
"devDependencies": {
101101
"@builder.io/qwik": "workspace:^",
@@ -118,14 +118,14 @@
118118
"@types/bun": "1.1.6",
119119
"@types/cross-spawn": "6.0.6",
120120
"@types/express": "4.17.21",
121-
"@types/node": "20.14.11",
121+
"@types/node": "20.19.0",
122122
"@types/path-browserify": "1.0.2",
123123
"@types/prompts": "2.4.9",
124124
"@types/react": "18.3.3",
125125
"@types/semver": "7.5.8",
126126
"@types/tmp": "0.2.6",
127127
"@types/which-pm-runs": "1.0.2",
128-
"@vitejs/plugin-basic-ssl": "2.0.0",
128+
"@vitejs/plugin-basic-ssl": "2.1.0",
129129
"all-contributors-cli": "6.26.1",
130130
"brotli": "1.3.3",
131131
"create-qwik": "workspace:^",
@@ -158,16 +158,16 @@
158158
"terser": "5.31.3",
159159
"tmp": "0.2.3",
160160
"tree-kill": "1.2.2",
161-
"tsx": "4.19.1",
161+
"tsx": "4.20.3",
162162
"typescript": "5.4.5",
163163
"typescript-eslint": "8.26.1",
164164
"undici": "*",
165165
"vfile": "6.0.2",
166-
"vite": "5.3.5",
166+
"vite": "7.0.6",
167167
"vite-imagetools": "7.0.4",
168168
"vite-plugin-dts": "3.9.1",
169-
"vite-tsconfig-paths": "4.3.2",
170-
"vitest": "2.0.5",
169+
"vite-tsconfig-paths": "5.1.4",
170+
"vitest": "3.2.4",
171171
"watchlist": "0.3.1",
172172
"which-pm-runs": "1.1.0",
173173
"zod": "3.22.4"

0 commit comments

Comments
 (0)