umbrella22

修正当build:web命令下,编译后白屏的问题

1 'use strict' 1 'use strict'
2 2
3 -process.env.BABEL_ENV = 'renderer' 3 +const IsWeb = process.env.BUILD_TARGET === 'web'
4 +process.env.BABEL_ENV = IsWeb ? 'web' : 'renderer'
4 5
5 const path = require('path') 6 const path = require('path')
6 const { dependencies } = require('../package.json') 7 const { dependencies } = require('../package.json')
7 const webpack = require('webpack') 8 const webpack = require('webpack')
8 const config = require('../config') 9 const config = require('../config')
9 const { styleLoaders } = require('./utils') 10 const { styleLoaders } = require('./utils')
10 -const IsWeb = process.env.ENV_TARGET === 'web'
11 11
12 const CopyWebpackPlugin = require('copy-webpack-plugin') 12 const CopyWebpackPlugin = require('copy-webpack-plugin')
13 const MiniCssExtractPlugin = require('mini-css-extract-plugin') 13 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
...@@ -30,12 +30,8 @@ let whiteListedModules = IsWeb ? [] : ['vue', "element-ui"] ...@@ -30,12 +30,8 @@ let whiteListedModules = IsWeb ? [] : ['vue', "element-ui"]
30 30
31 let rendererConfig = { 31 let rendererConfig = {
32 devtool: 'eval-source-map', 32 devtool: 'eval-source-map',
33 - entry: { 33 + entry: IsWeb ? { web: path.join(__dirname, '../src/renderer/main.js') } : { renderer: resolve('src/renderer/main.js') },
34 - renderer: resolve('src/renderer/main.js') 34 + // externals: IsWeb ? [] : [...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))],
35 - },
36 - externals: [
37 - ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
38 - ],
39 module: { 35 module: {
40 rules: [ 36 rules: [
41 { 37 {
...@@ -127,7 +123,6 @@ let rendererConfig = { ...@@ -127,7 +123,6 @@ let rendererConfig = {
127 ], 123 ],
128 output: { 124 output: {
129 filename: '[name].js', 125 filename: '[name].js',
130 - libraryTarget: IsWeb ? 'var' : 'commonjs2',
131 path: IsWeb ? path.join(__dirname, '../dist/web') : path.join(__dirname, '../dist/electron') 126 path: IsWeb ? path.join(__dirname, '../dist/web') : path.join(__dirname, '../dist/electron')
132 }, 127 },
133 resolve: { 128 resolve: {
...@@ -137,11 +132,12 @@ let rendererConfig = { ...@@ -137,11 +132,12 @@ let rendererConfig = {
137 }, 132 },
138 extensions: ['.js', '.vue', '.json', '.css', '.node'] 133 extensions: ['.js', '.vue', '.json', '.css', '.node']
139 }, 134 },
140 - target: 'electron-renderer' 135 + target: IsWeb ? 'web' : 'electron-renderer'
141 } 136 }
142 // 将css相关得loader抽取出来 137 // 将css相关得loader抽取出来
143 rendererConfig.module.rules = rendererConfig.module.rules.concat(styleLoaders({ sourceMap: config.dev.cssSourceMap })) 138 rendererConfig.module.rules = rendererConfig.module.rules.concat(styleLoaders({ sourceMap: config.dev.cssSourceMap }))
144 139
140 +
145 /** 141 /**
146 * Adjust rendererConfig for development settings 142 * Adjust rendererConfig for development settings
147 */ 143 */
......