diff --git a/config/mp/webpack.config.js b/config/mp/webpack.config.js index e72b162..d0ae233 100644 --- a/config/mp/webpack.config.js +++ b/config/mp/webpack.config.js @@ -29,7 +29,7 @@ const oakPathPlugin = require('../babel-plugin/oakPath'); const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false'; const shouldAnalyze = process.env.COMPILE_ANALYZE === 'true'; -const memoryLimit = process.env.MEMORY_LIMIT ? Number(process.env.MEMORY_LIMIT) : 4096; +const memoryLimit = process.env.MEMORY_LIMIT ? Number(process.env.MEMORY_LIMIT) : 8192; const copyPatterns = [].concat(pkg.copyWebpack || []).map((pattern) => typeof pattern === 'string' diff --git a/config/web/webpack.config.js b/config/web/webpack.config.js index e91e950..75b3965 100644 --- a/config/web/webpack.config.js +++ b/config/web/webpack.config.js @@ -713,10 +713,8 @@ module.exports = function (webpackEnv) { 'less-loader', { lessOptions: () => { - const oakConfigJson = require(paths.oakConfigJson); return { javascriptEnabled: true, - modifyVars: oakConfigJson.theme, }; }, } @@ -737,10 +735,8 @@ module.exports = function (webpackEnv) { 'less-loader', { lessOptions: () => { - const oakConfigJson = require(paths.oakConfigJson); return { javascriptEnabled: true, - modifyVars: oakConfigJson.theme, }; }, } diff --git a/templateFiles/allRouters.ts b/templateFiles/allRouters.ts index 2a314cd..4ed3017 100644 --- a/templateFiles/allRouters.ts +++ b/templateFiles/allRouters.ts @@ -1,5 +1,5 @@ "use oak router builder"; // 这行备注说明是用oak的router builder来生成allRouters import React from 'react'; -import { IRouter } from '../../types/router'; +import { IRouter } from 'oak-frontend-base/es/platforms/web/router/types'; let allRouters: IRouter[] = []; export default allRouters;