fix: skip ssr build, fix babel target bug

hemengke1997 · Apr 26, 2024 · fdbf5f4 · fdbf5f4
1 parent 354a827
commit fdbf5f4
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -67,7 +67,6 @@ pnpm add vite-plugin-public-typescript -D
 | manifestName    | `string`                               | `manifest`                                    | `manifest` 的文件名                            |
 | hash            | `boolean`                              | `true`                                        | 编译后的 `js` 是否生成 `hash `                 |
 | esbuildOptions  | `BuildOptions`                         | `{}`                                          | esbuild 构建选项                               |
-| ssrBuild        | `boolean`                              | `false`                                       | 当前打包环境是否是 ssr                         |
 | ~~sideEffects~~ | `boolean`                              | `true`                                        | 是否编译三方库(v2.0.0废弃⚠️)                    |
 | destination     | `string`                               | `memory`                                      | 输出模式：内存模式 \| 文件模式                 |
 | cacheDir        | `string`                               | `node_modules/.vite-plugin-public-typescript` | 存放manifest缓存的目录                         |

diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
   "author": "hemengke <https://github.com/hemengke1997>",
   "files": [
     "*.d.ts",
-    "CHANGELOG.md",
     "README.md",
     "dist",
     "package.json"
@@ -38,7 +37,9 @@
       "types": "./dist/client/index.d.ts",
       "require": "./dist/client/index.cjs",
       "import": "./dist/client/index.js"
-    }
+    },
+    "./package.json": "./package.json",
+    "./*": "./*"
   },
   "scripts": {
     "dev": "simple-git-hooks && tsup --watch",
@@ -53,10 +54,10 @@
     "up": "pnpm update --i --L",
     "taze": "taze -I -w",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "bump": "bumpp package.json -c -p -t --all -x \"pnpm run changelog\""
+    "bump": "bumpp package.json -c --no-push -t --all -x \"pnpm run changelog\""
   },
   "peerDependencies": {
-    "vite": ">=4.0.0"
+    "vite": ">=4.0.0 || >=5.0.0"
   },
   "dependencies": {
     "@antfu/install-pkg": "^0.1.1",

diff --git a/playground/ssr/server.js b/playground/ssr/server.js
@@ -77,13 +77,15 @@ export async function createServer(root = process.cwd(), isProd = process.env.NO
 
       let html = template.replace(`<!--app-html-->`, appHtml)
 
-      html = injectScriptsToHtml(html, (manifest) => [
-        {
-          attrs: {
-            src: manifest.ssr,
+      html = injectScriptsToHtml(html, (manifest) => {
+        return [
+          {
+            attrs: {
+              src: manifest.ssr,
+            },
           },
-        },
-      ])
+        ]
+      })
 
       res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
     } catch (e) {

diff --git a/playground/ssr/vite.config.js b/playground/ssr/vite.config.js
@@ -3,7 +3,7 @@ import { defineConfig } from 'vite'
 import { publicTypescript } from 'vite-plugin-public-typescript'
 
 export default defineConfig({
-  plugins: [react(), publicTypescript()],
+  plugins: [react(), publicTypescript({ babel: true })],
   build: {
     minify: false,
   },

diff --git a/src/node/build/babel.ts b/src/node/build/babel.ts
@@ -35,7 +35,7 @@ function loadPlugin(path: string): Promise<any> {
   const cached = loadedPlugin.get(path)
   if (cached) return cached
 
-  const promise = import(path).then((module) => {
+  const promise = import(/* @vite-ignore */ path).then((module) => {
     const value = module.default || module
     loadedPlugin.set(path, value)
     return value

diff --git a/src/node/build/index.ts b/src/node/build/index.ts
@@ -62,8 +62,12 @@ export async function esbuildTypescript(buildOptions: IBuildOptions) {
   if (enableBabel) {
     const { default: browserslist } = await import('browserslist')
     babelTarget = browserslist.loadConfig({ path: viteConfig.root }) || []
-    const { resolveToEsbuildTarget } = await import('esbuild-plugin-browserslist')
-    esbuildTarget = resolveToEsbuildTarget(browserslist(babelTarget), { printUnknownTargets: false })
+    if (!babelTarget.length) {
+      esbuildTarget = [DEFAULT_ESBUILD_TARGET]
+    } else {
+      const { resolveToEsbuildTarget } = await import('esbuild-plugin-browserslist')
+      esbuildTarget = resolveToEsbuildTarget(browserslist(babelTarget), { printUnknownTargets: false })
+    }
   }
 
   const esbuildPlugins = enableBabel

diff --git a/src/node/index.ts b/src/node/index.ts
@@ -134,6 +134,8 @@ export default function publicTypescript(options: VPPTPluginOptions = {}) {
         await initWatcher((file) => reloadPage(ws, file))
       },
       async buildStart() {
+        if (viteConfig.build.ssr) return
+
         const manifestPath = manifestCache.manifestPath
 
         fs.ensureFileSync(manifestPath)
@@ -198,6 +200,7 @@ export default function publicTypescript(options: VPPTPluginOptions = {}) {
         await buildAllOnce(originFilesGlob)
       },
       generateBundle() {
+        if (viteConfig.build.ssr) return
         if (opts.destination === 'memory') {
           const c = manifestCache.all
           Object.keys(c).forEach((key) => {

diff --git a/tests/utils.test.ts b/tests/utils.test.ts
@@ -90,7 +90,6 @@ describe('unit test', () => {
       manifestName: 'manifest',
       outputDir: '/',
       sideEffects: false,
-      ssrBuild: false,
       cacheDir: 'node_modules/.vite-plugin-public-typescript',
     } as const