fix: webpack.dev.js -> webpack.dev.conf.js

originjs · Jun 28, 2021 · 9690e76 · 9690e76
1 parent 0f82ad0
commit 9690e76
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -1,5 +1,3 @@
-import vite from 'vite';
-
 export interface Config {
     rootDir?: string;
     projectType?: string;
@@ -11,7 +9,7 @@ export interface DevServer {
     host?: string;
     open?: boolean;
     port?: number;
-    proxy?: Record<string, string | vite.ProxyOptions>;
+    proxy?: any;
     public?: string;
 }
 

diff --git a/src/config/parse.ts b/src/config/parse.ts
@@ -23,7 +23,7 @@ export async function parseWebpackConfig (
   }
   // default config files: webpack.base.js、webpack.dev.js、webpack.prod.js|webpack.build.js|webpack.production.js
   // TODO: production config
-  const devConfigPath = path.resolve(buildDir, 'webpack.dev.js')
+  const devConfigPath = path.resolve(buildDir, 'webpack.dev.conf.js')
   if (!fs.existsSync(devConfigPath)) {
     console.error(`${devConfigPath} not exists`)
     return webpackConfig

diff --git a/tests/parse.test.ts b/tests/parse.test.ts
@@ -13,9 +13,9 @@ test('parse webpack.config.js', async () => {
   expect(webpackConfig.entry).toEqual('./main.js');
 });
 
-test('parse build/webpack.dev.js', async () => {
+test('parse build/webpack.dev.conf.js', async () => {
   let webpackConfig: WebpackConfig = {};
-  const filePath = path.resolve('tests/testdata/webpack/build/webpack.dev.js');
+  const filePath = path.resolve('tests/testdata/webpack/build/webpack.dev.conf.js');
   await parseWebpackConfig(filePath).then(res => {
     webpackConfig = res
   })

diff --git a/tests/testdata/webpack/build/webpack.base.js → ...stdata/webpack/build/webpack.base.conf.js b/tests/testdata/webpack/build/webpack.base.js → ...stdata/webpack/build/webpack.base.conf.js
diff --git a/tests/testdata/webpack/build/webpack.dev.js → ...estdata/webpack/build/webpack.dev.conf.js b/tests/testdata/webpack/build/webpack.dev.js → ...estdata/webpack/build/webpack.dev.conf.js
@@ -1,6 +1,6 @@
 const webpack = require('webpack')
 const merge = require('webpack-merge')
-const baseWebpackConfig = require('./webpack.base.js')
+const baseWebpackConfig = require('./webpack.base.conf.js')
 
 const entry = {
   app: './src/app.js'