Skip to content

Commit

Permalink
新增配置输出,修复依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
Taoja committed Dec 30, 2019
1 parent df2def2 commit 489f1c7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6,221 deletions.
15 changes: 3 additions & 12 deletions config/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,15 @@ const webpack = require('webpack')
const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin')

const config = require('../lib/config')
const {isDev, dashboard} = require('../lib/args')
const {isDev} = require('../lib/args')

const setConf = require('../plugins/setConf')

if (dashboard) {
var Dashboard = require('webpack-dashboard');
var DashboardPlugin = require('webpack-dashboard/plugin');
var dashboardConfig = new Dashboard();
}

var plugins = [
new setConf(),
new FriendlyErrorsWebpackPlugin()
]
if (dashboard) {
plugins.push(new DashboardPlugin(dashboardConfig.setData))
} else {
plugins.push(new FriendlyErrorsWebpackPlugin())
}

if (isDev) {
plugins.push(new webpack.HotModuleReplacementPlugin())
}
Expand Down
6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
const rl = require('./lib/rl')
const env = require('./lib/env')
const { packages } = require('./lib/fs.js')
const { packages, packageConfig } = require('./lib/fs.js')

global._G = {}
global._G = {
config: packageConfig
}

var args = process.argv
var argEnv = args[0]
Expand Down
2 changes: 1 addition & 1 deletion lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const path = require('path')
const config = require(path.resolve(process.cwd(), 'webpack.config.js'))
class Config extends config {
get default () {
return this.webpack(_G.env, _G.packages, _G.entrys)
return this.webpack(_G.env, _G.packages, _G.entrys, _G.config)
}
}

Expand Down
Loading

0 comments on commit 489f1c7

Please sign in to comment.