Skip to content

Commit 10bd8ce

Browse files
committed
fix: 使用rimraf代替rm -rf 来跨平台使用,更新脚手架
1 parent db82ee8 commit 10bd8ce

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

example/ssr-with-js/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
},
1717
"scripts": {
1818
"debug": "egg-bin debug",
19-
"start": "rm -rf dist && concurrently \"npm run ssr\" \" npm run csr \"",
19+
"start": "rimraf dist && concurrently \"npm run ssr\" \" npm run csr \"",
2020
"ssr": "concurrently \"egg-bin dev\" \"cross-env NODE_ENV=development webpack --watch --config ./build/webpack.config.server.js\"",
2121
"csr": "cross-env NODE_ENV=development webpack-dev-server --port 8000 --hot --client-log-level error --config ./build/webpack.config.client.js",
2222
"prod": "npm run build && eggctl start",
2323
"build:server": "cross-env NODE_ENV=production webpack --config build/webpack.config.server.js",
24-
"build": "cross-env NODE_ENV=production webpack --config build/webpack.config.client.js && npm run build:server",
24+
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config build/webpack.config.client.js && npm run build:server",
2525
"analyze": "cross-env NODE_ENV=production npm_config_report=true npm run build"
2626
},
2727
"browserslist": [
@@ -57,6 +57,7 @@
5757
"postcss-loader": "3.0.0",
5858
"postcss-preset-env": "^6.0.5",
5959
"postcss-safe-parser": "4.0.1",
60+
"rimraf": "^2.6.3",
6061
"terser-webpack-plugin": "^1.2.0",
6162
"url-loader": "1.1.1",
6263
"webpack": "4.19.1",

packages/yk-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yk-cli",
3-
"version": "1.0.15",
3+
"version": "1.0.16",
44
"description": "ykcli for ssr",
55
"main": "./bin/index.js",
66
"types": "types/index.d.ts",

packages/yk-cli/src/cache.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import shell from 'shelljs'
1212
export async function cacheMange (option: Optional): Promise<void> {
1313
const useCache = await getVersionEffective(option)
1414
const language = option.language === 'javascript' ? 'js' : 'ts'
15-
// 如果没有缓存可用则拉取最新代码
15+
// 如果没有缓存可用或者远程代码更新则拉取最新代码
1616
if (!useCache) {
17+
shell.rm('-rf', resolveApp('./cache'))
1718
await downloadWithPromise('github:ykfe/egg-react-ssr#master', resolveApp('./cache'))
1819
}
1920
const example = resolveApp(`./cache/example/ssr-with-${language}`)

packages/yk-cli/tpl/package.json.nj

+9-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
},
1818
"scripts": {
1919
"debug": "egg-bin debug",
20-
"start": "concurrently \"npm run ssr\" \" npm run csr \"",
21-
"ssr": "rm -rf dist && concurrently \"egg-bin dev\" \"NODE_ENV=development webpack --watch --config ./build/webpack.config.server.js\"",
22-
"csr": "NODE_ENV=development webpack-dev-server --port 8000 --hot --client-log-level error --config ./build/webpack.config.client.js",
20+
"start": "rimraf dist && concurrently \"npm run ssr\" \" npm run csr \"",
21+
"ssr": "concurrently \"egg-bin dev\" \"cross-env NODE_ENV=development webpack --watch --config ./build/webpack.config.server.js\"",
22+
"csr": "cross-env NODE_ENV=development webpack-dev-server --port 8000 --hot --client-log-level error --config ./build/webpack.config.client.js",
2323
"prod": "npm run build && eggctl start",
24-
"build:server": "NODE_ENV=production webpack --config build/webpack.config.server.js",
25-
"build": "rm -rf dist && NODE_ENV=production webpack --config build/webpack.config.client.js && npm run build:server",
26-
"analyze": "NODE_ENV=production npm_config_report=true npm run build"
24+
"build:server": "cross-env NODE_ENV=production webpack --config build/webpack.config.server.js",
25+
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config build/webpack.config.client.js && npm run build:server",
26+
"analyze": "cross-env NODE_ENV=production npm_config_report=true npm run build"
2727
},
2828
"browserslist": [
2929
">0.2%",
@@ -36,14 +36,15 @@
3636
"caniuse-lite": "1.0.30000974"
3737
},
3838
"devDependencies": {
39+
"@babel/core": "^7.4.4",
3940
"@babel/preset-react": "^7.0.0",
4041
"@babel/register": "^7.0.0",
41-
"@babel/core": "^7.4.4",
4242
"@svgr/webpack": "2.4.1",
4343
"babel-loader": "8.0.4",
4444
"browserslist": "^4.6.3",
4545
"caniuse-lite": "1.0.30000974",
4646
"concurrently": "^4.1.0",
47+
"cross-env": "^5.2.0",
4748
"css-hot-loader": "^1.4.3",
4849
"css-loader": "1.0.0",
4950
"css-modules-require-hook": "^4.2.3",
@@ -57,6 +58,7 @@
5758
"postcss-loader": "3.0.0",
5859
"postcss-preset-env": "^6.0.5",
5960
"postcss-safe-parser": "4.0.1",
61+
"rimraf": "^2.6.3",
6062
"terser-webpack-plugin": "^1.2.0",
6163
"url-loader": "1.1.1",
6264
"webpack": "4.19.1",

0 commit comments

Comments
 (0)