Clean up code
This commit is contained in:
@@ -1,9 +1,5 @@
|
||||
'use strict'
|
||||
|
||||
const loadEnv = require('../utils/loadEnv')
|
||||
loadEnv()
|
||||
loadEnv('production')
|
||||
|
||||
const rm = require('rimraf')
|
||||
const webpack = require('webpack')
|
||||
|
||||
|
||||
@@ -14,9 +14,6 @@ const genStyleRules = () => {
|
||||
esModule: false, // css-loader using ES Modules as default in v4, but vue-style-loader support cjs only.
|
||||
},
|
||||
}
|
||||
const postcssLoader = {
|
||||
loader: 'postcss-loader'
|
||||
}
|
||||
const extractPluginLoader = {
|
||||
loader: MiniCssExtractPlugin.loader,
|
||||
}
|
||||
@@ -25,7 +22,7 @@ const genStyleRules = () => {
|
||||
}
|
||||
|
||||
function createCSSRule(test, loader, loaderOptions) {
|
||||
const loaders = [cssLoader, postcssLoader]
|
||||
const loaders = [cssLoader]
|
||||
|
||||
if (isProd) {
|
||||
loaders.unshift(extractPluginLoader)
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
'use strict'
|
||||
|
||||
const path = require('path')
|
||||
const dotenv = require('dotenv')
|
||||
const dotenvExpand = require('dotenv-expand')
|
||||
const { error } = require('./logger')
|
||||
|
||||
module.exports = function loadEnv(mode) {
|
||||
const basePath = path.resolve(process.cwd(), `.env${mode ? `.${mode}` : ``}`)
|
||||
const localPath = `${basePath}.local`
|
||||
|
||||
const load = (envPath) => {
|
||||
try {
|
||||
const env = dotenv.config({ path: envPath, debug: process.env.DEBUG })
|
||||
dotenvExpand(env)
|
||||
} catch (err) {
|
||||
// only ignore error if file is not found
|
||||
if (err.toString().indexOf('ENOENT') < 0) {
|
||||
error(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
load(localPath)
|
||||
load(basePath)
|
||||
|
||||
// by default, NODE_ENV and BABEL_ENV are set to "development" unless mode
|
||||
// is production or test. However the value in .env files will take higher
|
||||
// priority.
|
||||
if (mode) {
|
||||
const defaultNodeEnv = mode === 'production' || mode === 'test' ? mode : 'development'
|
||||
if (process.env.NODE_ENV == null) {
|
||||
process.env.NODE_ENV = defaultNodeEnv
|
||||
}
|
||||
if (process.env.BABEL_ENV == null) {
|
||||
process.env.BABEL_ENV = defaultNodeEnv
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user