From b71b828022ca77a58f88158182cb00a21acc6cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E5=BF=A0?= Date: Tue, 23 Jun 2020 10:44:06 +0800 Subject: [PATCH 01/14] chore: update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 486c204c6b..28460f2c9f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ice.js", "private": true, - "version": "1.5.0", + "version": "1.6.0", "workspaces": [ "packages/*" ], From 45bfbada1a3a529b24fe3458b443a0e45201e244 Mon Sep 17 00:00:00 2001 From: luhc228 Date: Mon, 29 Jun 2020 15:27:29 +0800 Subject: [PATCH 02/14] feat: default compile some dependencies to support IE11 --- .../plugin-react-app/src/config/default.config.js | 12 +++++++++++- .../src/userConfig/compileDependencies.js | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react-app/src/config/default.config.js b/packages/plugin-react-app/src/config/default.config.js index 4c0a80fa4e..dfe8537436 100644 --- a/packages/plugin-react-app/src/config/default.config.js +++ b/packages/plugin-react-app/src/config/default.config.js @@ -54,7 +54,17 @@ module.exports = { lessLoaderOptions: {}, sassLoaderOptions: {}, postcssrc: false, - compileDependencies: [], + // default support IE11 + compileDependencies: [ + 'ansi-regex', + 'ansi-styles', + 'chalk', + 'query-string', + 'react-dev-utils', + 'split-on-first', + 'strict-uri-encode', + 'strip-ansi' + ], babelPlugins: [], babelPresets: [], eslint: false diff --git a/packages/plugin-react-app/src/userConfig/compileDependencies.js b/packages/plugin-react-app/src/userConfig/compileDependencies.js index d9fee6fd2c..386fc2fdd1 100644 --- a/packages/plugin-react-app/src/userConfig/compileDependencies.js +++ b/packages/plugin-react-app/src/userConfig/compileDependencies.js @@ -1,5 +1,9 @@ module.exports = (config, compileDependencies) => { const matchExclude = (filepath) => { + // exclude the core-js for that it will fail to run in IE + if (filepath.match(/core-js/)) { + return true; + }; // compile build-plugin module for default const deps = [/build-plugin.*module/].concat(compileDependencies).map(dep => { if (dep instanceof RegExp) { From 2229971d1354641c2c2eaf9b1ebf82b87679a371 Mon Sep 17 00:00:00 2001 From: luhc228 Date: Mon, 29 Jun 2020 15:50:24 +0800 Subject: [PATCH 03/14] docs: update compileDependencies docs --- docs/guide/basic/build.md | 2 +- .../plugin-react-app/src/config/default.config.js | 12 +----------- .../src/userConfig/compileDependencies.js | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docs/guide/basic/build.md b/docs/guide/basic/build.md index 4d544f2d91..b1bc8ce2f8 100644 --- a/docs/guide/basic/build.md +++ b/docs/guide/basic/build.md @@ -321,7 +321,7 @@ icejs 中一般不允许修改该配置。 - 类型：`array` - 默认值：`[]` -默认情况下 babel-loader 会忽略所有 node_modules 目录下的所有文件。如果需要 babel 去编译 node_modules 下的指定文件，可以在这个配置快捷添加。 +默认情况下 babel-loader 会编译相关模块以兼容 IE11。如果需要 babel 去编译 node_modules 下的指定文件，可以在这个配置快捷添加。 比如想编译 node_modules 下的 @alifd/next 依赖，可以进行如下设置： diff --git a/packages/plugin-react-app/src/config/default.config.js b/packages/plugin-react-app/src/config/default.config.js index dfe8537436..4c0a80fa4e 100644 --- a/packages/plugin-react-app/src/config/default.config.js +++ b/packages/plugin-react-app/src/config/default.config.js @@ -54,17 +54,7 @@ module.exports = { lessLoaderOptions: {}, sassLoaderOptions: {}, postcssrc: false, - // default support IE11 - compileDependencies: [ - 'ansi-regex', - 'ansi-styles', - 'chalk', - 'query-string', - 'react-dev-utils', - 'split-on-first', - 'strict-uri-encode', - 'strip-ansi' - ], + compileDependencies: [], babelPlugins: [], babelPresets: [], eslint: false diff --git a/packages/plugin-react-app/src/userConfig/compileDependencies.js b/packages/plugin-react-app/src/userConfig/compileDependencies.js index 386fc2fdd1..36b222b854 100644 --- a/packages/plugin-react-app/src/userConfig/compileDependencies.js +++ b/packages/plugin-react-app/src/userConfig/compileDependencies.js @@ -1,11 +1,20 @@ +const defaultCompileDependencies = [ + 'ansi-regex', + 'ansi-styles', + 'chalk', + 'query-string', + 'react-dev-utils', + 'split-on-first', + 'strict-uri-encode', + 'strip-ansi' +]; module.exports = (config, compileDependencies) => { const matchExclude = (filepath) => { // exclude the core-js for that it will fail to run in IE - if (filepath.match(/core-js/)) { + if (filepath.match(/core-js/)) return true; - }; // compile build-plugin module for default - const deps = [/build-plugin.*module/].concat(compileDependencies).map(dep => { + const deps = [/build-plugin.*module/].concat(defaultCompileDependencies, compileDependencies).map(dep => { if (dep instanceof RegExp) { return dep.source; } else if (typeof dep === 'string') { From 48273a82a996b403e268a5e67a41db2eab9a9e9e Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:06:06 +0800 Subject: [PATCH 04/14] feat: support --mpa-entry (#3299) * feat: support mpa-entry * fix: detect mpa * chore: add docs and example --- docs/guide/advance/mpa.md | 14 ++++++ examples/basic-mpa/package.json | 2 +- packages/plugin-mpa/src/index.ts | 45 +++++++++++++++---- .../plugin-react-app/src/userConfig/entry.js | 2 +- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/docs/guide/advance/mpa.md b/docs/guide/advance/mpa.md index 6b7b0bafd4..5e2236ac33 100644 --- a/docs/guide/advance/mpa.md +++ b/docs/guide/advance/mpa.md @@ -93,6 +93,20 @@ createApp(appConfig); 关于状态管理的更多内容，请查看文档 [状态管理](/docs/guide/basic/store.md) +## 其他 + +### 指定入口 + +默认 MPA 应用在开发阶段会启动所有页面，如果你只想调试某个页面，可以通过指定 `--mpa-entry` 来启动。 + +通过命令行参数指定启动的页面： + +```bash +"scripts": { + "start": "icejs start --mpa-entry dashboard", +} +``` + 只需要这么简单，你的 SPA 应用就可以变成 MPA 应用了。 * MPA 项目示例 [详见](https://github.com/ice-lab/icejs/tree/master/examples/basic-mpa) diff --git a/examples/basic-mpa/package.json b/examples/basic-mpa/package.json index e9d8fdde77..82950b925e 100644 --- a/examples/basic-mpa/package.json +++ b/examples/basic-mpa/package.json @@ -11,7 +11,7 @@ "@types/react-dom": "^16.9.4" }, "scripts": { - "start": "icejs start", + "start": "icejs start --mpa-entry Dashboard", "build": "icejs build" }, "engines": { diff --git a/packages/plugin-mpa/src/index.ts b/packages/plugin-mpa/src/index.ts index 475be88c6e..5536dda3d3 100644 --- a/packages/plugin-mpa/src/index.ts +++ b/packages/plugin-mpa/src/index.ts @@ -2,8 +2,20 @@ import { IPlugin } from '@alib/build-scripts'; import * as path from 'path'; import * as fs from 'fs-extra'; -const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { - const { rootDir, userConfig } = context; +const plugin: IPlugin = ({ context, registerUserConfig, registerCliOption, modifyUserConfig, log }) => { + const { rootDir, userConfig, commandArgs } = context; + + // register mpa in build.json + registerUserConfig({ + name: 'mpa', + validation: 'boolean', + }); + + // support --mpa-entry to specify mpa entry + registerCliOption({ + name: 'mpa-entry', + commands: ['start'], + }); if (userConfig.mpa) { const pagesPath = path.join(rootDir, 'src/pages'); @@ -12,7 +24,7 @@ const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { .filter(page => !/^[._]/.test(page)) .map(page => path.parse(page).name) : []; - const mpaEntry = pages.reduce((acc, pageName) => { + let entries = pages.reduce((acc, pageName) => { const entryName = pageName.toLocaleLowerCase(); const pageEntry = getPageEntry(rootDir, pageName); if (!pageEntry) return acc; @@ -21,14 +33,29 @@ const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { [entryName]: `src/pages/${pageName}/${pageEntry}` }; }, {}); + + const finalEntries = {}; + if (commandArgs.mpaEntry) { + const arr = commandArgs.mpaEntry.split(','); + arr.forEach((pageName) => { + const entryName = pageName.toLocaleLowerCase(); + if (entries[entryName]) { + finalEntries[entryName] = entries[entryName]; + } + }); + if (Object.keys(finalEntries).length > 0) { + entries = finalEntries; + log.info('已启用 --map-entry 指定多页入口 \n', JSON.stringify(entries)); + } else { + log.warn(`--map-entry ${commandArgs.entry}`, '未能匹配到指定入口'); + } + } else { + log.info('使用多页面模式 \n', JSON.stringify(entries)); + } + // modify entry - modifyUserConfig('entry', mpaEntry); + modifyUserConfig('entry', entries); } - // register mpa in build.json - registerUserConfig({ - name: 'mpa', - validation: 'boolean', - }); }; function getPageEntry(rootDir, pageName) { diff --git a/packages/plugin-react-app/src/userConfig/entry.js b/packages/plugin-react-app/src/userConfig/entry.js index 2c96b535d3..59260b96e2 100644 --- a/packages/plugin-react-app/src/userConfig/entry.js +++ b/packages/plugin-react-app/src/userConfig/entry.js @@ -37,7 +37,7 @@ module.exports = (config, value, context) => { } const entryNames = Object.keys(entry); - const isMultiEntry = entryNames.length > 1; + const isMultiEntry = entryNames.length > 1 || userConfig.mpa; let pluginConfig = {}; if (config.plugins.get('HtmlWebpackPlugin')) { pluginConfig = { ...config.plugin('HtmlWebpackPlugin').get('args')[0] }; From c96f5800692a268616f301cd21e8cdf107a12a25 Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:08:13 +0800 Subject: [PATCH 05/14] fix: mpa router path error (#3303) --- packages/plugin-core/src/utils/getRoutes.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/plugin-core/src/utils/getRoutes.ts b/packages/plugin-core/src/utils/getRoutes.ts index 4accad0984..1f93173cda 100644 --- a/packages/plugin-core/src/utils/getRoutes.ts +++ b/packages/plugin-core/src/utils/getRoutes.ts @@ -20,6 +20,10 @@ function getRoutes({ rootDir, tempDir, configPath, projectType, isMpa }: IParams const routesTempPath = path.join(tempDir, 'routes.ts'); fse.writeFileSync(routesTempPath, 'export default [];', 'utf-8'); configPath = routesTempPath; + return { + routesPath: configPath, + isConfigRoutes: true + }; } const routesPath = configPath From f464f97686f86b0347148fac5012bdacabd1afcf Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:13:46 +0800 Subject: [PATCH 06/14] fix: auth error with lazy (#3307) --- examples/basic-auth/src/routes.ts | 4 +++- packages/plugin-auth/src/module.tsx | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/basic-auth/src/routes.ts b/examples/basic-auth/src/routes.ts index 26f6aed4ea..03ecdfb379 100644 --- a/examples/basic-auth/src/routes.ts +++ b/examples/basic-auth/src/routes.ts @@ -1,4 +1,6 @@ -import Home from '@/pages/Home'; +import { lazy } from 'ice'; + +const Home = lazy(() => import('@/pages/Home')); export default [ { diff --git a/packages/plugin-auth/src/module.tsx b/packages/plugin-auth/src/module.tsx index 974ed065d0..ac23df4121 100644 --- a/packages/plugin-auth/src/module.tsx +++ b/packages/plugin-auth/src/module.tsx @@ -3,22 +3,23 @@ import AuthStore from '$ice/authStore'; const wrapperComponentFn = (authConfig) => (PageComponent) => { const { pageConfig = {} } = PageComponent; - const [auth] = AuthStore.useModel('auth'); const AuthWrapperedComponent = (props) => { + const { auth, ...rest } = props; + const [authState] = auth; const pageConfigAuth = pageConfig.auth; if(pageConfigAuth && !Array.isArray(pageConfigAuth)) { throw new Error('pageConfig.auth must be an array'); } const hasAuth = Array.isArray(pageConfigAuth) - ? Object.keys(auth).filter(item => pageConfigAuth.includes(item) ? auth[item] : false).length + ? Object.keys(authState).filter(item => pageConfigAuth.includes(item) ? authState[item] : false).length : true; if (!hasAuth) { return authConfig.NoAuthFallback ? authConfig.NoAuthFallback : null; } - return ; + return ; }; - return AuthWrapperedComponent; + return AuthStore.withModel('auth')(AuthWrapperedComponent); }; export default ({ context, appConfig, addProvider, wrapperRouteComponent }) => { From a7eeeaccb2d2f9f131f3e037ac26604e4e788c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E5=BF=A0?= Date: Tue, 23 Jun 2020 10:44:06 +0800 Subject: [PATCH 07/14] chore: update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 486c204c6b..28460f2c9f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ice.js", "private": true, - "version": "1.5.0", + "version": "1.6.0", "workspaces": [ "packages/*" ], From 341770020ef3bd8ba85c2396ddb87af9e94ff0ed Mon Sep 17 00:00:00 2001 From: luhc228 Date: Mon, 29 Jun 2020 15:27:29 +0800 Subject: [PATCH 08/14] feat: default compile some dependencies to support IE11 --- .../plugin-react-app/src/config/default.config.js | 12 +++++++++++- .../src/userConfig/compileDependencies.js | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react-app/src/config/default.config.js b/packages/plugin-react-app/src/config/default.config.js index 4c0a80fa4e..dfe8537436 100644 --- a/packages/plugin-react-app/src/config/default.config.js +++ b/packages/plugin-react-app/src/config/default.config.js @@ -54,7 +54,17 @@ module.exports = { lessLoaderOptions: {}, sassLoaderOptions: {}, postcssrc: false, - compileDependencies: [], + // default support IE11 + compileDependencies: [ + 'ansi-regex', + 'ansi-styles', + 'chalk', + 'query-string', + 'react-dev-utils', + 'split-on-first', + 'strict-uri-encode', + 'strip-ansi' + ], babelPlugins: [], babelPresets: [], eslint: false diff --git a/packages/plugin-react-app/src/userConfig/compileDependencies.js b/packages/plugin-react-app/src/userConfig/compileDependencies.js index d9fee6fd2c..386fc2fdd1 100644 --- a/packages/plugin-react-app/src/userConfig/compileDependencies.js +++ b/packages/plugin-react-app/src/userConfig/compileDependencies.js @@ -1,5 +1,9 @@ module.exports = (config, compileDependencies) => { const matchExclude = (filepath) => { + // exclude the core-js for that it will fail to run in IE + if (filepath.match(/core-js/)) { + return true; + }; // compile build-plugin module for default const deps = [/build-plugin.*module/].concat(compileDependencies).map(dep => { if (dep instanceof RegExp) { From 21c7102f4c6dc5fe0811e81c4091e5667d30dc42 Mon Sep 17 00:00:00 2001 From: luhc228 Date: Mon, 29 Jun 2020 15:50:24 +0800 Subject: [PATCH 09/14] docs: update compileDependencies docs --- docs/guide/basic/build.md | 2 +- .../plugin-react-app/src/config/default.config.js | 12 +----------- .../src/userConfig/compileDependencies.js | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docs/guide/basic/build.md b/docs/guide/basic/build.md index de69734ea6..fb6c0383bd 100644 --- a/docs/guide/basic/build.md +++ b/docs/guide/basic/build.md @@ -353,7 +353,7 @@ icejs 中一般不允许修改该配置。 - 类型：`array` - 默认值：`[]` -默认情况下 babel-loader 会忽略所有 node_modules 目录下的所有文件。如果需要 babel 去编译 node_modules 下的指定文件，可以在这个配置快捷添加。 +默认情况下 babel-loader 会编译相关模块以兼容 IE11。如果需要 babel 去编译 node_modules 下的指定文件，可以在这个配置快捷添加。 比如想编译 node_modules 下的 @alifd/next 依赖，可以进行如下设置： diff --git a/packages/plugin-react-app/src/config/default.config.js b/packages/plugin-react-app/src/config/default.config.js index dfe8537436..4c0a80fa4e 100644 --- a/packages/plugin-react-app/src/config/default.config.js +++ b/packages/plugin-react-app/src/config/default.config.js @@ -54,17 +54,7 @@ module.exports = { lessLoaderOptions: {}, sassLoaderOptions: {}, postcssrc: false, - // default support IE11 - compileDependencies: [ - 'ansi-regex', - 'ansi-styles', - 'chalk', - 'query-string', - 'react-dev-utils', - 'split-on-first', - 'strict-uri-encode', - 'strip-ansi' - ], + compileDependencies: [], babelPlugins: [], babelPresets: [], eslint: false diff --git a/packages/plugin-react-app/src/userConfig/compileDependencies.js b/packages/plugin-react-app/src/userConfig/compileDependencies.js index 386fc2fdd1..36b222b854 100644 --- a/packages/plugin-react-app/src/userConfig/compileDependencies.js +++ b/packages/plugin-react-app/src/userConfig/compileDependencies.js @@ -1,11 +1,20 @@ +const defaultCompileDependencies = [ + 'ansi-regex', + 'ansi-styles', + 'chalk', + 'query-string', + 'react-dev-utils', + 'split-on-first', + 'strict-uri-encode', + 'strip-ansi' +]; module.exports = (config, compileDependencies) => { const matchExclude = (filepath) => { // exclude the core-js for that it will fail to run in IE - if (filepath.match(/core-js/)) { + if (filepath.match(/core-js/)) return true; - }; // compile build-plugin module for default - const deps = [/build-plugin.*module/].concat(compileDependencies).map(dep => { + const deps = [/build-plugin.*module/].concat(defaultCompileDependencies, compileDependencies).map(dep => { if (dep instanceof RegExp) { return dep.source; } else if (typeof dep === 'string') { From 629fc79fef85029b188b516e25a9af2efe34500e Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:06:06 +0800 Subject: [PATCH 10/14] feat: support --mpa-entry (#3299) * feat: support mpa-entry * fix: detect mpa * chore: add docs and example --- docs/guide/advance/mpa.md | 14 ++++++ examples/basic-mpa/package.json | 2 +- packages/plugin-mpa/src/index.ts | 45 +++++++++++++++---- .../plugin-react-app/src/userConfig/entry.js | 2 +- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/docs/guide/advance/mpa.md b/docs/guide/advance/mpa.md index 6b7b0bafd4..5e2236ac33 100644 --- a/docs/guide/advance/mpa.md +++ b/docs/guide/advance/mpa.md @@ -93,6 +93,20 @@ createApp(appConfig); 关于状态管理的更多内容，请查看文档 [状态管理](/docs/guide/basic/store.md) +## 其他 + +### 指定入口 + +默认 MPA 应用在开发阶段会启动所有页面，如果你只想调试某个页面，可以通过指定 `--mpa-entry` 来启动。 + +通过命令行参数指定启动的页面： + +```bash +"scripts": { + "start": "icejs start --mpa-entry dashboard", +} +``` + 只需要这么简单，你的 SPA 应用就可以变成 MPA 应用了。 * MPA 项目示例 [详见](https://github.com/ice-lab/icejs/tree/master/examples/basic-mpa) diff --git a/examples/basic-mpa/package.json b/examples/basic-mpa/package.json index e9d8fdde77..82950b925e 100644 --- a/examples/basic-mpa/package.json +++ b/examples/basic-mpa/package.json @@ -11,7 +11,7 @@ "@types/react-dom": "^16.9.4" }, "scripts": { - "start": "icejs start", + "start": "icejs start --mpa-entry Dashboard", "build": "icejs build" }, "engines": { diff --git a/packages/plugin-mpa/src/index.ts b/packages/plugin-mpa/src/index.ts index 475be88c6e..5536dda3d3 100644 --- a/packages/plugin-mpa/src/index.ts +++ b/packages/plugin-mpa/src/index.ts @@ -2,8 +2,20 @@ import { IPlugin } from '@alib/build-scripts'; import * as path from 'path'; import * as fs from 'fs-extra'; -const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { - const { rootDir, userConfig } = context; +const plugin: IPlugin = ({ context, registerUserConfig, registerCliOption, modifyUserConfig, log }) => { + const { rootDir, userConfig, commandArgs } = context; + + // register mpa in build.json + registerUserConfig({ + name: 'mpa', + validation: 'boolean', + }); + + // support --mpa-entry to specify mpa entry + registerCliOption({ + name: 'mpa-entry', + commands: ['start'], + }); if (userConfig.mpa) { const pagesPath = path.join(rootDir, 'src/pages'); @@ -12,7 +24,7 @@ const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { .filter(page => !/^[._]/.test(page)) .map(page => path.parse(page).name) : []; - const mpaEntry = pages.reduce((acc, pageName) => { + let entries = pages.reduce((acc, pageName) => { const entryName = pageName.toLocaleLowerCase(); const pageEntry = getPageEntry(rootDir, pageName); if (!pageEntry) return acc; @@ -21,14 +33,29 @@ const plugin: IPlugin = ({ context, registerUserConfig, modifyUserConfig }) => { [entryName]: `src/pages/${pageName}/${pageEntry}` }; }, {}); + + const finalEntries = {}; + if (commandArgs.mpaEntry) { + const arr = commandArgs.mpaEntry.split(','); + arr.forEach((pageName) => { + const entryName = pageName.toLocaleLowerCase(); + if (entries[entryName]) { + finalEntries[entryName] = entries[entryName]; + } + }); + if (Object.keys(finalEntries).length > 0) { + entries = finalEntries; + log.info('已启用 --map-entry 指定多页入口 \n', JSON.stringify(entries)); + } else { + log.warn(`--map-entry ${commandArgs.entry}`, '未能匹配到指定入口'); + } + } else { + log.info('使用多页面模式 \n', JSON.stringify(entries)); + } + // modify entry - modifyUserConfig('entry', mpaEntry); + modifyUserConfig('entry', entries); } - // register mpa in build.json - registerUserConfig({ - name: 'mpa', - validation: 'boolean', - }); }; function getPageEntry(rootDir, pageName) { diff --git a/packages/plugin-react-app/src/userConfig/entry.js b/packages/plugin-react-app/src/userConfig/entry.js index 2c96b535d3..59260b96e2 100644 --- a/packages/plugin-react-app/src/userConfig/entry.js +++ b/packages/plugin-react-app/src/userConfig/entry.js @@ -37,7 +37,7 @@ module.exports = (config, value, context) => { } const entryNames = Object.keys(entry); - const isMultiEntry = entryNames.length > 1; + const isMultiEntry = entryNames.length > 1 || userConfig.mpa; let pluginConfig = {}; if (config.plugins.get('HtmlWebpackPlugin')) { pluginConfig = { ...config.plugin('HtmlWebpackPlugin').get('args')[0] }; From fa3850c9181093df7fb3b5ce5a0750f56140bf39 Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:08:13 +0800 Subject: [PATCH 11/14] fix: mpa router path error (#3303) --- packages/plugin-core/src/utils/getRoutes.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/plugin-core/src/utils/getRoutes.ts b/packages/plugin-core/src/utils/getRoutes.ts index 4accad0984..1f93173cda 100644 --- a/packages/plugin-core/src/utils/getRoutes.ts +++ b/packages/plugin-core/src/utils/getRoutes.ts @@ -20,6 +20,10 @@ function getRoutes({ rootDir, tempDir, configPath, projectType, isMpa }: IParams const routesTempPath = path.join(tempDir, 'routes.ts'); fse.writeFileSync(routesTempPath, 'export default [];', 'utf-8'); configPath = routesTempPath; + return { + routesPath: configPath, + isConfigRoutes: true + }; } const routesPath = configPath From f4c5bd370883b464fb343a0297f412f6b691270c Mon Sep 17 00:00:00 2001 From: chenbin92 Date: Tue, 30 Jun 2020 10:13:46 +0800 Subject: [PATCH 12/14] fix: auth error with lazy (#3307) --- examples/basic-auth/src/routes.ts | 4 +++- packages/plugin-auth/src/module.tsx | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/basic-auth/src/routes.ts b/examples/basic-auth/src/routes.ts index 26f6aed4ea..03ecdfb379 100644 --- a/examples/basic-auth/src/routes.ts +++ b/examples/basic-auth/src/routes.ts @@ -1,4 +1,6 @@ -import Home from '@/pages/Home'; +import { lazy } from 'ice'; + +const Home = lazy(() => import('@/pages/Home')); export default [ { diff --git a/packages/plugin-auth/src/module.tsx b/packages/plugin-auth/src/module.tsx index 974ed065d0..ac23df4121 100644 --- a/packages/plugin-auth/src/module.tsx +++ b/packages/plugin-auth/src/module.tsx @@ -3,22 +3,23 @@ import AuthStore from '$ice/authStore'; const wrapperComponentFn = (authConfig) => (PageComponent) => { const { pageConfig = {} } = PageComponent; - const [auth] = AuthStore.useModel('auth'); const AuthWrapperedComponent = (props) => { + const { auth, ...rest } = props; + const [authState] = auth; const pageConfigAuth = pageConfig.auth; if(pageConfigAuth && !Array.isArray(pageConfigAuth)) { throw new Error('pageConfig.auth must be an array'); } const hasAuth = Array.isArray(pageConfigAuth) - ? Object.keys(auth).filter(item => pageConfigAuth.includes(item) ? auth[item] : false).length + ? Object.keys(authState).filter(item => pageConfigAuth.includes(item) ? authState[item] : false).length : true; if (!hasAuth) { return authConfig.NoAuthFallback ? authConfig.NoAuthFallback : null; } - return ; + return ; }; - return AuthWrapperedComponent; + return AuthStore.withModel('auth')(AuthWrapperedComponent); }; export default ({ context, appConfig, addProvider, wrapperRouteComponent }) => { From 403bede88f0a72398aff7c95cd6f5de1a2d2b918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E5=BF=A0?= Date: Tue, 30 Jun 2020 10:36:23 +0800 Subject: [PATCH 13/14] v1.6.1-alpha.0 --- lerna.json | 2 +- packages/create-ice/package.json | 2 +- packages/icejs/package.json | 22 +++++++++++----------- packages/plugin-auth/package.json | 2 +- packages/plugin-config/package.json | 2 +- packages/plugin-core/package.json | 2 +- packages/plugin-fast-refresh/package.json | 2 +- packages/plugin-helpers/package.json | 2 +- packages/plugin-icestark/package.json | 2 +- packages/plugin-logger/package.json | 2 +- packages/plugin-mpa/package.json | 2 +- packages/plugin-prerender/package.json | 2 +- packages/plugin-react-app/package.json | 2 +- packages/plugin-rematch/package.json | 2 +- packages/plugin-request/package.json | 2 +- packages/plugin-router/package.json | 2 +- packages/plugin-service/package.json | 2 +- packages/plugin-ssr/package.json | 2 +- packages/plugin-store/package.json | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index 9d2134fcc3..18d77436f3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.6.0", + "version": "1.6.1-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": [ diff --git a/packages/create-ice/package.json b/packages/create-ice/package.json index caa0acd272..67667527aa 100644 --- a/packages/create-ice/package.json +++ b/packages/create-ice/package.json @@ -1,6 +1,6 @@ { "name": "create-ice", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "npm init ice", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/icejs/package.json b/packages/icejs/package.json index b31e5d8d20..86fd0c797c 100644 --- a/packages/icejs/package.json +++ b/packages/icejs/package.json @@ -1,6 +1,6 @@ { "name": "ice.js", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "command line interface and builtin plugin for icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", @@ -25,16 +25,16 @@ }, "dependencies": { "@alib/build-scripts": "^0.1.13", - "build-plugin-ice-config": "1.6.0", - "build-plugin-ice-core": "1.6.0", - "build-plugin-ice-helpers": "1.6.0", - "build-plugin-ice-logger": "1.6.0", - "build-plugin-ice-mpa": "1.6.0", - "build-plugin-ice-request": "1.6.0", - "build-plugin-ice-router": "1.6.0", - "build-plugin-ice-ssr": "1.6.0", - "build-plugin-ice-store": "1.6.0", - "build-plugin-react-app": "1.6.0", + "build-plugin-ice-config": "1.6.1-alpha.0", + "build-plugin-ice-core": "1.6.1-alpha.0", + "build-plugin-ice-helpers": "1.6.1-alpha.0", + "build-plugin-ice-logger": "1.6.1-alpha.0", + "build-plugin-ice-mpa": "1.6.1-alpha.0", + "build-plugin-ice-request": "1.6.1-alpha.0", + "build-plugin-ice-router": "1.6.1-alpha.0", + "build-plugin-ice-ssr": "1.6.1-alpha.0", + "build-plugin-ice-store": "1.6.1-alpha.0", + "build-plugin-react-app": "1.6.1-alpha.0", "chokidar": "^3.3.1", "commander": "^5.0.0", "detect-port": "^1.3.0", diff --git a/packages/plugin-auth/package.json b/packages/plugin-auth/package.json index c29bd6d181..3be7c1ac94 100644 --- a/packages/plugin-auth/package.json +++ b/packages/plugin-auth/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-auth", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "", "author": "ice-admin@alibaba-inc.com", "homepage": "https://github.com/alibaba/ice#readme", diff --git a/packages/plugin-config/package.json b/packages/plugin-config/package.json index a2dc5f5396..4c885632b4 100644 --- a/packages/plugin-config/package.json +++ b/packages/plugin-config/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-config", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "Define application config in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-core/package.json b/packages/plugin-core/package.json index 5adaa0cb9e..33d16e0ac8 100644 --- a/packages/plugin-core/package.json +++ b/packages/plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-core", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "the core plugin for icejs.", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-fast-refresh/package.json b/packages/plugin-fast-refresh/package.json index ef7f7318eb..affae8d08d 100644 --- a/packages/plugin-fast-refresh/package.json +++ b/packages/plugin-fast-refresh/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-fast-refresh", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "A Webpack plugin to enable Fast Refresh (also previously known as Hot Reloading) for React", "author": "思忠 ", "homepage": "https://github.com/alibaba/ice#readme", diff --git a/packages/plugin-helpers/package.json b/packages/plugin-helpers/package.json index d9e514ddb3..f30d79dc2f 100644 --- a/packages/plugin-helpers/package.json +++ b/packages/plugin-helpers/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-helpers", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "builtin helpers in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-icestark/package.json b/packages/plugin-icestark/package.json index 8eb1a39841..aa8295b6d7 100644 --- a/packages/plugin-icestark/package.json +++ b/packages/plugin-icestark/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-icestark", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "Easy use `icestark` in icejs.", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-logger/package.json b/packages/plugin-logger/package.json index 49f0428f03..63bd62617d 100644 --- a/packages/plugin-logger/package.json +++ b/packages/plugin-logger/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-logger", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "builtin logger in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-mpa/package.json b/packages/plugin-mpa/package.json index 0ac6433852..275a47ca3c 100644 --- a/packages/plugin-mpa/package.json +++ b/packages/plugin-mpa/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-mpa", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "enable mpa project for icejs framework", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-prerender/package.json b/packages/plugin-prerender/package.json index f3cbf99c0c..f2a5f3dc0e 100644 --- a/packages/plugin-prerender/package.json +++ b/packages/plugin-prerender/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-prerender", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "Prerender Plugin", "main": "lib/index.js", "scripts": { diff --git a/packages/plugin-react-app/package.json b/packages/plugin-react-app/package.json index b065a0b175..6c56321e6f 100644 --- a/packages/plugin-react-app/package.json +++ b/packages/plugin-react-app/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-react-app", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "The basic webpack configuration for ice project", "author": "ice-admin@alibaba-inc.com", "main": "src/index.js", diff --git a/packages/plugin-rematch/package.json b/packages/plugin-rematch/package.json index 43a32b84d7..af726a286a 100644 --- a/packages/plugin-rematch/package.json +++ b/packages/plugin-rematch/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-rematch", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "Easy use `rematch` in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-request/package.json b/packages/plugin-request/package.json index 7fa8cbf522..eb106048ce 100644 --- a/packages/plugin-request/package.json +++ b/packages/plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-request", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "request for build-plugin-ice-request", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-router/package.json b/packages/plugin-router/package.json index 387607776b..e36459603b 100644 --- a/packages/plugin-router/package.json +++ b/packages/plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-router", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "build-plugin-ice-router", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-service/package.json b/packages/plugin-service/package.json index 4fd779c231..6184ea83a2 100644 --- a/packages/plugin-service/package.json +++ b/packages/plugin-service/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-service", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "service pulgin", "author": "ice-admin@alibaba-inc.com", "homepage": "https://github.com/ice-lab/icejs#readme", diff --git a/packages/plugin-ssr/package.json b/packages/plugin-ssr/package.json index 97a2bd420e..557282bb99 100644 --- a/packages/plugin-ssr/package.json +++ b/packages/plugin-ssr/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-ssr", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "ssr plugin", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-store/package.json b/packages/plugin-store/package.json index 759b221654..528c930a2e 100644 --- a/packages/plugin-store/package.json +++ b/packages/plugin-store/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-store", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "builtin `icestore` in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", From 507624d29149fb1522bdbba5dbb8fbdaa4bd1dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E5=BF=A0?= Date: Tue, 30 Jun 2020 11:09:45 +0800 Subject: [PATCH 14/14] v1.6.1 --- lerna.json | 2 +- packages/create-ice/package.json | 2 +- packages/icejs/package.json | 22 +++++++++++----------- packages/plugin-auth/package.json | 2 +- packages/plugin-config/package.json | 2 +- packages/plugin-core/package.json | 2 +- packages/plugin-fast-refresh/package.json | 2 +- packages/plugin-helpers/package.json | 2 +- packages/plugin-icestark/package.json | 2 +- packages/plugin-logger/package.json | 2 +- packages/plugin-mpa/package.json | 2 +- packages/plugin-prerender/package.json | 2 +- packages/plugin-react-app/package.json | 2 +- packages/plugin-rematch/package.json | 2 +- packages/plugin-request/package.json | 2 +- packages/plugin-router/package.json | 2 +- packages/plugin-service/package.json | 2 +- packages/plugin-ssr/package.json | 2 +- packages/plugin-store/package.json | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index 18d77436f3..437768f9fd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.6.1-alpha.0", + "version": "1.6.1", "npmClient": "yarn", "useWorkspaces": true, "packages": [ diff --git a/packages/create-ice/package.json b/packages/create-ice/package.json index 67667527aa..b9d692bf42 100644 --- a/packages/create-ice/package.json +++ b/packages/create-ice/package.json @@ -1,6 +1,6 @@ { "name": "create-ice", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "npm init ice", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/icejs/package.json b/packages/icejs/package.json index 86fd0c797c..6825a571a3 100644 --- a/packages/icejs/package.json +++ b/packages/icejs/package.json @@ -1,6 +1,6 @@ { "name": "ice.js", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "command line interface and builtin plugin for icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", @@ -25,16 +25,16 @@ }, "dependencies": { "@alib/build-scripts": "^0.1.13", - "build-plugin-ice-config": "1.6.1-alpha.0", - "build-plugin-ice-core": "1.6.1-alpha.0", - "build-plugin-ice-helpers": "1.6.1-alpha.0", - "build-plugin-ice-logger": "1.6.1-alpha.0", - "build-plugin-ice-mpa": "1.6.1-alpha.0", - "build-plugin-ice-request": "1.6.1-alpha.0", - "build-plugin-ice-router": "1.6.1-alpha.0", - "build-plugin-ice-ssr": "1.6.1-alpha.0", - "build-plugin-ice-store": "1.6.1-alpha.0", - "build-plugin-react-app": "1.6.1-alpha.0", + "build-plugin-ice-config": "1.6.1", + "build-plugin-ice-core": "1.6.1", + "build-plugin-ice-helpers": "1.6.1", + "build-plugin-ice-logger": "1.6.1", + "build-plugin-ice-mpa": "1.6.1", + "build-plugin-ice-request": "1.6.1", + "build-plugin-ice-router": "1.6.1", + "build-plugin-ice-ssr": "1.6.1", + "build-plugin-ice-store": "1.6.1", + "build-plugin-react-app": "1.6.1", "chokidar": "^3.3.1", "commander": "^5.0.0", "detect-port": "^1.3.0", diff --git a/packages/plugin-auth/package.json b/packages/plugin-auth/package.json index 3be7c1ac94..2ba332e04c 100644 --- a/packages/plugin-auth/package.json +++ b/packages/plugin-auth/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-auth", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "", "author": "ice-admin@alibaba-inc.com", "homepage": "https://github.com/alibaba/ice#readme", diff --git a/packages/plugin-config/package.json b/packages/plugin-config/package.json index 4c885632b4..b9dc231266 100644 --- a/packages/plugin-config/package.json +++ b/packages/plugin-config/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-config", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "Define application config in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-core/package.json b/packages/plugin-core/package.json index 33d16e0ac8..91bcd9ab37 100644 --- a/packages/plugin-core/package.json +++ b/packages/plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-core", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "the core plugin for icejs.", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-fast-refresh/package.json b/packages/plugin-fast-refresh/package.json index affae8d08d..7efa4fd1be 100644 --- a/packages/plugin-fast-refresh/package.json +++ b/packages/plugin-fast-refresh/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-fast-refresh", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "A Webpack plugin to enable Fast Refresh (also previously known as Hot Reloading) for React", "author": "思忠 ", "homepage": "https://github.com/alibaba/ice#readme", diff --git a/packages/plugin-helpers/package.json b/packages/plugin-helpers/package.json index f30d79dc2f..5c6b273965 100644 --- a/packages/plugin-helpers/package.json +++ b/packages/plugin-helpers/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-helpers", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "builtin helpers in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-icestark/package.json b/packages/plugin-icestark/package.json index aa8295b6d7..7632d8ceaf 100644 --- a/packages/plugin-icestark/package.json +++ b/packages/plugin-icestark/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-icestark", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "Easy use `icestark` in icejs.", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-logger/package.json b/packages/plugin-logger/package.json index 63bd62617d..98ba8939b0 100644 --- a/packages/plugin-logger/package.json +++ b/packages/plugin-logger/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-logger", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "builtin logger in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-mpa/package.json b/packages/plugin-mpa/package.json index 275a47ca3c..ab10b91553 100644 --- a/packages/plugin-mpa/package.json +++ b/packages/plugin-mpa/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-mpa", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "enable mpa project for icejs framework", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-prerender/package.json b/packages/plugin-prerender/package.json index f2a5f3dc0e..2f0d240317 100644 --- a/packages/plugin-prerender/package.json +++ b/packages/plugin-prerender/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-prerender", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "Prerender Plugin", "main": "lib/index.js", "scripts": { diff --git a/packages/plugin-react-app/package.json b/packages/plugin-react-app/package.json index 6c56321e6f..5e42907e2e 100644 --- a/packages/plugin-react-app/package.json +++ b/packages/plugin-react-app/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-react-app", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "The basic webpack configuration for ice project", "author": "ice-admin@alibaba-inc.com", "main": "src/index.js", diff --git a/packages/plugin-rematch/package.json b/packages/plugin-rematch/package.json index af726a286a..153a185cab 100644 --- a/packages/plugin-rematch/package.json +++ b/packages/plugin-rematch/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-rematch", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "Easy use `rematch` in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-request/package.json b/packages/plugin-request/package.json index eb106048ce..c2fd17983d 100644 --- a/packages/plugin-request/package.json +++ b/packages/plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-request", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "request for build-plugin-ice-request", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-router/package.json b/packages/plugin-router/package.json index e36459603b..08bd2cadd0 100644 --- a/packages/plugin-router/package.json +++ b/packages/plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-router", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "build-plugin-ice-router", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-service/package.json b/packages/plugin-service/package.json index 6184ea83a2..c57c2891ec 100644 --- a/packages/plugin-service/package.json +++ b/packages/plugin-service/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-service", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "service pulgin", "author": "ice-admin@alibaba-inc.com", "homepage": "https://github.com/ice-lab/icejs#readme", diff --git a/packages/plugin-ssr/package.json b/packages/plugin-ssr/package.json index 557282bb99..cfac9adc91 100644 --- a/packages/plugin-ssr/package.json +++ b/packages/plugin-ssr/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-ssr", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "ssr plugin", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-store/package.json b/packages/plugin-store/package.json index 528c930a2e..d7b0594109 100644 --- a/packages/plugin-store/package.json +++ b/packages/plugin-store/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-store", - "version": "1.6.1-alpha.0", + "version": "1.6.1", "description": "builtin `icestore` in icejs", "author": "ice-admin@alibaba-inc.com", "homepage": "",