docs: 修复 DEMO 插件

dumlj · Oct 23, 2023 · 28d7635 · 28d7635
1 parent 362a81d
commit 28d7635
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/build.workflow.yml b/.github/workflows/build.workflow.yml
@@ -1,4 +1,4 @@
-name: build.workflow
+name: build
 
 on:
   push:

diff --git a/.github/workflows/gh-pages.workflow.yml b/.github/workflows/gh-pages.workflow.yml
@@ -1,4 +1,4 @@
-name: gh-pages.workflow
+name: gh-pages
 
 on: [workflow_dispatch]
 

diff --git a/@dumi-plugin/dumi-plugin-node-stackblitz/package.json b/@dumi-plugin/dumi-plugin-node-stackblitz/package.json
@@ -20,8 +20,7 @@
   "dependencies": {
     "tslib": "^2.5.0",
     "@dumlj/stackblitz-webpack-plugin": "^0.0.1",
-    "@dumlj/dumi-plugin-seed": "^0.0.1",
-    "lodash": "^4.17.21"
+    "@dumlj/dumi-plugin-seed": "^0.0.1"
   },
   "devDependencies": {
     "@jest/types": "^29.6.3",

diff --git a/@dumi-plugin/dumi-plugin-node-stackblitz/src/index.ts b/@dumi-plugin/dumi-plugin-node-stackblitz/src/index.ts
@@ -1,4 +1,3 @@
-import { trimEnd } from 'lodash'
 import { createDumiPlugin } from '@dumlj/dumi-plugin-seed'
 import { StackblitzWebpackPlugin, type StackblitzWebpackPluginOptions } from '@dumlj/stackblitz-webpack-plugin'
 
@@ -24,11 +23,5 @@ export default createDumiPlugin<NodeStackblitzOptions>('nodeStackblitz', async (
     },
   })
 
-  pushWebpackPlugin(
-    StackblitzWebpackPlugin.PLUGIN_NAME,
-    new StackblitzWebpackPlugin({
-      ...nodeStackblitz,
-      manifest: `${trimEnd(publicPath, '/')}/stackblitz-assets.json`,
-    })
-  )
+  pushWebpackPlugin(StackblitzWebpackPlugin.PLUGIN_NAME, new StackblitzWebpackPlugin({ ...nodeStackblitz, publicPath }))
 })
diff --git a/@webpack-plugin/stackblitz-webpack-plugin/package.json b/@webpack-plugin/stackblitz-webpack-plugin/package.json
@@ -19,7 +19,8 @@
     "glob": "^10.3.4",
     "tslib": "^2.5.0",
     "jszip": "^3.10.1",
-    "utility-types": "^3.10.0"
+    "utility-types": "^3.10.0",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@jest/types": "^29.6.3",

diff --git a/@webpack-plugin/stackblitz-webpack-plugin/src/StackblitzWebpackPlugin.ts b/@webpack-plugin/stackblitz-webpack-plugin/src/StackblitzWebpackPlugin.ts
@@ -1,3 +1,4 @@
+import { trimEnd, trimStart } from 'lodash'
 import { SeedWebpackPlugin, type SeedWebpackPluginOptions } from '@dumlj/seed-webpack-plugin'
 import { yarnWorkspaces, type ProjectInWorkspaces } from '@dumlj/shell-lib'
 import fs from 'fs-extra'
@@ -12,6 +13,7 @@ export interface Project extends ProjectInWorkspaces {
 }
 
 export interface StackblitzWebpackPluginOptions extends SeedWebpackPluginOptions {
+  publicPath?: string
   manifest?: string
   ignored?: string[]
   files?: string[]
@@ -20,13 +22,15 @@ export interface StackblitzWebpackPluginOptions extends SeedWebpackPluginOptions
 export class StackblitzWebpackPlugin extends SeedWebpackPlugin {
   static PLUGIN_NAME = 'stackblitz-webpack-plugin'
 
+  protected publicPath: string
   protected manifest: string
   protected ignored: string[]
   protected files: string[]
 
   constructor(options?: StackblitzWebpackPluginOptions) {
     super(options)
 
+    this.publicPath = options?.publicPath
     this.manifest = options?.manifest || '/stackblitz-assets.json'
     this.ignored = [].concat(options?.ignored || [], [
       '**/node_modules/**',
@@ -195,9 +199,14 @@ export class StackblitzWebpackPlugin extends SeedWebpackPlugin {
   }
 
   public applyScript(compiler: Compiler) {
-    const { context, webpack } = compiler
+    const { context, webpack, options } = compiler
+    const { output } = options || {}
+
+    const publicPath = this.publicPath || (typeof output.publicPath === 'string' ? output.publicPath : '/')
+    const finalPublicPath = trimEnd(publicPath, '/') + '/' + trimStart(this.manifest, '/')
+
     const plugins = [
-      new webpack.DefinePlugin({ __STACKBLITZ_MANIFEST__: JSON.stringify(this.manifest) }),
+      new webpack.DefinePlugin({ __STACKBLITZ_MANIFEST__: JSON.stringify(finalPublicPath) }),
       new webpack.EntryPlugin(context, path.join(__dirname, 'client'), {
         filename: 'dumlj.stackblitz-webpack-plugin.js',
       }),