Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-15 15:38:22 +08:00
5 changed files with 44 additions and 51 deletions
+1 -14
View File
@@ -7,12 +7,7 @@ import {
outputFileSync,
} from 'fs-extra';
import { merge } from 'webpack-merge';
import {
SRC_DIR,
getVantConfig,
ROOT_WEBPACK_CONFIG_FILE,
ROOT_POSTCSS_CONFIG_FILE,
} from './constant';
import { SRC_DIR, getVantConfig, ROOT_WEBPACK_CONFIG_FILE } from './constant';
import { WebpackConfig } from './types';
export const EXT_REGEXP = /\.\w+$/;
@@ -118,14 +113,6 @@ export function getWebpackConfig(defaultConfig: WebpackConfig): WebpackConfig {
return defaultConfig;
}
export function getPostcssConfig() {
if (existsSync(ROOT_POSTCSS_CONFIG_FILE)) {
return require(ROOT_POSTCSS_CONFIG_FILE);
}
return {};
}
export type ModuleEnv = 'esmodule' | 'commonjs';
export type NodeEnv = 'production' | 'development' | 'test';
export type BuildTarget = 'site' | 'package';