Skip to content

M
mr-julyedu
Commit 0a423a3c by zhanghaozhe
Options

Merge branch 'master' into login-encryption 

# Conflicts:
#	src/components/passport/wechatLogin/index.js
#	src/router.js
parents c0039060 20e6cbae
Showing with 3 additions and 420 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

.eslintignore 0 → 100644
src/
\ No newline at end of file
.gitignore
......@@ -10,7 +10,7 @@
# production
/build
/.history
.history/
.idea/
# misc
.DS_Store
......
.history/.babelrc_20190415203912 deleted 100644 → 0
{
"plugins": [
[
"import",
{
"libraryName": "antd-mobile",
"style": true
}
],
]
}
\ No newline at end of file
.history/.roadhogrc_20190415184638 deleted 100644 → 0
{
"extraBabelPlugins": [
["import", {
"libraryName": "antd",
"libraryDirectory": "lib",
"style": "css"
}]
]
}
\ No newline at end of file
.history/config-overrides_20190415110012.js deleted 100644 → 0
module.exports = function override(config, env) {
// do stuff with the webpack config...
return config;
};
\ No newline at end of file
.history/config-overrides_20190415110157.js deleted 100644 → 0
const { override, fixBabelImports } = require('customize-cra');
module.exports = override(
fixBabelImports('import', {
libraryName: 'antd',
libraryDirectory: 'es',
style: 'css',
}),
);
\ No newline at end of file
.history/config-overrides_20190415112626.js deleted 100644 → 0
const { injectBabelPlugin, getLoader } = require('react-app-rewired');
const fileLoaderMatcher = function (rule) {
return rule.loader && rule.loader.indexOf(`file-loader`) != -1;
}
module.exports = function override(config, env) {
// babel-plugin-import
config = injectBabelPlugin(['import', {
libraryName: 'antd-mobile',
//style: 'css',
style: true, // use less for customized theme
}], config);
// customize theme
config.module.rules[1].oneOf.unshift(
{
test: /\.less$/,
use: [
require.resolve('style-loader'),
require.resolve('css-loader'),
{
loader: require.resolve('postcss-loader'),
options: {
// Necessary for external CSS imports to work
// https://github.com/facebookincubator/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
require('postcss-flexbugs-fixes'),
autoprefixer({
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
],
flexbox: 'no-2009',
}),
],
},
},
{
loader: require.resolve('less-loader'),
options: {
// theme vars, also can use theme.js instead of this.
modifyVars: { "@brand-primary": "#1DA57A" },
},
},
]
}
);
// css-modules
config.module.rules[1].oneOf.unshift(
{
test: /\.css$/,
exclude: /node_modules|antd-mobile\.css/,
use: [
require.resolve('style-loader'),
{
loader: require.resolve('css-loader'),
options: {
modules: true,
importLoaders: 1,
localIdentName: '[local]___[hash:base64:5]'
},
},
{
loader: require.resolve('postcss-loader'),
options: {
// Necessary for external CSS imports to work
// https://github.com/facebookincubator/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
require('postcss-flexbugs-fixes'),
autoprefixer({
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
],
flexbox: 'no-2009',
}),
],
},
},
]
}
);
// file-loader exclude
let l = getLoader(config.module.rules, fileLoaderMatcher);
l.exclude.push(/\.less$/);
return config;
};
\ No newline at end of file
.history/config-overrides_20190415114046.js deleted 100644 → 0
const {
override,
fixBabelImports,
// addLessLoader,
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile", libraryDirectory: "es", style: 'css' // change importing css to less
})
)
\ No newline at end of file
.history/config-overrides_20190415114202.js deleted 100644 → 0
const {
override,
fixBabelImports,
// addLessLoader,
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile", libraryDirectory: "es", style: 'css' // change importing css to less
})
)
\ No newline at end of file
.history/config-overrides_20190415115512.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': '#1DA57A' },
}),
)
\ No newline at end of file
.history/config-overrides_20190415122538.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': '#1DA57A' },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415122743.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': '#1DA57A' },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415204811.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
})
)
\ No newline at end of file
.history/config-overrides_20190415204819.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
)
\ No newline at end of file
.history/config-overrides_20190415204935.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': '#1DA57A' },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415205048.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { 'primary-color': '#000000', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415205126.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { 'primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415210048.js deleted 100644 → 0
const { injectBabelPlugin } = require('react-app-rewired');
module.exports = function override(config, env) {
config = injectBabelPlugin(['import', { libraryName: 'antd', style: 'css' }], config);
return config;
.history/config-overrides_20190415210102.js deleted 100644 → 0
const { injectBabelPlugin } = require('react-app-rewired');
module.exports = function override(config, env) {
config = injectBabelPlugin(['import', { libraryName: 'antd', style: 'css' }], config);
return config;
};
\ No newline at end of file
.history/config-overrides_20190415210127.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader,
addDecoratorsLegacy
} = require("customize-cra");
module.exports = override(
addDecoratorsLegacy(),
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { 'primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415210336.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { 'primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415210459.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: true // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415210553.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: 'css' // change importing css to less
}),
addLessLoader({
javascriptEnabled: true,
modifyVars: { '@primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
.history/config-overrides_20190415210906.js deleted 100644 → 0
const {
override,
fixBabelImports,
addLessLoader
} = require("customize-cra");
module.exports = override(
fixBabelImports("import", {
libraryName: "antd-mobile",
libraryDirectory: "es",
style: 'css' // change importing css to less
}),
addLessLoader({
strictMath: true,
noIeCompat: true,
javascriptEnabled: true,
modifyVars: { '@primary-color': 'red', },
localIdentName: '[local]--[hash:base64:5]' // 自定义 CSS Modules 的 localIdentName
}),
)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment