Merge pull request #165 from dev-five-git/fix-webpack-issue

Fix webpack issue

Author: owjs3901

.changeset/modern-bats-decide.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/webpack-plugin": patch
+---
+
+Fix webpack issue

packages/webpack-plugin/package.json

@@ -32,12 +32,10 @@
     "dist"
   ],
   "dependencies": {
-    "@devup-ui/wasm": "workspace:*",
-    "webpack": "^5.98"
+    "@devup-ui/wasm": "workspace:*"
   },
   "peerDependencies": {
-    "@devup-ui/wasm": "*",
-    "webpack": "*"
+    "@devup-ui/wasm": "*"
   },
   "devDependencies": {
     "vite": "^6.2.2",

packages/webpack-plugin/src/__tests__/plugin.test.ts

@@ -7,7 +7,12 @@ import {
 } from 'node:fs'
 import { join, resolve } from 'node:path'
 
-import { getCss, getThemeInterface, registerTheme } from '@devup-ui/wasm'
+import {
+  getCss,
+  getDefaultTheme,
+  getThemeInterface,
+  registerTheme,
+} from '@devup-ui/wasm'
 import { describe } from 'vitest'
 
 import { DevupUIWebpackPlugin } from '../plugin'
@@ -113,8 +118,11 @@ describe('devupUIPlugin', () => {
             tapAsync: vi.fn(),
           },
         },
-      }
-      plugin.apply(compiler as any)
+        webpack: {
+          DefinePlugin: vi.fn(),
+        },
+      } as any
+      plugin.apply(compiler)
       // asyncCompile
       const add = vi.fn()
       vi.mocked(compiler.hooks.afterCompile.tap).mock.calls[0][1]({
@@ -151,6 +159,9 @@ describe('devupUIPlugin', () => {
             tapAsync: vi.fn(),
           },
         },
+        webpack: {
+          DefinePlugin: vi.fn(),
+        },
       } as any)
 
       expect(writeFileSync).toHaveBeenCalledWith('css', '', {
@@ -184,6 +195,9 @@ describe('devupUIPlugin', () => {
             tapAsync: vi.fn(),
           },
         },
+        webpack: {
+          DefinePlugin: vi.fn(),
+        },
       } as any
       plugin.apply(compiler)
 
@@ -214,6 +228,9 @@ describe('devupUIPlugin', () => {
             tapAsync: vi.fn(),
           },
         },
+        webpack: {
+          DefinePlugin: vi.fn(),
+        },
       } as any
       vi.mocked(existsSync).mockReturnValue(true)
       plugin.apply(compiler)
@@ -297,6 +314,9 @@ describe('devupUIPlugin', () => {
           tapAsync: vi.fn(),
         },
       },
+      webpack: {
+        DefinePlugin: vi.fn(),
+      },
     } as any
     plugin.apply(compiler)
 
@@ -307,5 +327,8 @@ describe('devupUIPlugin', () => {
         encoding: 'utf-8',
       },
     )
+    expect(compiler.webpack.DefinePlugin).toHaveBeenCalledWith({
+      'process.env.DEVUP_UI_DEFAULT_THEME': JSON.stringify(getDefaultTheme()),
+    })
   })
 })

packages/webpack-plugin/src/plugin.ts

@@ -16,7 +16,7 @@ import {
   registerTheme,
   setDebug,
 } from '@devup-ui/wasm'
-import { type Compiler, DefinePlugin } from 'webpack'
+import { type Compiler } from 'webpack'
 
 export interface DevupUIWebpackPluginOptions {
   package: string
@@ -134,7 +134,7 @@ export class DevupUIWebpackPlugin {
       writeFileSync(this.options.cssFile, '', { encoding: 'utf-8' })
 
     compiler.options.plugins.push(
-      new DefinePlugin({
+      new compiler.webpack.DefinePlugin({
         'process.env.DEVUP_UI_DEFAULT_THEME': JSON.stringify(getDefaultTheme()),
       }),
     )