Skip to content

Commit 0180f10

Browse files
Garfield550Garfield550
committed
chore: make taro-ui-docs can build
1 parent 6667a7a commit 0180f10

File tree

6 files changed

+52
-38
lines changed

6 files changed

+52
-38
lines changed

‎packages/taro-ui-docs/build/addImportLoader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const formatModule = (imports, js, jsx, state, method) => {
6262
6363
${js}
6464
65-
class MarkdownItReactComponent extends Nerv.Component {
65+
class MarkdownItReactComponent extends React.Component {
6666
constructor(props){
6767
super(props);
6868
this.state = ${state || '{}'};
@@ -116,7 +116,7 @@ module.exports = function (source) {
116116
attributes: { imports: importMap }
117117
} = frontMatter(source)
118118

119-
const imports = `import * as Nerv from 'nervjs'; import copy from 'copy-to-clipboard';${importMap}`
119+
const imports = `import React from 'react'; import copy from 'copy-to-clipboard';${importMap}`
120120

121121
const moduleJS = []
122122
const state = ''

‎packages/taro-ui-docs/build/dev-server.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const port = 8002
2020
const protocol = 'http'
2121
const urls = prepareUrls(protocol, host, port)
2222
const webpackConf = webpackMerge(webpackBaseConf, webpackDevConf)
23+
// eslint-disable-next-line no-unused-vars
2324
for (const key in webpackConf.entry) {
2425
const entryItem = webpackConf.entry[key]
2526
if (Array.isArray(entryItem)) {

‎packages/taro-ui-docs/build/webpack.base.config.js

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const path = require('path')
22
const HtmlWebpackPlugin = require('html-webpack-plugin')
33
const autoprefixer = require('autoprefixer')
4-
const CopyWebpackPlugin = require('copy-webpack-plugin')
4+
// const CopyWebpackPlugin = require('copy-webpack-plugin')
55

6-
const conf = require('./conf')
6+
// const conf = require('./conf')
77
const { getProjectRoot } = require('./util')
88

99
const projectRoot = getProjectRoot()
10-
const siteRoot = path.join(projectRoot, 'docs')
10+
const siteRoot = path.join(projectRoot)
1111

1212
module.exports = {
1313
entry: {
@@ -20,7 +20,10 @@ module.exports = {
2020
{
2121
test: /\.jsx?$/,
2222
exclude: /(node_modules|bower_components)/,
23-
use: 'babel-loader'
23+
loader: 'babel-loader',
24+
options: {
25+
rootMode: 'upward'
26+
}
2427
},
2528
{
2629
test: /\.html$/,
@@ -32,10 +35,15 @@ module.exports = {
3235
},
3336
{
3437
test: /\.md$/,
35-
loader: `babel-loader!${path.join(
36-
__dirname,
37-
'./addImportLoader.js'
38-
)}`
38+
use: [
39+
{
40+
loader: 'babel-loader',
41+
options: {
42+
rootMode: 'upward'
43+
}
44+
},
45+
`${path.join(__dirname, './addImportLoader.js')}`
46+
]
3947
},
4048
{
4149
test: /\.(css|scss|sass)(\?.*)?$/,
@@ -107,21 +115,19 @@ module.exports = {
107115
resolve: {
108116
extensions: ['.js', '.jsx'],
109117
alias: {
110-
react: 'nervjs',
111-
'react-dom': 'nervjs',
112-
'@md': path.resolve(__dirname, '../docs/markdown/')
118+
'@md': path.resolve(__dirname, '../markdown/')
113119
}
114120
},
115121
plugins: [
116122
new HtmlWebpackPlugin({
117123
template: `${siteRoot}/index.html`
118-
}),
124+
})
119125
// copy static h5 pages
120-
new CopyWebpackPlugin([
121-
{
122-
from: path.join(siteRoot, 'h5'),
123-
to: path.resolve(projectRoot, conf.output, 'h5')
124-
}
125-
])
126+
// new CopyWebpackPlugin([
127+
// {
128+
// from: path.join(siteRoot, 'h5'),
129+
// to: path.resolve(projectRoot, conf.output, 'h5')
130+
// }
131+
// ])
126132
]
127133
}

‎packages/taro-ui-docs/build/webpack.prod.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
BASE_NAME: `'/taro-ui'`
3232
}),
3333
new FaviconWebpackPlugin({
34-
logo: path.resolve(projectRoot, 'docs/assets/favicon.png'),
34+
logo: path.resolve(projectRoot, 'assets/favicon.png'),
3535
prefix: 'favicons/'
3636
})
3737
]

‎packages/taro-ui-docs/package.json

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,50 @@
1111
},
1212
"license": "MIT",
1313
"scripts": {
14-
"dev:doc": "node ./build/dev-server",
15-
"build:h5": "node ./build/build-static",
16-
"build:doc": "node ./build/build-docs"
14+
"dev": "yarn run build:static && node ./build/dev-server",
15+
"build": "yarn run build:doc && yarn run build:static",
16+
"build:doc": "node ./build/build-docs",
17+
"build:static": "node ./build/build-static",
18+
"clean": "rimraf dist"
1719
},
1820
"browserslist": [
1921
"last 3 versions",
2022
"Android >= 4.1",
2123
"ios >= 8"
2224
],
23-
"dependencies": {},
25+
"dependencies": {
26+
"at-ui-style": "^1.5.1",
27+
"classnames": "^2.2.6",
28+
"copy-to-clipboard": "^3.3.1",
29+
"core-js": "~3.6.0",
30+
"highlight.js": "^9.18.1",
31+
"qrcode.react": "^1.0.0",
32+
"react": "^16.13.1",
33+
"react-dom": "^16.13.1",
34+
"react-router-dom": "^5.1.2",
35+
"regenerator-runtime": "^0.13.5",
36+
"taro-ui-demo": "*"
37+
},
2438
"devDependencies": {
2539
"@babel/core": "^7.9.0",
2640
"@babel/plugin-proposal-class-properties": "^7.8.3",
2741
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
28-
"@babel/plugin-transform-react-jsx": "^7.9.4",
2942
"@babel/preset-env": "^7.9.0",
43+
"@babel/preset-react": "^7.9.4",
3044
"@types/classnames": "^2.2.10",
3145
"@types/react": "^16.9.32",
3246
"@types/react-dom": "^16.9.6",
3347
"@types/webpack-env": "^1.15.1",
34-
"at-ui-style": "^1.5.1",
3548
"babel-eslint": "^10.1.0",
3649
"babel-loader": "^8.1.0",
3750
"chalk": "^4.0.0",
38-
"classnames": "^2.2.6",
3951
"clean-webpack-plugin": "^3.0.0",
40-
"copy-to-clipboard": "^3.3.1",
4152
"copy-webpack-plugin": "^5.1.1",
4253
"css-loader": "^3.4.2",
4354
"favicons-webpack-plugin": "^3.0.1",
4455
"file-loader": "^6.0.0",
4556
"front-matter": "^3.1.0",
4657
"fs-extra": "^9.0.0",
47-
"highlight.js": "^9.18.1",
4858
"html-webpack-plugin": "^4.0.4",
4959
"html-withimg-loader": "^0.1.16",
5060
"json-loader": "^0.5.7",
@@ -54,11 +64,8 @@
5464
"ora": "^4.0.3",
5565
"postcss": "^7.0.27",
5666
"postcss-loader": "^3.0.0",
57-
"qrcode.react": "^1.0.0",
58-
"react": "^16.13.1",
59-
"react-dom": "^16.13.1",
60-
"react-router-dom": "^5.1.2",
6167
"sass-loader": "^8.0.2",
68+
"style-loader": "^1.1.3",
6269
"url-loader": "^4.0.0",
6370
"webpack": "^4.42.1",
6471
"webpack-dev-server": "^3.10.3",

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@
964964
"@babel/types" "^7.4.4"
965965
esutils "^2.0.2"
966966

967-
"@babel/preset-react@^7.7.4":
967+
"@babel/preset-react@^7.7.4", "@babel/preset-react@^7.9.4":
968968
version "7.9.4"
969969
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
970970
integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
@@ -5899,7 +5899,7 @@ core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
58995899
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
59005900
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
59015901

5902-
core-js@^3.4.1, core-js@^3.4.5, core-js@^3.6.3:
5902+
core-js@^3.4.1, core-js@^3.4.5, core-js@^3.6.3, core-js@~3.6.0:
59035903
version "3.6.4"
59045904
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
59055905
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
@@ -14050,7 +14050,7 @@ regenerator-runtime@^0.11.0:
1405014050
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
1405114051
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
1405214052

14053-
regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
14053+
regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5:
1405414054
version "0.13.5"
1405514055
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
1405614056
integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
@@ -15646,7 +15646,7 @@ strong-log-transformer@^2.0.0:
1564615646
minimist "^1.2.0"
1564715647
through "^2.3.4"
1564815648

15649-
[email protected]:
15649+
[email protected], style-loader@^1.1.3:
1565015650
version "1.1.3"
1565115651
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200"
1565215652
integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==

0 commit comments

Comments
 (0)