Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: pre bundle client #1813

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
"engines": {
"node": ">=18.0.0"
},
"scripts": {
"build": "vite build",
"dev": "vite build --watch"
},
"dependencies": {
"@antfu/utils": "^0.7.10",
"@iconify-json/carbon": "^1.1.36",
Expand Down
5 changes: 5 additions & 0 deletions packages/client/uno.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import '@unocss/reset/tailwind.css'
import 'uno:preflights.css'
import 'uno:typography.css'
import 'uno:shortcuts.css'
import 'uno.css'
114 changes: 114 additions & 0 deletions packages/client/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
import { fileURLToPath } from 'node:url'
import { basename } from 'node:path'
import { defineConfig, normalizePath } from 'vite'
import UnoCSS from 'unocss/vite'
import type { ResolvedSlidevOptions, SlidevPluginOptions } from '@slidev/types'
import IconsResolver from 'unplugin-icons/resolver'
import Components from 'unplugin-vue-components/vite'
import fg from 'fast-glob'
import { createInspectPlugin } from '../slidev/node/vite/inspect'
import { createIconsPlugin } from '../slidev/node/vite/icons'
import { createVuePlugin } from '../slidev/node/vite/vue'

const absolute = (path: string) => normalizePath(fileURLToPath(new URL(path, import.meta.url)))
const clientRoot = absolute('.')

const options = {
clientRoot,
roots: [],
mode: 'build',
inspect: true,
} as unknown as ResolvedSlidevOptions

const pluginOptions = {
components: {
dts: false,
},
} as SlidevPluginOptions

const defines = [
'__DEV__',
'__SLIDEV_CLIENT_ROOT__',
'__SLIDEV_HASH_ROUTE__',
'__SLIDEV_FEATURE_DRAWINGS__',
'__SLIDEV_FEATURE_EDITOR__',
'__SLIDEV_FEATURE_DRAWINGS_PERSIST__',
'__SLIDEV_FEATURE_RECORD__',
'__SLIDEV_FEATURE_PRESENTER__',
'__SLIDEV_FEATURE_PRINT__',
'__SLIDEV_FEATURE_WAKE_LOCK__',
'__SLIDEV_HAS_SERVER__',
]

const builtinComponents = Object.fromEntries(fg.sync('*', {
cwd: absolute('./builtin'),
absolute: true,
}).map(i => [`components/${basename(i).replace(/\..*$/, '')}`, i]))

const layoutComponents = Object.fromEntries(fg.sync('*', {
cwd: absolute('./layouts'),
absolute: true,
}).map(i => [`layouts/${basename(i).replace(/\..*$/, '')}`, i]))

const externals = [
'#slidev/',
'/@slidev/',
'@slidev/',
'server-reactive:',
'vue',
'vue-router',
'monaco-editor',
'typescript',
'mermaid',
'~icons/',
]

export default defineConfig({
plugins: [
createInspectPlugin(options, pluginOptions),
UnoCSS(),
createVuePlugin(options, pluginOptions),
Components({
extensions: ['vue', 'ts'],
dirs: [absolute('./builtin')],
resolvers: [
IconsResolver({
prefix: '',
customCollections: Object.keys(pluginOptions.icons?.customCollections || []),
}),
],
dts: false,
}),
createIconsPlugin(options, pluginOptions),
{
name: 'slidev:flags',
enforce: 'pre',
transform(code, id) {
if (id.match(/\.vue($|\?)/)) {
const original = code
defines.forEach((name) => {
code = code.replaceAll(`_ctx.${name}`, name)
})
if (original !== code)
return code
}
},
},
],
build: {
lib: {
entry: {
'main': absolute('./main.ts'),
'index': absolute('./index.ts'),
'uno.css': absolute('./uno.ts'),
...builtinComponents,
...layoutComponents,
},
formats: ['es'],
},
target: 'esnext',
rollupOptions: {
external: source => externals.some(i => source.startsWith(i)),
},
},
})
2 changes: 1 addition & 1 deletion packages/slidev/node/commands/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export async function getIndexHtml({ mode, entry, clientRoot, roots, data }: Res
head += `\n<link rel="stylesheet" href="${generateGoogleFontsUrl(data.config.fonts)}" type="text/css">`

main = main
.replace('__ENTRY__', toAtFS(join(clientRoot, 'main.ts')))
.replace('__ENTRY__', toAtFS(join(clientRoot, 'dist/main.js')))
.replace('<!-- head -->', head)
.replace('<!-- body -->', body)

Expand Down
4 changes: 2 additions & 2 deletions packages/slidev/node/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ export async function createDataUtils(data: SlidevData, clientRoot: string, root

const layouts: Record<string, string> = {}

for (const root of [clientRoot, ...roots]) {
const layoutPaths = fg.sync('layouts/**/*.{vue,ts}', {
for (const root of [path.join(clientRoot, 'dist'), ...roots]) {
const layoutPaths = fg.sync('layouts/**/*.{vue,ts,js}', {
cwd: root,
absolute: true,
suppressErrors: true,
Expand Down
1 change: 1 addition & 0 deletions packages/slidev/node/virtual/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const templateStyle: VirtualModuleTemplate = {
`import "${resolveUrlOfClient('styles/code.css')}"`,
`import "${resolveUrlOfClient('styles/katex.css')}"`,
`import "${resolveUrlOfClient('styles/transitions.css')}"`,
`import "${resolveUrlOfClient('dist/style.css')}"`,
]

for (const root of roots) {
Expand Down
4 changes: 2 additions & 2 deletions packages/slidev/node/vite/compilerFlagsVue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ export function createVueCompilerFlagsPlugin(
name: 'slidev:flags',
enforce: 'pre',
transform(code, id) {
if (id.match(/\.vue($|\?)/)) {
if (id.match(/\.vue($|\?)/) || id.includes('client/dist')) {
const original = code
define.forEach(([from, to]) => {
code = code.replace(new RegExp(from, 'g'), to)
code = code.replaceAll(from, to)
})
if (original !== code)
return code
Expand Down
2 changes: 1 addition & 1 deletion packages/slidev/node/vite/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function createComponentsPlugin(
extensions: ['vue', 'md', 'js', 'ts', 'jsx', 'tsx'],

dirs: [
join(clientRoot, 'builtin'),
join(clientRoot, 'dist/components'),
...roots.map(i => join(i, 'components')),
],

Expand Down
4 changes: 2 additions & 2 deletions packages/slidev/node/vite/extendConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin {
})
return {
name: 'slidev:config',
async config(config) {
async config() {
const injection: InlineConfig = {
define: getDefine(options),
resolve: {
Expand Down Expand Up @@ -188,7 +188,7 @@ export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin {
injection.root = options.cliRoot
}

return mergeConfig(injection, config)
return injection
},
configureServer(server) {
// serve our index.html after vite history fallback
Expand Down