From 82a52b2312a6b39ad5b0f96f8a0bbc92d3d1dcfa Mon Sep 17 00:00:00 2001 From: hexxa Date: Tue, 14 Sep 2021 17:24:00 +0800 Subject: [PATCH] fix(cd): move yarn to package.json script --- package.json | 6 +++--- scripts/copy_js.sh | 1 - scripts/copy_js_dev.sh | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 06e5997..4d64b01 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "src/client/web" ], "scripts": { - "build:fe": "bash scripts/copy_js.sh && webpack --config src/client/web/webpack.app.prod.js", - "build:fe:dev": "bash scripts/copy_js_dev.sh && webpack --config src/client/web/webpack.app.dev.js --watch", - "build:fe:watch": "bash scripts/copy_js.sh && webpack --config src/client/web/webpack.app.prod.js --watch", + "build:fe": "yarn && bash scripts/copy_js.sh && webpack --config src/client/web/webpack.app.prod.js", + "build:fe:dev": "yarn && bash scripts/copy_js_dev.sh && webpack --config src/client/web/webpack.app.dev.js --watch", + "build:fe:watch": "yarn && bash scripts/copy_js.sh && webpack --config src/client/web/webpack.app.prod.js --watch", "start": "yarn build:fe && go run cmd/start/main.go -c `pwd`/configs/dev.yml", "build": "yarn build:fe && bash scripts/build_be.sh", diff --git a/scripts/copy_js.sh b/scripts/copy_js.sh index 009555e..537f88d 100644 --- a/scripts/copy_js.sh +++ b/scripts/copy_js.sh @@ -2,7 +2,6 @@ set -o nounset errexit export ROOT=`pwd` -yarn cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/react-dom/umd/react-dom.production.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/react/umd/react.production.min.js $ROOT/public/static/js diff --git a/scripts/copy_js_dev.sh b/scripts/copy_js_dev.sh index d443ac0..144d6ca 100644 --- a/scripts/copy_js_dev.sh +++ b/scripts/copy_js_dev.sh @@ -2,7 +2,6 @@ set -o nounset errexit export ROOT=`pwd` -yarn cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/react-dom/umd/react-dom.development.js $ROOT/public/static/js/ cp $ROOT/node_modules/react/umd/react.development.js $ROOT/public/static/js/