diff --git a/packages/fes-plugin-request/src/template/request.js b/packages/fes-plugin-request/src/template/request.js index 2e21278e..8c3d56d4 100644 --- a/packages/fes-plugin-request/src/template/request.js +++ b/packages/fes-plugin-request/src/template/request.js @@ -112,6 +112,11 @@ function createContext(userConfig) { } export const request = (url, data, options = {}) => { + if (typeof options === 'string') { + options = { + method: options + }; + } if (!currentRequestInstance) { currentRequestInstance = getRequestInstance(); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js similarity index 95% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js rename to packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js index 46486cc3..a37300e9 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js @@ -2,7 +2,7 @@ import { winPath } from '@umijs/utils'; -function getBableOpts({ +function getBabelOpts({ cwd, targets, config, @@ -48,7 +48,7 @@ function getBableOpts({ ]) : []), require.resolve('@vue/babel-plugin-jsx'), - ...(config.extraBabelPresets || []) + ...(config.extraBabelPlugins || []) ]; return { babelrc: false, @@ -77,7 +77,7 @@ export default async ({ if (modifyBabelPresetOpts) { presetOpts = await modifyBabelPresetOpts(presetOpts); } - let babelOpts = getBableOpts({ + let babelOpts = getBabelOpts({ cwd, config, presetOpts, diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js index 861d19c5..dd79b2b2 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js @@ -3,7 +3,7 @@ import { existsSync } from 'fs'; import Config from 'webpack-chain'; import webpack from 'webpack'; import createCssWebpackConfig from './css'; -import getBableOpts from './getBableOpts'; +import getBabelOpts from './getBabelOpts'; import createVueWebpackConfig from './vue'; import createDefineWebpackConfig from './define'; import createMinimizerWebpackConfig from './minimizer'; @@ -155,7 +155,7 @@ export default async function getConfig({ }); const { targets, browserslist } = getTargetsAndBrowsersList({ config }); - const babelOpts = await getBableOpts({ + const babelOpts = await getBabelOpts({ cwd, config, modifyBabelOpts, diff --git a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js index 0e12c756..151c3de1 100644 --- a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js +++ b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js @@ -9,8 +9,7 @@ export default (api) => { const { absSrcPath = '', absTmpPath = '' } = paths; const files = [ 'global.css', - 'global.less', - 'global.stylus' + 'global.less' ]; const globalCSSFile = files .map(file => join(absSrcPath || '', file))