Skip to content

Commit 578b90e

Browse files
amrbashiramrbashir
authored
fix(framgents/solid): add missing "type": "module", closes #358 (#360)
1 parent 73c0c13 commit 578b90e

23 files changed

Lines changed: 190 additions & 162 deletions

‎.changes/solid-js-type-module.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"create-tauri-app": "patch"
3+
"create-tauri-app-js": "patch"
4+
---
5+
6+
Add missing `"type": "module"` to `package.json` in SolidJs templates.

‎packages/cli/fragments/fragment-react-ts/%(mobile)%vite.config.ts‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@ import { defineConfig } from "vite";
22
import react from "@vitejs/plugin-react";
33
import { internalIpV4 } from "internal-ip";
44

5+
const mobile =
6+
process.env.TAURI_PLATFORM === "android" ||
7+
process.env.TAURI_PLATFORM === "ios";
8+
59
// https://vitejs.dev/config/
6-
export default defineConfig({
10+
export default defineConfig(async () => ({
711
plugins: [react()],
812

913
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
1014
// prevent vite from obscuring rust errors
1115
clearScreen: false,
1216
// tauri expects a fixed port, fail if that port is not available
1317
server: {
14-
host:
15-
process.env.TAURI_PLATFORM === "android" ||
16-
process.env.TAURI_PLATFORM === "ios"
17-
? "0.0.0.0"
18-
: false,
18+
host: mobile ? "0.0.0.0" : false,
1919
port: 1420,
20-
hmr:
21-
process.env.TAURI_PLATFORM === "android" ||
22-
process.env.TAURI_PLATFORM === "ios"
23-
? {
24-
protocol: "ws",
25-
host: await internalIpV4(),
26-
port: 1421,
27-
}
28-
: undefined,
20+
hmr: mobile
21+
? {
22+
protocol: "ws",
23+
host: await internalIpV4(),
24+
port: 1421,
25+
}
26+
: undefined,
2927
strictPort: true,
3028
},
3129
// to make use of `TAURI_DEBUG` and other env variables
@@ -39,4 +37,4 @@ export default defineConfig({
3937
// produce sourcemaps for debug builds
4038
sourcemap: !!process.env.TAURI_DEBUG,
4139
},
42-
});
40+
}));

‎packages/cli/fragments/fragment-react-ts/%(stable-alpha)%vite.config.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { defineConfig } from "vite";
22
import react from "@vitejs/plugin-react";
33

4+
const mobile =
5+
process.env.TAURI_PLATFORM === "android" ||
6+
process.env.TAURI_PLATFORM === "ios";
7+
48
// https://vitejs.dev/config/
5-
export default defineConfig({
9+
export default defineConfig(async () => ({
610
plugins: [react()],
711

812
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
@@ -24,4 +28,4 @@ export default defineConfig({
2428
// produce sourcemaps for debug builds
2529
sourcemap: !!process.env.TAURI_DEBUG,
2630
},
27-
});
31+
}));

‎packages/cli/fragments/fragment-react/%(mobile)%vite.config.js‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@ import { defineConfig } from "vite";
22
import react from "@vitejs/plugin-react";
33
import { internalIpV4 } from "internal-ip";
44

5+
const mobile =
6+
process.env.TAURI_PLATFORM === "android" ||
7+
process.env.TAURI_PLATFORM === "ios";
8+
59
// https://vitejs.dev/config/
6-
export default defineConfig({
10+
export default defineConfig(async () => ({
711
plugins: [react()],
812

913
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
1014
// prevent vite from obscuring rust errors
1115
clearScreen: false,
1216
// tauri expects a fixed port, fail if that port is not available
1317
server: {
14-
host:
15-
process.env.TAURI_PLATFORM === "android" ||
16-
process.env.TAURI_PLATFORM === "ios"
17-
? "0.0.0.0"
18-
: false,
18+
host: mobile ? "0.0.0.0" : false,
1919
port: 1420,
20-
hmr:
21-
process.env.TAURI_PLATFORM === "android" ||
22-
process.env.TAURI_PLATFORM === "ios"
23-
? {
24-
protocol: "ws",
25-
host: await internalIpV4(),
26-
port: 1421,
27-
}
28-
: undefined,
20+
hmr: mobile
21+
? {
22+
protocol: "ws",
23+
host: await internalIpV4(),
24+
port: 1421,
25+
}
26+
: undefined,
2927
strictPort: true,
3028
},
3129
// to make use of `TAURI_DEBUG` and other env variables
@@ -39,4 +37,4 @@ export default defineConfig({
3937
// produce sourcemaps for debug builds
4038
sourcemap: !!process.env.TAURI_DEBUG,
4139
},
42-
});
40+
}));

‎packages/cli/fragments/fragment-react/%(stable-alpha)%vite.config.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { defineConfig } from "vite";
22
import react from "@vitejs/plugin-react";
33

4+
const mobile =
5+
process.env.TAURI_PLATFORM === "android" ||
6+
process.env.TAURI_PLATFORM === "ios";
7+
48
// https://vitejs.dev/config/
5-
export default defineConfig({
9+
export default defineConfig(async () => ({
610
plugins: [react()],
711

812
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
@@ -24,4 +28,4 @@ export default defineConfig({
2428
// produce sourcemaps for debug builds
2529
sourcemap: !!process.env.TAURI_DEBUG,
2630
},
27-
});
31+
}));

‎packages/cli/fragments/fragment-solid-ts/%(alpha)%package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "{{package_name}}",
33
"version": "0.0.0",
44
"description": "",
5+
"type": "module",
56
"scripts": {
67
"start": "vite",
78
"dev": "vite",

‎packages/cli/fragments/fragment-solid-ts/%(mobile)%package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "{{package_name}}",
33
"version": "0.0.0",
44
"description": "",
5+
"type": "module",
56
"scripts": {
67
"start": "vite",
78
"dev": "vite",

‎packages/cli/fragments/fragment-solid-ts/%(mobile)%vite.config.ts‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@ import { defineConfig } from "vite";
22
import solidPlugin from "vite-plugin-solid";
33
import { internalIpV4 } from "internal-ip";
44

5+
const mobile =
6+
process.env.TAURI_PLATFORM === "android" ||
7+
process.env.TAURI_PLATFORM === "ios";
8+
59
// https://vitejs.dev/config/
6-
export default defineConfig({
10+
export default defineConfig(async () => ({
711
plugins: [solidPlugin()],
812

913
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
1014
// prevent vite from obscuring rust errors
1115
clearScreen: false,
1216
// tauri expects a fixed port, fail if that port is not available
1317
server: {
14-
host:
15-
process.env.TAURI_PLATFORM === "android" ||
16-
process.env.TAURI_PLATFORM === "ios"
17-
? "0.0.0.0"
18-
: false,
18+
host: mobile ? "0.0.0.0" : false,
1919
port: 1420,
20-
hmr:
21-
process.env.TAURI_PLATFORM === "android" ||
22-
process.env.TAURI_PLATFORM === "ios"
23-
? {
24-
protocol: "ws",
25-
host: await internalIpV4(),
26-
port: 1421,
27-
}
28-
: undefined,
20+
hmr: mobile
21+
? {
22+
protocol: "ws",
23+
host: await internalIpV4(),
24+
port: 1421,
25+
}
26+
: undefined,
2927
strictPort: true,
3028
},
3129
// to make use of `TAURI_DEBUG` and other env variables
@@ -39,4 +37,4 @@ export default defineConfig({
3937
// produce sourcemaps for debug builds
4038
sourcemap: !!process.env.TAURI_DEBUG,
4139
},
42-
});
40+
}));

‎packages/cli/fragments/fragment-solid-ts/%(stable-alpha)%vite.config.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { defineConfig } from "vite";
22
import solidPlugin from "vite-plugin-solid";
33

4+
const mobile =
5+
process.env.TAURI_PLATFORM === "android" ||
6+
process.env.TAURI_PLATFORM === "ios";
7+
48
// https://vitejs.dev/config/
5-
export default defineConfig({
9+
export default defineConfig(async () => ({
610
plugins: [solidPlugin()],
711

812
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
@@ -24,4 +28,4 @@ export default defineConfig({
2428
// produce sourcemaps for debug builds
2529
sourcemap: !!process.env.TAURI_DEBUG,
2630
},
27-
});
31+
}));

‎packages/cli/fragments/fragment-solid/%(alpha)%package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "{{package_name}}",
33
"version": "0.0.0",
44
"description": "",
5+
"type": "module",
56
"scripts": {
67
"start": "vite",
78
"dev": "vite",

0 commit comments

Comments
 (0)