From 37c6464be172aea1f7e58f7603a55f878d123649 Mon Sep 17 00:00:00 2001 From: wanchun <445436867@qq.com> Date: Sat, 6 Mar 2021 21:30:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guide/getting-started.md | 3 --- docs/zh/guide/getting-started.md | 3 --- packages/create-fes-app/templates/app/h5/package.json | 2 +- packages/create-fes-app/templates/app/pc/package.json | 2 +- packages/fes-template-h5/package.json | 2 +- packages/fes-template/package.json | 8 ++++---- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md index 9eee9fc7..3341ad1d 100644 --- a/docs/guide/getting-started.md +++ b/docs/guide/getting-started.md @@ -113,8 +113,6 @@ Starting the development server http://localhost:8080 ... # 开发调试 npm run dev - -> @fesjs/fes-template@2.0.0-alpha.1 dev /Users/harrywan/company/git/fes.js/packages/fes-template > fes dev Starting the development server http://localhost:8080 ... @@ -161,7 +159,6 @@ $ fes build # 构建 npm run build -> @fesjs/fes-template@2.0.0-alpha.1 build /Users/harrywan/company/git/fes.js/packages/fes-template > fes build ✔ Webpack diff --git a/docs/zh/guide/getting-started.md b/docs/zh/guide/getting-started.md index 032facbb..60ec3345 100644 --- a/docs/zh/guide/getting-started.md +++ b/docs/zh/guide/getting-started.md @@ -113,8 +113,6 @@ Starting the development server http://localhost:8080 ... # 开发调试 npm run dev - -> @fesjs/fes-template@2.0.0-alpha.1 dev /Users/harrywan/company/git/fes.js/packages/fes-template > fes dev Starting the development server http://localhost:8080 ... @@ -162,7 +160,6 @@ $ fes build # 构建 npm run build -> @fesjs/fes-template@2.0.0-alpha.1 build /Users/harrywan/company/git/fes.js/packages/fes-template > fes build ✔ Webpack diff --git a/packages/create-fes-app/templates/app/h5/package.json b/packages/create-fes-app/templates/app/h5/package.json index 4cdb7203..ea9e1b2d 100644 --- a/packages/create-fes-app/templates/app/h5/package.json +++ b/packages/create-fes-app/templates/app/h5/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/template-h5", - "version": "2.0.0-alpha", + "version": "2.0.0-rc.0", "description": "fes 移动端项目模版", "scripts": { "build": "fes build", diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index 00c9aca6..66fbc8ae 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/template", - "version": "2.0.0-alpha", + "version": "2.0.0-rc.0", "description": "fes项目模版", "scripts": { "build": "fes build", diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json index 4226e788..7cfb5d9d 100644 --- a/packages/fes-template-h5/package.json +++ b/packages/fes-template-h5/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/template-h5", - "version": "2.0.0-alpha.1", + "version": "2.0.0", "description": "fes 移动端项目模版", "scripts": { "build": "fes build", diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index e078097e..25c5325d 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/template", - "version": "2.0.0-alpha.1", + "version": "2.0.0", "description": "fes项目模版", "scripts": { "build": "fes build", @@ -52,9 +52,9 @@ "@fesjs/plugin-locale": "^2.0.0-rc.0", "@fesjs/plugin-model": "^2.0.0-rc.0", "@fesjs/plugin-enums": "^2.0.0-rc.0", - "@fesjs/plugin-jest": "^2.0.0-alpha.8", - "@fesjs/plugin-vuex": "^2.0.0-alpha.8", - "@fesjs/plugin-request": "^2.0.0-alpha.8", + "@fesjs/plugin-jest": "^2.0.0-rc.0", + "@fesjs/plugin-vuex": "^2.0.0-rc.0", + "@fesjs/plugin-request": "^2.0.0-rc.0", "ant-design-vue": "2.0.0", "vue": "^3.0.5", "vuex": "^4.0.0" From aab4e814a9494b767cf63f514b6dfa0d49216b8d Mon Sep 17 00:00:00 2001 From: wanchun <445436867@qq.com> Date: Sat, 6 Mar 2021 22:44:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dwin=E4=B8=8Bcopy?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/plugins/commands/webpackConfig/html.js | 5 ++++- .../fes-preset-built-in/src/plugins/features/globalCSS.js | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js index a3e8cc91..e8b0c37e 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js @@ -1,5 +1,8 @@ import { join, resolve } from 'path'; import { existsSync } from 'fs'; +import { + winPath, +} from '@umijs/utils'; import resolveDefine from './resolveDefine'; export default async function createHtmlWebpackConfig({ @@ -41,7 +44,7 @@ export default async function createHtmlWebpackConfig({ ? htmlPath : defaultHtmlPath; - publicCopyIgnore.push(htmlOptions.template); + publicCopyIgnore.push(winPath(htmlOptions.template)); webpackConfig .plugin('html') .use(require.resolve('html-webpack-plugin'), [htmlOptions]); 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..39b90a4e 100644 --- a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js +++ b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js @@ -10,7 +10,6 @@ export default (api) => { const files = [ 'global.css', 'global.less', - 'global.stylus' ]; const globalCSSFile = files .map(file => join(absSrcPath || '', file))