Merge remote-tracking branch 'scaffold/master'
# Conflicts:
# .roadhogrc.js
# package.json
# src/models/domain.js
# src/models/main/index.js
# src/router.js
# src/routes/domain/index.js
# src/routes/main/header.js
更新到最新的脚手架
正在显示
.babelrc
0 → 100644
.roadhogrc.js
deleted
100644 → 0
.roadhogrc.mock.js
deleted
100644 → 0
cache.js
deleted
100644 → 0
config.js
0 → 100644
my-babel-register.js
deleted
100644 → 0
package-lock.json
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
| { | ||
| "private": true, | ||
| "scripts": { | ||
| "start": "roadhog server", | ||
| "build": "roadhog build", | ||
| "start": "cross-env NODE_ENV=development webpack-dev-server --open --config webpack.dev.js", | ||
| "build": "cross-env NODE_ENV=production webpack --config webpack.prod.js", | ||
| "test": "roadhog test --require ./test_setup.js", | ||
| "lint": "eslint --ext .js src test", | ||
| "precommit": "npm run lint", | ||
| "storybook": "start-storybook -p 6006", | ||
| "build-storybook": "build-storybook" | ||
| "storybook": "cross-env NODE_ENV=development start-storybook -p 6006", | ||
| "build-storybook": "cross-env NODE_ENV=production build-storybook" | ||
| }, | ||
| "engines": { | ||
| "install-node": "6.9.2" | ||
| }, | ||
| "browserslist": [ | ||
| "ie >= 9" | ||
| ], | ||
| "sideEffects": ["src/polyfill.js"], | ||
| "dependencies": { | ||
| "antd": "^2.13.0", | ||
| "axo": "0.0.2", | ||
| "babel-plugin-import": "^1.2.1", | ||
| "babel-runtime": "^6.9.2", | ||
| "bowser": "^1.8.1", | ||
| "bundle-loader": "^0.5.5", | ||
| "dva": "^1.2.1", | ||
| "dva-loading": "^0.2.1", | ||
| "fastjson_ref_resolver": "latest", | ||
| "@babel/polyfill": "^7.0.0", | ||
| "@babel/runtime": "^7.1.2", | ||
| "antd": "^3.9.2", | ||
| "axo": "^0.0.2", | ||
| "bowser": "^1.9.4", | ||
| "classnames": "^2.2.6", | ||
| "dva": "^2.4.1", | ||
| "dva-loading": "^2.0.6", | ||
| "fastjson_ref_resolver": "^0.0.3", | ||
| "fingerprintjs": "^0.5.3", | ||
| "lodash": "^4.17.4", | ||
| "github-markdown-css": "^2.10.0", | ||
| "highlight.js": "^9.12.0", | ||
| "history": "^4.7.2", | ||
| "hoist-non-react-statics": "^3.0.1", | ||
| "is-promise": "^2.1.0", | ||
| "lodash": "^4.17.10", | ||
| "lowdb": "^1.0.0", | ||
| "moment": "^2.18.1", | ||
| "prop-types": "^15.5.10", | ||
| "moment": "^2.22.2", | ||
| "prop-types": "^15.6.2", | ||
| "qrcode": "^1.0.0", | ||
| "react": "^15.6.1", | ||
| "react-dom": "^15.6.1", | ||
| "react-json-view": "^1.11.4", | ||
| "react-sizeme": "^2.3.4", | ||
| "resolve-pathname": "^2.1.0", | ||
| "uuid": "^3.1.0", | ||
| "react": "^16.5.2", | ||
| "react-async-wrapper": "^1.0.6", | ||
| "react-dom": "^16.5.2", | ||
| "react-json-view": "^1.19.1", | ||
| "react-markdown": "^3.6.0", | ||
| "react-router-4-compat": "^1.0.8", | ||
| "react-sizeme": "^2.5.2", | ||
| "redux-persist": "^5.10.0", | ||
| "resolve-pathname": "^2.2.0", | ||
| "uuid": "^3.3.2", | ||
| "word-wrap": "^1.2.3", | ||
| "xml2js": "^0.4.17" | ||
| "xml2js": "^0.4.19" | ||
| }, | ||
| "devDependencies": { | ||
| "@storybook/react": "^3.2.8", | ||
| "babel-eslint": "^7.1.1", | ||
| "babel-plugin-dva-hmr": "^0.3.2", | ||
| "babel-plugin-transform-runtime": "^6.9.0", | ||
| "babel-preset-es2016": "^6.24.1", | ||
| "babel-preset-es2017": "^6.24.1", | ||
| "babel-register": "^6.24.1", | ||
| "chai": "^4.0.2", | ||
| "cross-env": "^5.0.1", | ||
| "ejs-loader": "^0.3.0", | ||
| "enzyme": "^2.9.1", | ||
| "eslint": "^3.12.2", | ||
| "eslint-config-airbnb": "^13.0.0", | ||
| "eslint-plugin-import": "^2.2.0", | ||
| "eslint-plugin-jsx-a11y": "^2.2.3", | ||
| "eslint-plugin-react": "^6.8.0", | ||
| "expect": "^1.20.2", | ||
| "http-proxy-middleware": "^0.17.4", | ||
| "husky": "^0.12.0", | ||
| "jsdom": "^11.0.0", | ||
| "less": "^2.7.2", | ||
| "less-loader": "^4.0.0", | ||
| "@babel/core": "^7.1.2", | ||
| "@babel/helper-plugin-utils": "^7.0.0", | ||
| "@babel/plugin-proposal-async-generator-functions": "^7.1.0", | ||
| "@babel/plugin-proposal-class-properties": "^7.1.0", | ||
| "@babel/plugin-proposal-decorators": "^7.1.0", | ||
| "@babel/plugin-proposal-do-expressions": "^7.0.0", | ||
| "@babel/plugin-proposal-export-default-from": "^7.0.0", | ||
| "@babel/plugin-proposal-export-namespace-from": "^7.0.0", | ||
| "@babel/plugin-proposal-function-bind": "^7.0.0", | ||
| "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", | ||
| "@babel/plugin-proposal-object-rest-spread": "^7.0.0", | ||
| "@babel/plugin-proposal-optional-catch-binding": "^7.0.0", | ||
| "@babel/plugin-proposal-optional-chaining": "^7.0.0", | ||
| "@babel/plugin-proposal-pipeline-operator": "^7.0.0", | ||
| "@babel/plugin-syntax-dynamic-import": "^7.0.0", | ||
| "@babel/plugin-transform-react-constant-elements": "^7.0.0", | ||
| "@babel/plugin-transform-react-inline-elements": "^7.0.0", | ||
| "@babel/plugin-transform-runtime": "^7.1.0", | ||
| "@babel/preset-env": "^7.1.0", | ||
| "@babel/preset-react": "^7.0.0", | ||
| "@babel/register": "^7.0.0", | ||
| "@storybook/addon-actions": "4.0.0", | ||
| "@storybook/addon-info": "4.0.0", | ||
| "@storybook/addon-links": "4.0.0", | ||
| "@storybook/react": "4.0.0", | ||
| "@types/webpack": "^4.4.17", | ||
| "autoprefixer": "^9.1.5", | ||
| "awesome-typescript-loader": "^5.2.1", | ||
| "babel-core": "^7.0.0-bridge.0", | ||
| "babel-eslint": "^9.0.0", | ||
| "babel-loader": "^8.0.4", | ||
| "babel-plugin-dev-expression": "^0.2.1", | ||
| "babel-plugin-dva-hmr": "^0.4.1", | ||
| "babel-plugin-import": "^1.11.0", | ||
| "babel-plugin-lodash": "^3.3.4", | ||
| "babel-plugin-transform-react-remove-prop-types": "^0.4.19", | ||
| "cache-loader": "1.2.2", | ||
| "case-sensitive-paths-webpack-plugin": "^2.1.2", | ||
| "chai": "^4.1.2", | ||
| "clean-webpack-plugin": "^0.1.19", | ||
| "copy-webpack-plugin": "^4.5.4", | ||
| "cross-env": "^5.2.0", | ||
| "ejs-loader": "^0.3.1", | ||
| "enzyme": "^3.3.0", | ||
| "eslint": "^5.5.0", | ||
| "eslint-config-airbnb": "^17.1.0", | ||
| "eslint-loader": "^2.1.0", | ||
| "eslint-plugin-import": "^2.14.0", | ||
| "eslint-plugin-jsx-a11y": "^6.1.1", | ||
| "eslint-plugin-lodash-fp": "^2.1.3", | ||
| "eslint-plugin-react": "^7.11.1", | ||
| "highlight-loader": "^0.7.2", | ||
| "html-webpack-plugin": "^3.2.0", | ||
| "http-proxy-middleware": "^0.19.0", | ||
| "jest": "^23.6.0", | ||
| "jsdom": "^12.0.0", | ||
| "less": "^3.8.1", | ||
| "less-loader": "^4.1.0", | ||
| "lodash-webpack-plugin": "^0.11.5", | ||
| "markdown-loader": "^4.0.0", | ||
| "mini-css-extract-plugin": "^0.4.2", | ||
| "mockjs": "^1.0.1-beta3", | ||
| "optimize-css-assets-webpack-plugin": "^5.0.1", | ||
| "path": "^0.12.7", | ||
| "react-test-renderer": "^15.6.1", | ||
| "redbox-react": "^1.3.2", | ||
| "roadhog": "^1.2.2" | ||
| "postcss-flexbugs-fixes": "^4.1.0", | ||
| "postcss-safe-parser": "^4.0.1", | ||
| "raw-loader": "^0.5.1", | ||
| "react-dev-utils": "^5.0.2", | ||
| "react-test-renderer": "^16.5.0", | ||
| "redbox-react": "^1.6.0", | ||
| "style-loader": "^0.23.1", | ||
| "uglifyjs-webpack-plugin": "^1.3.0", | ||
| "url-loader": "^1.1.1", | ||
| "webpack": "^4.23.1", | ||
| "webpack-bundle-analyzer": "^3.0.3", | ||
| "webpack-cli": "^3.1.2", | ||
| "webpack-dev-server": "^3.1.10", | ||
| "webpack-manifest-plugin": "^2.0.4", | ||
| "webpack-merge": "^4.1.4" | ||
| } | ||
| } |
postcss.config.js
0 → 100644
proxy.js
0 → 100644
src/components/hoc/size.js
0 → 100644
src/polyfill.js
0 → 100644
src/services/tools/envers.js
0 → 100644
src/utils/async.js
0 → 100644
src/utils/datasource.js
0 → 100644
src/utils/layout.js
0 → 100644
src/utils/meta.js
0 → 100644
src/utils/model.js
0 → 100644
stories/lib/dva.js
0 → 100644
stories/lib/lazy.js
0 → 100644
stories/lib/login.js
0 → 100644
stories/test.md
0 → 100644
theme.js
0 → 100644
tools/applyMock.js
0 → 100644
tools/babel-preset.js
0 → 100644
webpack.common.js
0 → 100644
webpack.config.js
deleted
100644 → 0
webpack.dev.js
0 → 100644
webpack.prod.js
0 → 100644
请
注册
或者
登录
后发表评论