feat: support memory destination

hemengke1997 · Sep 13, 2023 · b5c2c23 · b5c2c23
1 parent 62d6fd4
commit b5c2c23
Show file tree

Hide file tree

Showing 33 changed files with 238 additions and 174 deletions.
diff --git a/__test__/basic.spec.ts b/__test__/basic.spec.ts
@@ -28,8 +28,16 @@ vi.mock('fs-extra', async () => {
 
 function initCache() {
   const cache = new ManifestCache()
-  cache.setCache({ key: 'name', value: 'value' })
-  cache.setCache({ key: 'typescript', value: 'powerful' })
+  cache.set({
+    x: {
+      path: 'x.js',
+      _code: 'console.log("x")',
+    },
+    y: {
+      path: 'y.js',
+      _code: 'console.log("y")',
+    },
+  })
   return cache
 }
 
@@ -70,17 +78,17 @@ afterEach((ctx) => {
 
 describe('manifestCache', () => {
   test('should set cache and get cache right', ({ cache }) => {
-    expect(cache.getCache('name')).toBe('value')
+    expect(cache.getByKey('x')).toStrictEqual({ path: 'x.js', _code: 'console.log("x")' })
   })
 
   test('should remove cache', ({ cache }) => {
-    cache.removeCache('name')
+    cache.remove('x')
 
-    expect(cache.getCache('name')).toBeFalsy()
+    expect(cache.getByKey('x')).toBeFalsy()
   })
 
   test('should get all', ({ cache }) => {
-    const v = cache.getAll()
+    const v = cache.get()
     expect(Object.keys(v).length === 2).toBe(true)
   })
 
@@ -102,7 +110,7 @@ describe('manifestCache', () => {
     {
       const content = fs.readFileSync(manifestPath, 'utf-8')
       const c = initCache()
-      expect(eq(JSON.parse(content), c.getAll())).toBe(true)
+      expect(eq(JSON.parse(content), c.extractPath(c.get()))).toBe(true)
     }
   })
 })
diff --git a/__test__/utils.spec.ts b/__test__/utils.spec.ts
@@ -9,7 +9,7 @@ import {
   setEol,
   validateOptions,
 } from '../src/helper/utils'
-import { getGlobalConfig, setGlobalConfig } from '../src/helper/GlobalConfigBuilder'
+import { globalConfigBuilder } from '../src/helper/GlobalConfigBuilder'
 
 describe('vite-plugin-public-typescript', () => {
   it('should return true when filePath is a public typescript file', () => {
@@ -70,14 +70,8 @@ describe('vite-plugin-public-typescript', () => {
     expect(a).toBe(b)
   })
 
-  test('should getGlobalConfig throw error', () => {
-    expect(() => getGlobalConfig()).toThrowError('init')
-  })
-
   test('should get globalConfig', () => {
-    // @ts-expect-error
-    setGlobalConfig({ config: { publicDir: 'public' }, inputDir: 'publicTypescript' })
-    expect(() => getGlobalConfig()).not.toThrowError()
+    expect(() => globalConfigBuilder.get()).not.toThrowError()
   })
 
   test('should extract hash', () => {
@@ -96,22 +90,9 @@ describe('vite-plugin-public-typescript', () => {
       ssrBuild: false,
       esbuildOptions: {},
       sideEffects: false,
-    }
+      destination: 'file',
+    } as const
 
     expect(() => validateOptions(opts)).not.toThrowError()
   })
-
-  test('should validate options throw error', () => {
-    const opts = {
-      inputDir: '/publicTypescript/foo',
-      outputDir: 'js',
-      manifestName: 'manifest',
-      hash: true,
-      ssrBuild: false,
-      esbuildOptions: {},
-      sideEffects: false,
-    }
-
-    expect(() => validateOptions(opts)).toThrowError('dir')
-  })
 })
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
     "esbuild": "^0.17.12",
     "fs-extra": "^11.1.1",
     "on-change": "^4.0.2",
+    "sirv": "^2.0.3",
     "tiny-glob": "^0.2.9",
     "watcher": "^2.2.2"
   },

diff --git a/playground/spa/index.html b/playground/spa/index.html
@@ -11,6 +11,7 @@
 <body>
   <div id="root"></div>
 
+  </script>
   <script type="module" src="/src/main.tsx"></script>
 
 

diff --git a/playground/spa/package.json b/playground/spa/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "dev": "vite",
-    "debug": "cross-env DEBUG='*===>*' vite",
+    "debug": "cross-env DEBUG='MemoryCacheProcessor*,index*,ManifestCache*' vite",
     "build": "vite build",
     "preview": "vite preview"
   },

diff --git a/playground/spa/publicTypescript/haha.ts → playground/spa/public-typescript/haha.ts b/playground/spa/publicTypescript/haha.ts → playground/spa/public-typescript/haha.ts
diff --git a/playground/spa/publicTypescript/index.ts → playground/spa/public-typescript/index.ts b/playground/spa/publicTypescript/index.ts → playground/spa/public-typescript/index.ts
diff --git a/playground/spa/public-typescript/manifest.json b/playground/spa/public-typescript/manifest.json
@@ -0,0 +1,5 @@
+{
+  "haha": "/js/haha.bdaaba63.js",
+  "index": "/js/index.cccf1b56.js",
+  "test": "/js/test.40879d01.js"
+}
diff --git a/playground/spa/public-typescript/test.ts b/playground/spa/public-typescript/test.ts
@@ -0,0 +1 @@
+console.log('this is a')
diff --git a/playground/spa/publicTypescript/manifest.json b/playground/spa/publicTypescript/manifest.json
diff --git a/playground/spa/publicTypescript/test.ts b/playground/spa/publicTypescript/test.ts
diff --git a/playground/spa/src/App.tsx b/playground/spa/src/App.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import manifest from '../publicTypescript/manifest.json'
+import manifest from '../public-typescript/manifest.json'
 import reactLogo from './assets/react.svg'
 import './App.css'
 

diff --git a/playground/spa/temp/1.js b/playground/spa/temp/1.js
@@ -0,0 +1 @@
+console.log('temp')
diff --git a/playground/spa/tsconfig.json b/playground/spa/tsconfig.json
@@ -18,7 +18,7 @@
     "baseUrl": ".",
     "types": ["vite/client"]
   },
-  "include": ["src", "publicTypescript"],
+  "include": ["src", "public-typescript"],
   "references": [{ "path": "./tsconfig.node.json" }],
   "exclude": ["**/*.js"]
 }
diff --git a/playground/spa/tsconfig.node.json b/playground/spa/tsconfig.node.json
@@ -7,5 +7,5 @@
     "resolveJsonModule": true,
     "baseUrl": "."
   },
-  "include": ["vite.config.ts", "./publicTypescript/manifest.json"]
+  "include": ["vite.config.ts", "public-typescript/manifest.json"]
 }
diff --git a/playground/spa/vite.config.ts b/playground/spa/vite.config.ts
@@ -1,45 +1,37 @@
-import path from 'path'
 import type { HtmlTagDescriptor } from 'vite'
 import { defineConfig } from 'vite'
 import { publicTypescript } from 'vite-plugin-public-typescript'
 import react from '@vitejs/plugin-react'
-import glob from 'tiny-glob'
-import manifest from './publicTypescript/manifest.json'
+import manifest from './public-typescript/manifest.json'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  build: {
-    rollupOptions: {
-      external: ['virtual:my-module'],
-    },
-  },
   define: {
     haha: JSON.stringify('custom define!'),
     app: JSON.stringify({ hello: 'world' }),
   },
   plugins: [
     react(),
     publicTypescript({
-      inputDir: 'publicTypescript',
+      inputDir: 'public-typescript',
       manifestName: 'manifest',
       hash: true,
-      outputDir: '/',
-      buildDestination: 'memory',
+      outputDir: '/js',
+      destination: 'memory',
     }),
 
     {
       name: 'add-script',
       async transformIndexHtml(html) {
-        const scripts = await glob('./public/*.js')
-        const tags: HtmlTagDescriptor[] = scripts.map((s) => {
-          return {
+        const tags: HtmlTagDescriptor[] = [
+          {
             tag: 'script',
             attrs: {
-              src: manifest[path.parse(s).name.split('.')[0]],
+              src: manifest.test,
             },
-            injectTo: 'head-prepend',
-          }
-        })
+            injectTo: 'body',
+          },
+        ]
 
         return {
           html,

diff --git a/playground/ssr/public-typescript/manifest.json b/playground/ssr/public-typescript/manifest.json
@@ -0,0 +1,3 @@
+{
+  "ssr": "/ssr.2507f2a9.js"
+}
diff --git a/playground/ssr/publicTypescript/ssr.ts → playground/ssr/public-typescript/ssr.ts b/playground/ssr/publicTypescript/ssr.ts → playground/ssr/public-typescript/ssr.ts
diff --git a/playground/ssr/public/ssr.4c5dba79.js b/playground/ssr/public/ssr.4c5dba79.js
diff --git a/playground/ssr/publicTypescript/custom-manifest.json b/playground/ssr/publicTypescript/custom-manifest.json
diff --git a/playground/ssr/server.js b/playground/ssr/server.js
@@ -1,6 +1,6 @@
 import fs from 'fs/promises'
 import express from 'express'
-import manifest from './publicTypescript/custom-manifest.json' assert { type: 'json' }
+import manifest from './public-typescript/manifest.json' assert { type: 'json' }
 
 // Constants
 const isProduction = process.env.NODE_ENV === 'production'

diff --git a/playground/ssr/vite.config.ts b/playground/ssr/vite.config.ts
@@ -3,5 +3,5 @@ import { publicTypescript } from 'vite-plugin-public-typescript'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [publicTypescript()],
+  plugins: [publicTypescript({ destination: 'memory' })],
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/helper/AbsCacheProcessor.ts b/src/helper/AbsCacheProcessor.ts
@@ -1,3 +1,6 @@
+import { normalizePath } from 'vite'
+import type { TGlobalConfig } from './GlobalConfigBuilder'
+
 export interface IDeleteFile {
   fileName: string
   jsFileName?: string
@@ -13,4 +16,28 @@ export interface IAddFile {
 export abstract class AbsCacheProcessor {
   abstract deleteOldJs(args: IDeleteFile): Promise<void>
   abstract addNewJs(args: IAddFile): Promise<void>
+  setCache(args: IAddFile, globalConfig: TGlobalConfig) {
+    const { contentHash, code = '', fileName } = args
+    const { cache, outputDir } = globalConfig
+
+    function getOutputPath(p: string, hash?: string) {
+      hash = hash ? `.${hash}` : ''
+      return normalizePath(`${p}/${fileName}${hash}.js`)
+    }
+
+    let outPath = getOutputPath(outputDir)
+    if (contentHash) {
+      outPath = getOutputPath(outputDir, contentHash)
+    }
+
+    cache.set({
+      [fileName]: {
+        path: outPath,
+        _code: code,
+        _hash: contentHash,
+      },
+    })
+
+    return outPath
+  }
 }