Skip to content

Commit 835c670

Browse files
authored
Update vite version to 6 (#183)
2 parents 43b6fd1 + 652ea33 commit 835c670

File tree

9 files changed

+1025
-1061
lines changed

9 files changed

+1025
-1061
lines changed

.changeset/smart-ducks-dance.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"embodi": minor
3+
---
4+
5+
Update vite to version 6

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"prepublishOnly": "pnpm run --recursive prepublishOnly"
1111
},
1212
"devDependencies": {
13-
"@changesets/cli": "^2.27.11",
13+
"@changesets/cli": "^2.28.1",
1414
"@faker-js/faker": "^8.4.1",
15-
"@playwright/test": "^1.49.1",
16-
"@types/node": "^22.10.3",
17-
"playwright": "^1.49.1",
18-
"publint": "^0.2.12",
19-
"vitest": "^2.1.8"
15+
"@playwright/test": "^1.51.1",
16+
"@types/node": "^22.13.11",
17+
"playwright": "^1.51.1",
18+
"publint": "^0.3.9",
19+
"vitest": "^3.0.9"
2020
}
2121
}

packages/e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
},
1212
"devDependencies": {
1313
"embodi": "workspace:*",
14-
"svelte": "^5.2.0"
14+
"svelte": "^5.23.2"
1515
}
1616
}

packages/embodi/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
"type": "module",
4242
"devDependencies": {
4343
"@loom-io/in-memory-adapter": "0.12.11",
44-
"@sveltejs/package": "^2.3.7",
44+
"@sveltejs/package": "^2.3.10",
4545
"@types/markdown-it": "^14.1.2",
4646
"@types/minimist": "^1.2.5",
47-
"rollup": "^4.26.0"
47+
"rollup": "^4.36.0"
4848
},
4949
"peerDependencies": {
50-
"svelte": "^5.1.0",
51-
"typescript": "^5.0.0",
52-
"vite": "^5.2.11"
50+
"svelte": "^5.23.0",
51+
"typescript": "^5.2.0",
52+
"vite": "^6.2.0"
5353
},
5454
"dependencies": {
5555
"@loom-io/converter": "0.12.11",
@@ -58,13 +58,13 @@
5858
"@loom-io/json-converter": "0.12.11",
5959
"@loom-io/node-filesystem-adapter": "^0.12.11",
6060
"@loom-io/yaml-converter": "0.12.11",
61-
"@modyfi/vite-plugin-yaml": "^1.1.0",
62-
"@sveltejs/vite-plugin-svelte": "^4.0.0",
61+
"@modyfi/vite-plugin-yaml": "^1.1.1",
62+
"@sveltejs/vite-plugin-svelte": "^5.0.3",
6363
"front-matter": "^4.0.2",
6464
"markdown-it": "^14.1.0",
6565
"minimist": "^1.2.8",
6666
"pipe-and-combine": "^0.5.7",
67-
"vitest": "^2.1.5"
67+
"vitest": "^3.0.9"
6868
},
6969
"repository": {
7070
"type": "git",

packages/embodi/src/core/vite/plugins/battery.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { normalize } from 'node:path';
22
import type { Plugin } from 'vite';
33

4+
45
const normalizeImportPath = (path: string) => normalize(path).replaceAll('\\', '\\\\');
56

6-
export function embodiBattery() {
7+
export function embodiBattery(): Plugin {
78
return {
89
name: 'vite-embodi-battery',
910

@@ -18,5 +19,5 @@ export function embodiBattery() {
1819
return `export * from '${normalizeImportPath(id.slice(1, -10))}';`;
1920
}
2021
}
21-
} satisfies Plugin;
22+
};
2223
}

packages/embodi/src/core/vite/plugins/embodi.ts

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,43 +29,43 @@ import { generateInternalStores, generateReadableStores } from '../code-builder/
2929
const cwd = process.cwd(); // Current working directory
3030
const cf = resolve(dirname(fileURLToPath(import.meta.url)), '..'); // core folder
3131

32-
export const configPlugin = () =>
33-
({
34-
name: 'embodi-config-plugin',
35-
async config(config, env) {
36-
const projectConfig = await loadConfig(cwd);
37-
const ssr = env.isSsrBuild;
38-
const distBase = projectConfig.dist ?? 'dist';
39-
const newConfig: UserConfig = {
40-
...config,
41-
...projectConfig.viteConfig,
42-
root: cwd,
43-
resolve: {
44-
...config.resolve,
45-
alias: {
46-
'$embodi/*': resolve(cf, './virtual-modules/embodi/*'),
47-
$layout: resolve(cwd, projectConfig.inputDirs.layout)
48-
}
49-
},
50-
build: {
51-
target: 'ES2022',
52-
emptyOutDir: true,
53-
ssr,
54-
ssrManifest: !ssr,
55-
manifest: !ssr,
56-
outDir: ssr ? join(distBase, 'server') : join(distBase, 'static'),
57-
rollupOptions: {
58-
input: ssr
59-
? resolve(cf, '../app/entry-server.js')
60-
: { client: resolve(cf, '../app/entry-client.js') }
61-
}
62-
}
63-
};
64-
return newConfig;
65-
}
66-
}) satisfies Plugin;
32+
export const configPlugin = (): Plugin =>
33+
({
34+
name: 'embodi-config-plugin',
35+
async config(config, env) {
36+
const projectConfig = await loadConfig(cwd);
37+
const ssr = env.isSsrBuild;
38+
const distBase = projectConfig.dist ?? 'dist';
39+
const newConfig: UserConfig = {
40+
...config,
41+
...projectConfig.viteConfig,
42+
root: cwd,
43+
resolve: {
44+
...config.resolve,
45+
alias: {
46+
'$embodi/*': resolve(cf, './virtual-modules/embodi/*'),
47+
$layout: resolve(cwd, projectConfig.inputDirs.layout)
48+
}
49+
},
50+
build: {
51+
target: 'ES2022',
52+
emptyOutDir: true,
53+
ssr,
54+
ssrManifest: !ssr,
55+
manifest: !ssr,
56+
outDir: ssr ? join(distBase, 'server') : join(distBase, 'static'),
57+
rollupOptions: {
58+
input: ssr
59+
? resolve(cf, '../app/entry-server.js')
60+
: { client: resolve(cf, '../app/entry-client.js') }
61+
}
62+
}
63+
};
64+
return newConfig;
65+
}
66+
});
6767

68-
export const virtualPlugin = () =>
68+
export const virtualPlugin = (): Plugin =>
6969
({
7070
name: 'embodi-virtual-plugin',
7171
async resolveId(id) {
@@ -139,9 +139,9 @@ export const virtualPlugin = () =>
139139
}
140140
});
141141
}
142-
}) satisfies Plugin;
142+
});
143143

144-
export const prerenderPlugin = () => {
144+
export const prerenderPlugin = (): Plugin => {
145145
let isSsr = false;
146146
return {
147147
name: 'embodi-prerender-plugin',
@@ -160,10 +160,10 @@ export const prerenderPlugin = () => {
160160
statics
161161
});
162162
}
163-
} satisfies Plugin;
163+
};
164164
};
165165

166-
export const devServerPlugin = () =>
166+
export const devServerPlugin = (): Plugin =>
167167
({
168168
name: 'embodi-dev-server-plugin',
169169

@@ -219,4 +219,4 @@ export const devServerPlugin = () =>
219219

220220
server.middlewares.use(devServer);
221221
}
222-
}) satisfies Plugin;
222+
});

packages/embodi/src/core/vite/plugins/svelte.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Plugin } from 'vite';
22

3-
export function embodiSvelte() {
3+
export function embodiSvelte(): Plugin {
44
return {
55
name: 'vite-embodi-svelte',
66

@@ -14,5 +14,5 @@ export function embodiSvelte() {
1414
return `export { default as Component } from '/${id.slice(2, -7)}';`;
1515
}
1616
}
17-
} satisfies Plugin;
17+
};
1818
}

packages/embodi/src/core/vite/utils/parser-plugin.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface ContentParserPluginConfig {
1515
convertContent: (content: string, data: unknown) => string;
1616
}
1717

18-
export function createContentParserPlugin(config: ContentParserPluginConfig) {
18+
export function createContentParserPlugin(config: ContentParserPluginConfig): Plugin {
1919
const { name, fileType, convertContent } = config;
2020
const embodiFormat = `.${fileType}.embodi`;
2121
const format = `.${fileType}`;
@@ -39,6 +39,7 @@ export function createContentParserPlugin(config: ContentParserPluginConfig) {
3939
//@ts-ignore
4040
const { attributes, body } = fm<PageData>(code);
4141
const content = convertContent(body, attributes);
42+
console.log('load Markdown id:', id);
4243
const { layout } = attributes;
4344
let result = `export const data = ${JSON.stringify(attributes)}; export const html = ${JSON.stringify(content)};`;
4445
if (layout) {
@@ -51,5 +52,5 @@ export function createContentParserPlugin(config: ContentParserPluginConfig) {
5152
};
5253
}
5354
}
54-
} satisfies Plugin;
55+
};
5556
}

0 commit comments

Comments
 (0)