blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

types(cli): fix WebpackConfig type

Browse Source
This commit is contained in:
chenjiahan 2020-07-04 17:56:47 +08:00
parent 4aff784d65
commit c0308e9b96
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vant-cli/package.json
View File

@ -36,8 +36,6 @@
"@types/fs-extra": "^9.0.1", "@types/fs-extra": "^9.0.1",
"@types/lodash": "^4.14.153", "@types/lodash": "^4.14.153",
"@types/postcss-load-config": "^2.0.1", "@types/postcss-load-config": "^2.0.1",
"@types/webpack": "^4.41.13",
"@types/webpack-dev-server": "^3.11.0",
"@types/webpack-merge": "^4.1.5" "@types/webpack-merge": "^4.1.5"
}, },
"dependencies": { "dependencies": {
@ -49,6 +47,8 @@
"@babel/preset-typescript": "^7.10.1", "@babel/preset-typescript": "^7.10.1",
"@nuxt/friendly-errors-webpack-plugin": "^2.5.0", "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
"@types/jest": "^25.2.3", "@types/jest": "^25.2.3",
"@types/webpack": "^4.41.13",
"@types/webpack-dev-server": "^3.11.0",
"@vant/eslint-config": "^2.2.2", "@vant/eslint-config": "^2.2.2",
"@vant/markdown-loader": "^2.3.0", "@vant/markdown-loader": "^2.3.0",
"@vant/markdown-vetur": "^2.0.1", "@vant/markdown-vetur": "^2.0.1",

6
packages/vant-cli/src/common/types.ts Normal file
View File

@ -0,0 +1,6 @@
import type Webpack from 'webpack';
import type WebpackDevServer from 'webpack-dev-server';
export type WebpackConfig = Webpack.Configuration & {
devServer?: WebpackDevServer.Configuration;
};

3
packages/vant-cli/src/config/webpack.base.ts
View File

@ -4,6 +4,7 @@ import { VueLoaderPlugin } from 'vue-loader';
import { join } from 'path'; import { join } from 'path';
import { existsSync } from 'fs'; import { existsSync } from 'fs';
import { consola } from '../common/logger'; import { consola } from '../common/logger';
import { WebpackConfig } from '../common/types';
import { import {
CWD, CWD,
CACHE_DIR, CACHE_DIR,
@ -61,7 +62,7 @@ if (existsSync(tsconfigPath)) {
); );
} }
export const baseConfig = { export const baseConfig: WebpackConfig = {
mode: 'development', mode: 'development',
resolve: { resolve: {
extensions: [...SCRIPT_EXTS, ...STYLE_EXTS], extensions: [...SCRIPT_EXTS, ...STYLE_EXTS],

3
packages/vant-cli/src/config/webpack.package.ts
View File

@ -1,10 +1,11 @@
import merge from 'webpack-merge'; import merge from 'webpack-merge';
import { join } from 'path'; import { join } from 'path';
import { baseConfig } from './webpack.base'; import { baseConfig } from './webpack.base';
import { WebpackConfig } from '../common/types';
import { getVantConfig, getWebpackConfig, setBuildTarget } from '../common'; import { getVantConfig, getWebpackConfig, setBuildTarget } from '../common';
import { LIB_DIR, ES_DIR } from '../common/constant'; import { LIB_DIR, ES_DIR } from '../common/constant';
export function getPackageConfig(isMinify: boolean) { export function getPackageConfig(isMinify: boolean): WebpackConfig {
const { name } = getVantConfig(); const { name } = getVantConfig();
setBuildTarget('package'); setBuildTarget('package');

5
packages/vant-cli/src/config/webpack.site.dev.ts
View File

@ -4,6 +4,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
import { get } from 'lodash'; import { get } from 'lodash';
import { join } from 'path'; import { join } from 'path';
import { baseConfig } from './webpack.base'; import { baseConfig } from './webpack.base';
import { WebpackConfig } from '../common/types';
import { getVantConfig, getWebpackConfig } from '../common'; import { getVantConfig, getWebpackConfig } from '../common';
import { VantCliSitePlugin } from '../compiler/vant-cli-site-plugin'; import { VantCliSitePlugin } from '../compiler/vant-cli-site-plugin';
import { import {
@ -12,7 +13,7 @@ import {
SITE_DESKTOP_SHARED_FILE, SITE_DESKTOP_SHARED_FILE,
} from '../common/constant'; } from '../common/constant';
export function getSiteDevBaseConfig() { export function getSiteDevBaseConfig(): WebpackConfig {
const vantConfig = getVantConfig(); const vantConfig = getVantConfig();
const baiduAnalytics = get(vantConfig, 'site.baiduAnalytics'); const baiduAnalytics = get(vantConfig, 'site.baiduAnalytics');
@ -101,6 +102,6 @@ export function getSiteDevBaseConfig() {
}); });
} }
export function getSiteDevConfig() { export function getSiteDevConfig(): WebpackConfig {
return merge(getSiteDevBaseConfig(), getWebpackConfig()); return merge(getSiteDevBaseConfig(), getWebpackConfig());
} }

3
packages/vant-cli/src/config/webpack.site.prd.ts
View File

@ -1,5 +1,6 @@
import merge from 'webpack-merge'; import merge from 'webpack-merge';
import { get } from 'lodash'; import { get } from 'lodash';
import { WebpackConfig } from '../common/types';
import { getVantConfig, getWebpackConfig } from '../common'; import { getVantConfig, getWebpackConfig } from '../common';
import { getSiteDevBaseConfig } from './webpack.site.dev'; import { getSiteDevBaseConfig } from './webpack.site.dev';
import { SITE_DIST_DIR } from '../common/constant'; import { SITE_DIST_DIR } from '../common/constant';
@ -8,7 +9,7 @@ const vantConfig = getVantConfig();
const outputDir = get(vantConfig, 'build.site.outputDir', SITE_DIST_DIR); const outputDir = get(vantConfig, 'build.site.outputDir', SITE_DIST_DIR);
const publicPath = get(vantConfig, 'build.site.publicPath', '/'); const publicPath = get(vantConfig, 'build.site.publicPath', '/');
export function getSitePrdConfig() { export function getSitePrdConfig(): WebpackConfig {
return merge( return merge(
getSiteDevBaseConfig(), getSiteDevBaseConfig(),
{ {