chore: support vite 2.8.0

anncwb · anncwb · commit e86d61332eba · 2022-02-10T10:17:45.000+08:00
diff --git a/package.json b/package.json
@@ -27,24 +27,24 @@
     "@commitlint/config-conventional": "^16.0.0",
     "@types/html-minifier-terser": "^6.1.0",
     "@types/jsdom": "^16.2.14",
-    "@types/node": "^17.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
+    "@types/node": "^17.0.16",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.0",
     "commitizen": "^4.2.4",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
     "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-html": "^6.2.0",
     "husky": "^7.0.4",
-    "lint-staged": "^12.3.2",
+    "lint-staged": "^12.3.3",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "tsup": "^5.11.11",
+    "tsup": "^5.11.13",
     "typescript": "^4.5.5",
     "unbuild": "^0.6.9",
-    "vite": "^2.7.13",
-    "vitest": "^0.2.5"
+    "vite": "^2.8.0",
+    "vitest": "^0.3.0"
   },
   "lint-staged": {
     "*": [
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -46,8 +46,8 @@
     "colorette": "^2.0.16",
     "connect-history-api-fallback": "^1.6.0",
     "consola": "^2.15.3",
-    "dotenv": "^14.3.2",
-    "dotenv-expand": "^6.0.1",
+    "dotenv": "^16.0.0",
+    "dotenv-expand": "^8.0.1",
     "ejs": "^3.1.6",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
@@ -62,8 +62,8 @@
     "@types/ejs": "^3.1.0",
     "@types/fs-extra": "^9.0.13",
     "@types/html-minifier-terser": "^6.1.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.16",
     "typescript": "^4.5.5",
-    "vite": "^2.7.13"
+    "vite": "^2.8.0"
   }
 }
diff --git a/packages/core/src/htmlPlugin.ts b/packages/core/src/htmlPlugin.ts
@@ -1,4 +1,4 @@
-import type { ResolvedConfig, Plugin, TransformResult } from 'vite'
+import type { ResolvedConfig, PluginOption, TransformResult } from 'vite'
 import type { InjectOptions, PageOption, Pages, UserOptions } from './typing'
 import { render } from 'ejs'
 import { cleanUrl, isDirEmpty, loadEnv } from './utils'
@@ -17,8 +17,13 @@ const ignoreDirs = ['.', '', '/']
 
 const bodyInjectRE = /<\/body>/
 
-export function createPlugin(userOptions: UserOptions = {}): Plugin {
-  const { entry, template = DEFAULT_TEMPLATE, pages = [] } = userOptions
+export function createPlugin(userOptions: UserOptions = {}): PluginOption {
+  const {
+    entry,
+    template = DEFAULT_TEMPLATE,
+    pages = [],
+    verbose = false,
+  } = userOptions
 
   let viteConfig: ResolvedConfig
   let env: Record<string, any> = {}
@@ -31,13 +36,16 @@ export function createPlugin(userOptions: UserOptions = {}): Plugin {
       env = loadEnv(viteConfig.mode, viteConfig.root, '')
     },
     config(conf) {
-      return mergeConfig(conf, {
-        build: {
-          rollupOptions: {
-            input: createInput(userOptions, conf as unknown as ResolvedConfig),
+      const input = createInput(userOptions, conf as unknown as ResolvedConfig)
+      if (input) {
+        return {
+          build: {
+            rollupOptions: {
+              input,
+            },
           },
-        },
-      })
+        }
+      }
     },
 
     configureServer(server) {
@@ -68,6 +76,7 @@ export function createPlugin(userOptions: UserOptions = {}): Plugin {
             viteConfig,
             env,
             entry: page.entry || entry,
+            verbose,
           })
           html = await server.transformIndexHtml?.(url, html, req.originalUrl)
           res.end(html)
@@ -88,6 +97,7 @@ export function createPlugin(userOptions: UserOptions = {}): Plugin {
             viteConfig,
             env,
             entry: page.entry || entry,
+            verbose,
           }).then((resultHtml) => {
             return {
               code: resultHtml,
@@ -180,9 +190,10 @@ export async function renderHtml(
     viteConfig: ResolvedConfig
     env: Record<string, any>
     entry?: string
+    verbose?: boolean
   },
 ) {
-  const { injectOptions, viteConfig, env, entry } = config
+  const { injectOptions, viteConfig, env, entry, verbose } = config
   const { data, ejsOptions } = injectOptions
 
   const ejsData: Record<string, any> = {
@@ -194,7 +205,7 @@ export async function renderHtml(
   let result = await render(html, ejsData, ejsOptions)
 
   if (entry) {
-    result = removeEntryScript(result)
+    result = removeEntryScript(result, verbose)
     result = result.replace(
       bodyInjectRE,
       `<script type="module" src="${normalizePath(
@@ -224,7 +235,7 @@ function isMpa(viteConfig: ResolvedConfig) {
   return typeof input !== 'string' && Object.keys(input || {}).length > 1
 }
 
-export function removeEntryScript(html: string) {
+export function removeEntryScript(html: string, verbose = false) {
   if (!html) {
     return html
   }
@@ -236,7 +247,8 @@ export function removeEntryScript(html: string) {
     removedNode.push(item.toString())
     item.parentNode.removeChild(item)
   })
-  removedNode.length &&
+  verbose &&
+    removedNode.length &&
     consola.warn(`vite-plugin-html: Since you have already configured entry, ${dim(
       removedNode.toString(),
     )} is deleted. You may also delete it from the index.html.
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,11 +1,13 @@
-import type { Plugin } from 'vite'
+import type { PluginOption } from 'vite'
 import type { UserOptions } from './typing'
 import { createPlugin } from './htmlPlugin'
 import { createMinifyHtmlPlugin } from './minifyHtml'
 import consola from 'consola'
 
 consola.wrapConsole()
 
-export function createHtmlPlugin(userOptions: UserOptions = {}): Plugin[] {
+export function createHtmlPlugin(
+  userOptions: UserOptions = {},
+): PluginOption[] {
   return [createPlugin(userOptions), createMinifyHtmlPlugin(userOptions)]
 }
diff --git a/packages/core/src/minifyHtml.ts b/packages/core/src/minifyHtml.ts
@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite'
+import type { PluginOption } from 'vite'
 import type { UserOptions } from './typing'
 import type { Options as MinifyOptions } from 'html-minifier-terser'
 import { minify as minifyFn } from 'html-minifier-terser'
@@ -36,7 +36,7 @@ export async function minifyHtml(
 
 export function createMinifyHtmlPlugin({
   minify = true,
-}: UserOptions = {}): Plugin {
+}: UserOptions = {}): PluginOption {
   return {
     name: 'vite:minify-html',
     // apply: 'build',
diff --git a/packages/core/src/typing.ts b/packages/core/src/typing.ts
@@ -49,4 +49,10 @@ export interface UserOptions {
    * @description inject options
    */
   inject?: InjectOptions
+
+  /**
+   * output warning log
+   * @default false
+   */
+  verbose?: boolean
 }
diff --git a/packages/playground/basic/package.json b/packages/playground/basic/package.json
@@ -7,12 +7,12 @@
   },
   "dependencies": {
     "vite-plugin-html": "workspace:*",
-    "vue": "^3.2.29",
+    "vue": "^3.2.30",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^2.1.0",
-    "@vue/compiler-sfc": "^3.2.29",
-    "vite": "^2.7.13"
+    "@vitejs/plugin-vue": "^2.2.0",
+    "@vue/compiler-sfc": "^3.2.30",
+    "vite": "^2.8.0"
   }
 }
diff --git a/packages/playground/mpa/package.json b/packages/playground/mpa/package.json
@@ -8,11 +8,11 @@
   },
   "dependencies": {
     "vite-plugin-html": "workspace:*",
-    "vue": "^3.2.29"
+    "vue": "^3.2.30"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^2.1.0",
-    "@vue/compiler-sfc": "^3.2.29",
-    "vite": "^2.7.13"
+    "@vitejs/plugin-vue": "^2.2.0",
+    "@vue/compiler-sfc": "^3.2.30",
+    "vite": "^2.8.0"
   }
 }
diff --git a/packages/playground/mpa/public/index.html b/packages/playground/mpa/public/index.html
@@ -9,5 +9,6 @@
 
   <body>
     <div id="app"></div>
+    <div>index app</div>
   </body>
 </html>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
