blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-06 03:59:53 +08:00
Code Issues Projects Releases Wiki Activity

fix: fixed merge conflict

Browse Source
This commit is contained in:
bac-joker 2021-03-07 10:42:51 +08:00
commit 72eea4f52a
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/guide/getting-started.md
View File

@ -113,8 +113,6 @@ Starting the development server http://localhost:8080 ...
# 开发调试 # 开发调试
npm run dev npm run dev
> @fesjs/fes-template@2.0.0-alpha.1 dev /Users/harrywan/company/git/fes.js/packages/fes-template
> fes dev > fes dev
Starting the development server http://localhost:8080 ... Starting the development server http://localhost:8080 ...
@ -161,7 +159,6 @@ $ fes build
# 构建 # 构建
npm run build npm run build
> @fesjs/fes-template@2.0.0-alpha.1 build /Users/harrywan/company/git/fes.js/packages/fes-template
> fes build > fes build
✔ Webpack ✔ Webpack

3
docs/zh/guide/getting-started.md
View File

@ -113,8 +113,6 @@ Starting the development server http://localhost:8080 ...
# 开发调试 # 开发调试
npm run dev npm run dev
> @fesjs/fes-template@2.0.0-alpha.1 dev /Users/harrywan/company/git/fes.js/packages/fes-template
> fes dev > fes dev
Starting the development server http://localhost:8080 ... Starting the development server http://localhost:8080 ...
@ -162,7 +160,6 @@ $ fes build
# 构建 # 构建
npm run build npm run build
> @fesjs/fes-template@2.0.0-alpha.1 build /Users/harrywan/company/git/fes.js/packages/fes-template
> fes build > fes build
✔ Webpack ✔ Webpack

2
packages/create-fes-app/templates/app/h5/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@fesjs/template-h5", "name": "@fesjs/template-h5",
"version": "2.0.0-alpha", "version": "2.0.0-rc.0",
"description": "fes 移动端项目模版", "description": "fes 移动端项目模版",
"scripts": { "scripts": {
"build": "fes build", "build": "fes build",

2
packages/create-fes-app/templates/app/pc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@fesjs/template", "name": "@fesjs/template",
"version": "2.0.0-alpha", "version": "2.0.0-rc.0",
"description": "fes项目模版", "description": "fes项目模版",
"scripts": { "scripts": {
"build": "fes build", "build": "fes build",

5
packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js
View File

@ -1,5 +1,8 @@
import { join, resolve } from 'path'; import { join, resolve } from 'path';
import { existsSync } from 'fs'; import { existsSync } from 'fs';
import {
winPath
} from '@umijs/utils';
import resolveDefine from './resolveDefine'; import resolveDefine from './resolveDefine';
export default async function createHtmlWebpackConfig({ export default async function createHtmlWebpackConfig({
@ -41,7 +44,7 @@ export default async function createHtmlWebpackConfig({
? htmlPath ? htmlPath
: defaultHtmlPath; : defaultHtmlPath;
publicCopyIgnore.push(htmlOptions.template); publicCopyIgnore.push(winPath(htmlOptions.template));
webpackConfig webpackConfig
.plugin('html') .plugin('html')
.use(require.resolve('html-webpack-plugin'), [htmlOptions]); .use(require.resolve('html-webpack-plugin'), [htmlOptions]);

2
packages/fes-template-h5/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@fesjs/template-h5", "name": "@fesjs/template-h5",
"version": "2.0.0-alpha.1", "version": "2.0.0",
"description": "fes 移动端项目模版", "description": "fes 移动端项目模版",
"scripts": { "scripts": {
"build": "fes build", "build": "fes build",

8
packages/fes-template/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@fesjs/template", "name": "@fesjs/template",
"version": "2.0.0-alpha.1", "version": "2.0.0",
"description": "fes项目模版", "description": "fes项目模版",
"scripts": { "scripts": {
"build": "fes build", "build": "fes build",
@ -52,9 +52,9 @@
"@fesjs/plugin-locale": "^2.0.0-rc.0", "@fesjs/plugin-locale": "^2.0.0-rc.0",
"@fesjs/plugin-model": "^2.0.0-rc.0", "@fesjs/plugin-model": "^2.0.0-rc.0",
"@fesjs/plugin-enums": "^2.0.0-rc.0", "@fesjs/plugin-enums": "^2.0.0-rc.0",
"@fesjs/plugin-jest": "^2.0.0-alpha.8", "@fesjs/plugin-jest": "^2.0.0-rc.0",
"@fesjs/plugin-vuex": "^2.0.0-alpha.8", "@fesjs/plugin-vuex": "^2.0.0-rc.0",
"@fesjs/plugin-request": "^2.0.0-alpha.8", "@fesjs/plugin-request": "^2.0.0-rc.0",
"ant-design-vue": "2.0.0", "ant-design-vue": "2.0.0",
"vue": "^3.0.5", "vue": "^3.0.5",
"vuex": "^4.0.0" "vuex": "^4.0.0"