fix: change cacheDir to userRoot/node_modules/.valaxy/cache to not mix deps

YunYouJun · YunYouJun · commit 31030df3980b · 2024-12-16T21:54:43.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,3 @@ components.d.ts
 
 # test
 valaxy-blog
-
diff --git a/e2e/docs/index.spec.ts b/e2e/docs/index.spec.ts
@@ -14,7 +14,7 @@ test.describe('enter docs', () => {
     // Click the get started button
     await page.click('.sese-btn')
     // wait page load
-    await page.waitForURL(`${env.docs}/guide/getting-started`)
+    await page.waitForURL('/guide/getting-started')
     // Expect a new url
     await expect(page.locator('h1')).toHaveText('Getting Started')
   })
diff --git a/packages/valaxy/node/build/bundle.ts b/packages/valaxy/node/build/bundle.ts
@@ -86,9 +86,19 @@ export function getRollupOptions(options: ResolvedValaxyOptions) {
     )}`,
   )
 
+  const assetsDir = 'assets'
   const rollupOptions: Rollup.RollupOptions = {
+    ...options.config.vite?.build?.rollupOptions,
     external: [],
+    // important so that each page chunk and the index export things for each
+    // other
+    preserveEntrySignatures: 'allow-extension',
     output: {
+      assetFileNames: `${assetsDir}/[name].[hash].[ext]`,
+      entryFileNames: `${assetsDir}/[name].[hash].js`,
+      chunkFileNames() {
+        return `${assetsDir}/[name].[hash].js`
+      },
       manualChunks(id, ctx) {
         // move known framework code into a stable chunk so that
         // custom theme changes do not invalidate hash for all pages
@@ -102,6 +112,7 @@ export function getRollupOptions(options: ResolvedValaxyOptions) {
         // lib
         const libs = [
           '@vueuse/motion',
+
           'date-fns',
           'luxon',
           'vue-i18n',
diff --git a/packages/valaxy/node/config/valaxy.ts b/packages/valaxy/node/config/valaxy.ts
@@ -50,7 +50,11 @@ export const defaultValaxyConfig: ValaxyNodeConfig = {
   },
 
   vite: {
-    build: { },
+    build: {
+      emptyOutDir: true,
+      // not inlined?
+      cssCodeSplit: false,
+    },
   },
 
   devtools: true,
diff --git a/packages/valaxy/node/plugins/extendConfig.ts b/packages/valaxy/node/plugins/extendConfig.ts
@@ -31,6 +31,8 @@ const clientDeps = [
   // vue
   'vue',
   'vue-router',
+  'unplugin-vue-router/data-loaders/basic',
+
   'vue-i18n',
   // dev
   '@vue/devtools-api',
@@ -90,7 +92,8 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
         // root: options.userRoot,
         // can not transform valaxy/client/*.ts when use userRoot
         root: options.clientRoot,
-        cacheDir: join(options.userRoot, 'node_modules/.vite'),
+        // cacheDir: join(options.userRoot, 'node_modules/.vite'),
+        cacheDir: join(options.userRoot, 'node_modules/.valaxy/cache'),
         publicDir: join(options.userRoot, 'public'),
 
         define: getDefine(options),
@@ -121,7 +124,6 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
       }
 
       if (isInstalledGlobally) {
-        injection.cacheDir = join(options.pkgRoot, 'node_modules/.vite')
         // @ts-expect-error type cast
         injection.resolve.alias.vue = `${resolveImportPath('vue/dist/vue.esm-browser.js', true)}`
       }
diff --git a/packages/valaxy/node/plugins/markdown/transform/markdown.ts b/packages/valaxy/node/plugins/markdown/transform/markdown.ts
@@ -59,8 +59,10 @@ export function createTransformMarkdown(options: ResolvedValaxyOptions) {
 
     const loaderVuePath = path.resolve(options.pkgRoot, 'node/templates/loader.vue')
     let loaderVue = fs.readFileSync(loaderVuePath, 'utf-8')
+    const pagePath = pageData.relativePath.slice('/pages'.length - 1, -'.md'.length)
     loaderVue = loaderVue
-      .replace('/relativePath', pageData.relativePath.slice('/pages'.length - 1, -'.md'.length))
+      // adapt for /index
+      .replace('/relativePath', pagePath.endsWith('index') ? pagePath.replace(/\/index$/, '') : pagePath)
       .replace('// custom basic loader', `return JSON.parse(\`${JSON.stringify(pageData)}\`)`)
     code = loaderVue + code
 
diff --git a/packages/valaxy/package.json b/packages/valaxy/package.json
@@ -52,7 +52,7 @@
     "node": "^14.18.0 || >=16.0.0"
   },
   "scripts": {
-    "build": "rimraf dist && tsup --splitting",
+    "build": "rimraf dist && tsup",
     "dev": "tsup --watch",
     "preview": "vite preview",
     "preview-https": "serve dist"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,3 @@ components.d.ts`
`24`	`24`
`25`	`25`	`# test`
`26`	`26`	`valaxy-blog`
`27`		`-`