diff --git a/packages/fes-plugin-built-in/src/plugins/commands/dev/watchPkg.js b/packages/fes-plugin-built-in/src/plugins/commands/dev/watchPkg.js index 2b10b2a3..41f23c6a 100644 --- a/packages/fes-plugin-built-in/src/plugins/commands/dev/watchPkg.js +++ b/packages/fes-plugin-built-in/src/plugins/commands/dev/watchPkg.js @@ -3,7 +3,7 @@ import { chokidar, winPath, lodash } from '@umijs/utils'; import { existsSync, readFileSync } from 'fs'; import { isPlugin, PluginType } from '@webank/fes-core'; -function getFesPlugins(opts) { +function getPlugins(opts) { return Object.keys({ ...opts.pkg.dependencies, ...opts.pkg.devDependencies @@ -12,7 +12,7 @@ function getFesPlugins(opts) { )); } -function getFesPluginsFromPkgPath(opts) { +function getPluginsFromPkgPath(opts) { let pkg = {}; if (existsSync(opts.pkgPath)) { try { @@ -21,17 +21,17 @@ function getFesPluginsFromPkgPath(opts) { // ignore } } - return getFesPlugins({ pkg }); + return getPlugins({ pkg }); } export function watchPkg(opts) { const pkgPath = join(opts.cwd, 'package.json'); - const plugins = getFesPluginsFromPkgPath({ pkgPath }); + const plugins = getPluginsFromPkgPath({ pkgPath }); const watcher = chokidar.watch(pkgPath, { ignoreInitial: true }); watcher.on('all', () => { - const newPlugins = getFesPluginsFromPkgPath({ pkgPath }); + const newPlugins = getPluginsFromPkgPath({ pkgPath }); if (!lodash.isEqual(plugins, newPlugins)) { // 已经重启了,只处理一次就够了 opts.onChange(); diff --git a/packages/fes-plugin-built-in/src/plugins/features/chainWebpack.js b/packages/fes-plugin-built-in/src/plugins/features/chainWebpack.js index b8d89889..381585d2 100644 --- a/packages/fes-plugin-built-in/src/plugins/features/chainWebpack.js +++ b/packages/fes-plugin-built-in/src/plugins/features/chainWebpack.js @@ -21,7 +21,6 @@ export default (api) => { ]); webpackConfig.module .rule('js-in-node_modules').use('babel-loader').tap((options) => { - console.log(options); options.cacheDirectory = winPath(`${prefix}/.fes/.cache/babel-loader`); return options; }); diff --git a/packages/fes-plugin-built-in/src/plugins/generateFiles/core/fesExports.js b/packages/fes-plugin-built-in/src/plugins/generateFiles/core/fesExports.js index 3f779f5b..56fccb13 100644 --- a/packages/fes-plugin-built-in/src/plugins/generateFiles/core/fesExports.js +++ b/packages/fes-plugin-built-in/src/plugins/generateFiles/core/fesExports.js @@ -2,12 +2,12 @@ import { lodash, winPath } from '@umijs/utils'; import assert from 'assert'; const reserveLibrarys = ['fes']; // reserve library +// todo 插件导出内容冲突问题待解决 const reserveExportsNames = [ 'Link', 'NavLink', 'Redirect', 'dynamic', - 'router', 'withRouter', 'Route' ]; diff --git a/packages/fes-plugin-built-in/src/plugins/generateFiles/core/routes.tpl b/packages/fes-plugin-built-in/src/plugins/generateFiles/core/routes.tpl index 1203a7d2..6bb6df1c 100644 --- a/packages/fes-plugin-built-in/src/plugins/generateFiles/core/routes.tpl +++ b/packages/fes-plugin-built-in/src/plugins/generateFiles/core/routes.tpl @@ -1,4 +1,4 @@ -import { createRouter, createWebHashHistory } from '{{{ runtimePath }}}'; +import { createRouter as createVueRouter, createWebHashHistory } from '{{{ runtimePath }}}'; export function getRoutes() { const routes = {{{ routes }}}; @@ -7,11 +7,11 @@ export function getRoutes() { } let router = null; -export const createHistory = () => { +export const createRouter = () => { if (router) { return router; } - router = createRouter({ + router = createVueRouter({ history: createWebHashHistory(), routes: getRoutes() }); diff --git a/packages/fes-plugin-built-in/src/plugins/generateFiles/fes.tpl b/packages/fes-plugin-built-in/src/plugins/generateFiles/fes.tpl index 8c2a99d6..30282eff 100644 --- a/packages/fes-plugin-built-in/src/plugins/generateFiles/fes.tpl +++ b/packages/fes-plugin-built-in/src/plugins/generateFiles/fes.tpl @@ -7,7 +7,7 @@ import { import { plugin } from './core/plugin'; import './core/pluginRegister'; import { ApplyPluginsType } from '{{{ runtimePath }}}'; -import { createRouter } from './core/routes'; +import { createRouter, getRoutes } from './core/routes'; {{{ imports }}} {{{ entryCodeAhead }}}