From 0fef06e0c6d0c4cecd7ba3e59e9e6e1086e1f9d3 Mon Sep 17 00:00:00 2001 From: chencheng Date: Mon, 26 Mar 2018 17:15:27 +0800 Subject: [PATCH] use umi-plugin-dll to enable dll --- .umirc.js | 7 ++ package.json | 17 ++-- src/pages/chart/ECharts/{index.js => page.js} | 2 +- .../chart/ECharts/{index.less => page.less} | 0 src/pages/chart/ECharts/theme/shine.js | 4 +- .../chart/Recharts/{index.js => page.js} | 2 +- .../chart/Recharts/{index.less => page.less} | 0 .../chart/highCharts/{index.js => page.js} | 2 +- .../highCharts/{index.less => page.less} | 0 version.js | 82 ------------------- 10 files changed, 21 insertions(+), 95 deletions(-) rename src/pages/chart/ECharts/{index.js => page.js} (98%) rename src/pages/chart/ECharts/{index.less => page.less} (100%) rename src/pages/chart/Recharts/{index.js => page.js} (96%) rename src/pages/chart/Recharts/{index.less => page.less} (100%) rename src/pages/chart/highCharts/{index.js => page.js} (96%) rename src/pages/chart/highCharts/{index.less => page.less} (100%) delete mode 100644 version.js diff --git a/.umirc.js b/.umirc.js index 9ca6633..5e176d2 100644 --- a/.umirc.js +++ b/.umirc.js @@ -15,5 +15,12 @@ export default { ], }, ], + [ + 'umi-plugin-dll', + { + exclude: [], + include: ["dva", "dva/router", "dva/saga", "dva/fetch", "antd/es"], + }, + ], ], } diff --git a/package.json b/package.json index 82614eb..d78a1de 100644 --- a/package.json +++ b/package.json @@ -15,24 +15,20 @@ "echarts-liquidfill": "^1.1.0", "highcharts-exporting": "^0.1.2", "highcharts-more": "^0.1.2", - "history": "^4.7.2", "js-beautify": "^1.6.14", "jsonp": "^0.2.1", "lodash": "^4.17.4", - "mockjs": "^1.0.1-beta3", "nprogress": "^0.2.0", "path-to-regexp": "^2.1.0", "prop-types": "^15.5.10", "qs": "^6.5.0", "rc-tween-one": "^1.3.1", + "react-adsense": "^0.0.5", "react-countup": "^3.0.2", "react-draft-wysiwyg": "^1.10.0", "react-helmet": "^5.1.3", "react-highcharts": "^15.0.0", - "recharts": "^1.0.0-beta.0", - "umi": "^1.1.0", - "umi-plugin-dva": "^0.4.0", - "umi-plugin-routes": "^0.1.2" + "recharts": "^1.0.0-beta.0" }, "devDependencies": { "babel-plugin-dev-expression": "^0.2.1", @@ -46,7 +42,12 @@ "eslint-plugin-jsx-a11y": "^5.1.1", "eslint-plugin-react": "^7.7.0", "less-vars-to-js": "^1.1.2", - "svg-sprite-loader": "^3.7.3" + "mockjs": "^1.0.1-beta3", + "svg-sprite-loader": "^3.7.3", + "umi": "^1.1.2", + "umi-plugin-dll": "^0.1.0", + "umi-plugin-dva": "^0.4.0", + "umi-plugin-routes": "^0.1.2" }, "pre-commit": [ "lint" @@ -54,7 +55,7 @@ "scripts": { "start": "cross-env BABELRC=1 BROWSER=none HOST=0.0.0.0 umi dev", "lint": "eslint --fix --ext .js src", - "build": "umi build", + "build": "cross-env BABELRC=1 umi build", "test": "umi test" } } diff --git a/src/pages/chart/ECharts/index.js b/src/pages/chart/ECharts/page.js similarity index 98% rename from src/pages/chart/ECharts/index.js rename to src/pages/chart/ECharts/page.js index 120260c..35f2986 100644 --- a/src/pages/chart/ECharts/index.js +++ b/src/pages/chart/ECharts/page.js @@ -2,7 +2,7 @@ import React from 'react' import { Radio } from 'antd' import { Page } from 'components' import EchartsComponent from './EchartsComponent' -import styles from './index.less' +import styles from './page.less' const RadioGroup = Radio.Group diff --git a/src/pages/chart/ECharts/index.less b/src/pages/chart/ECharts/page.less similarity index 100% rename from src/pages/chart/ECharts/index.less rename to src/pages/chart/ECharts/page.less diff --git a/src/pages/chart/ECharts/theme/shine.js b/src/pages/chart/ECharts/theme/shine.js index 027fb4e..9d342ab 100644 --- a/src/pages/chart/ECharts/theme/shine.js +++ b/src/pages/chart/ECharts/theme/shine.js @@ -1,7 +1,7 @@ (function (root, factory) { - if (typeof define === 'function' && define.amd) { + if (typeof define === 'function' && define.amd) { // eslint-disable-line // AMD. Register as an anonymous module. - define(['exports', 'echarts'], factory) + define(['exports', 'echarts'], factory) // eslint-disable-line } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') { // CommonJS factory(exports, require('echarts')) diff --git a/src/pages/chart/Recharts/index.js b/src/pages/chart/Recharts/page.js similarity index 96% rename from src/pages/chart/Recharts/index.js rename to src/pages/chart/Recharts/page.js index 32a0990..0bd0f9f 100644 --- a/src/pages/chart/Recharts/index.js +++ b/src/pages/chart/Recharts/page.js @@ -2,7 +2,7 @@ import React from 'react' import { Radio } from 'antd' import { Page } from 'components' import ReChartsComponent from './ReChartsComponent' -import styles from './index.less' +import styles from './page.less' const RadioGroup = Radio.Group diff --git a/src/pages/chart/Recharts/index.less b/src/pages/chart/Recharts/page.less similarity index 100% rename from src/pages/chart/Recharts/index.less rename to src/pages/chart/Recharts/page.less diff --git a/src/pages/chart/highCharts/index.js b/src/pages/chart/highCharts/page.js similarity index 96% rename from src/pages/chart/highCharts/index.js rename to src/pages/chart/highCharts/page.js index 7941c2f..06ea85a 100644 --- a/src/pages/chart/highCharts/index.js +++ b/src/pages/chart/highCharts/page.js @@ -2,7 +2,7 @@ import React from 'react' import { Radio } from 'antd' import { Page } from 'components' import HighChartsComponent from './HighChartsComponent' -import styles from './index.less' +import styles from './page.less' const RadioGroup = Radio.Group diff --git a/src/pages/chart/highCharts/index.less b/src/pages/chart/highCharts/page.less similarity index 100% rename from src/pages/chart/highCharts/index.less rename to src/pages/chart/highCharts/page.less diff --git a/version.js b/version.js deleted file mode 100644 index f463575..0000000 --- a/version.js +++ /dev/null @@ -1,82 +0,0 @@ -const fs = require('fs') -const path = require('path') -const beautify = require('js-beautify').js_beautify -const config = require('./package.json') - -const dist = path.join(`${__dirname}/dist`) -const maxVersion = 5 - -const writeVersion = () => new Promise((resolve, reject) => { - const { version } = config - const numbers = version.split('.') - numbers[2] = Number(numbers[2]) + 1 - config.version = numbers.join('.') - - fs.writeFile(path.join(__dirname, 'package.json'), beautify(JSON.stringify(config), { indent_size: 2 }), (err) => { - if (err) { - reject() - } - resolve() - console.log(`version: ${config.version}`) - }) -}) - -const removeFolder = (folderPath) => { - let files = [] - if (fs.existsSync(folderPath)) { - files = fs.readdirSync(folderPath) - files.forEach((file) => { - const curPath = `${folderPath}/${file}` - if (fs.statSync(curPath).isDirectory()) { - removeFolder(curPath) - } else { - fs.unlinkSync(curPath) - } - }) - fs.rmdirSync(folderPath) - } -} - -const start = async () => { - const files = fs.readdirSync(dist) - const promises = files.map(file => new Promise((resolve, reject) => { - fs.stat(`${dist}/${file}`, (err, stats) => { - if (err) { - reject() - } else { - resolve(!stats.isFile() - ? file - : null) - } - }) - })) - - const result = await Promise.all(promises) - - const folders = result.filter((item) => { - if (item) { - return item.split('.').length === 3 - } - return false - }).sort((a, b) => { - const an = a.split('.').map(_ => Number(_)) - const bn = b.split('.').map(_ => Number(_)) - if (an[0] === bn[0]) { - if (an[1] === bn[1]) { - return an[2] < bn[2] - } - return an[1] < bn[1] - } - return an[0] < bn[0] - }).filter((item, index) => { - return index > (maxVersion - 1) - }) - - for (const item of folders) { - await removeFolder(`${dist}/${item}`) - } - - await writeVersion() -} - -start()