diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..92937ea --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +puppeteer_download_host=https://npm.taobao.org/mirrors +@fui:registry=https://npm.fineres.com/ diff --git a/babel.config.js b/babel.config.js index d83931d..9085ac7 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,29 +1,3 @@ -module.exports = function(api) { - api.cache(true); - const presets = [ - [ - '@babel/preset-env', - { - targets: { - ie: 9, - chrome: 47, - }, - }, - ], - '@babel/preset-typescript', - ]; - const plugins = [ - [ - '@babel/plugin-proposal-decorators', - { - legacy: true, - }, - ], - '@babel/plugin-proposal-class-properties', - ]; - - return { - presets, - plugins, - }; +module.exports = function (api) { + return require("@fui/babel-preset-fineui").configs.base(api) }; diff --git a/config/jest.environment.js b/config/jest.environment.js index b564081..2a3541f 100644 --- a/config/jest.environment.js +++ b/config/jest.environment.js @@ -12,7 +12,7 @@ class FineUiEnvironment extends JsdomEnvironment { [ '../node_modules/fineui/dist/fineui.js', - '../node_modules/fineui-materials/docs/materials.js', + '../node_modules/@fui/materials/docs/materials.js', '../config/fineui.prepare.js', './fineui.setup.js', ].forEach(scriptRelativePath => { diff --git a/index.html b/index.html index cfb9c39..f8c5d5f 100644 --- a/index.html +++ b/index.html @@ -1,34 +1,22 @@ - - - Fine Report - - - - - - -
- - - - - - - + + + Fine Report + + + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 9cd2bb5..e0abeca 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,6 @@ "nprogress": "0.2.0" }, "devDependencies": { - "@babel/core": "7.4.5", - "@babel/plugin-proposal-class-properties": "^7.5.0", - "@babel/plugin-proposal-decorators": "7.4.4", - "@babel/polyfill": "^7.8.3", - "@babel/preset-env": "7.4.5", - "@babel/preset-typescript": "7.3.3", "@types/jest": "24.0.11", "@typescript-eslint/eslint-plugin": "1.7.0", "@typescript-eslint/parser": "1.7.0", @@ -57,12 +51,11 @@ "webpack-cli": "3.3.5", "webpack-dev-server": "3.7.2", "webpack-merge": "4.2.1", - "ydoc": "4.1.0", - "ydoc-plugin-jsdoc": "0.0.3" + "@fui/babel-preset-fineui": "^1.0.0" }, "optionalDependencies": { - "fineui": "git+ssh://git@cloud.finedevelop.com:7999/visual/fineui.git", - "fineui-materials": "git+ssh://git@cloud.finedevelop.com:7999/fui/fineui-materials.git#release/10.0" + "fineui": "^2.0.0", + "@fui/materials": "10.0.0-release - 10.0.0-release.99999999999999" }, "scripts": { "dev": "cross-env NODE_ENV=mock webpack-dev-server -p --progress --config=webpack/webpack.dev.js --mode development --open", @@ -79,4 +72,4 @@ "pre-push": "npm run eslint && npm run test" } } -} +} \ No newline at end of file diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index 2c6e1ab..d93e397 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -36,7 +36,7 @@ chokidar module.exports = merge(common, { devtool: 'eval-source-map', entry: { - show: ['babel-polyfill', './src/i18n.ts', './src/request.ts', './src/index.ts'], + show: ['./src/i18n.ts', './src/request.ts', './src/index.ts'], }, output: { path: dirs.DEST,