fix: unit test error & set configName optional

iamspark1e · Oct 16, 2023 · 7d268f7 · 7d268f7
1 parent 1e783c0
commit 7d268f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -15,7 +15,7 @@ export type ExperimentalPluginOption = {
 
 export type MergedPluginOption = {
     entryName: string;                 // default:main.js
-    configName: string;
+    configName?: string;
     ejsOption?: EjsOption;
     sharedData?: object;                // will be merged into every page's data
     enableDevDirectory: boolean;

diff --git a/tests/vite-lifecycles.test.ts b/tests/vite-lifecycles.test.ts
@@ -9,7 +9,7 @@ import {
 import fs from "node:fs";
 // Test functions
 import { prepareTempEntries, cleanTempEntries } from "../src/template";
-import { MergedPluginOption, PluginCustomizedError } from "../src/types.js";
+import { MergedPluginOption, PluginCustomizedError, PluginOption } from "../src/types.js";
 import Entries from "../src/core";
 
 const pluginOption: MergedPluginOption = {
@@ -23,7 +23,7 @@ describe("Test plugin's lifecycle - buildStart", () => {
         entries = new Entries({
             root: "tests/example/src"
         }, pluginOption)
-        prepareTempEntries(entries.entries);
+        prepareTempEntries(entries.entries, pluginOption);
     })
 
     it("common project struct, should use user defined template", () => {
@@ -92,7 +92,7 @@ describe("Test plugin's lifecycle - buildStart (with incorrect configuration)",
 
     it("no config.json detect, will break build progress", () => {
         try {
-            prepareTempEntries(entries.entries);
+            prepareTempEntries(entries.entries, pluginOption);
         } catch (e) {
             expect(e).toBeInstanceOf(PluginCustomizedError)
             expect(e.message).toBe("[vite-plugin-auto-mpa-html]: Page entry: no-config, its config (config.json) cannot be found, please check!")
@@ -106,17 +106,18 @@ describe("Test plugin's lifecycle - buildStart (with incorrect configuration)",
 
 describe("Test plugin's lifecycle - buildStart (with experimental feature)", () => {
     let entries: Entries;
+    const pluginOpt: MergedPluginOption = {
+        enableDevDirectory: false,
+        entryName: "main.jsx",
+        experimental: {
+            customTemplateName: ".html",
+        }
+    }
     beforeAll(() => {
         entries = new Entries({
             root: "tests/example/src"
-        }, {
-            enableDevDirectory: false,
-            entryName: "main.jsx",
-            experimental: {
-                customTemplateName: ".html",
-            }
-        })
-        prepareTempEntries(entries.entries);
+        }, pluginOpt)
+        prepareTempEntries(entries.entries, pluginOpt);
     })
 
     it("temporary entries should be generated with experimental features", () => {