Merge pull request #45 from terwer/v4.x

Fix build
terwer · Mar 15, 2019 · 7de3189 · 7de3189
2 parents 7fa25bd + ebee547
commit 7de3189
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 123 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
     environment:
       - npm_config_unsafe_perm=true
     # 这里的命令优先级比较高，会自动覆盖镜像里面的命令
-    command: npm run serve
+    command: npm run dev
     restart: always
   jvue-admin:
     privileged: true

diff --git a/jvue-admin/Dockerfile b/jvue-admin/Dockerfile
@@ -6,7 +6,7 @@ FROM node:10.15.1-alpine
 WORKDIR /app
 
 # 安装依赖
-COPY ./jvue-front/package.json ./
+COPY ./jvue-admin/package.json ./
 
 # 因为被墙，单独安装
 ENV SASS_BINARY_SITE https://npm.taobao.org/mirrors/node-sass

diff --git a/jvue-front/build/build.dev.cmd b/jvue-front/build/build.dev.cmd
@@ -1,5 +1,4 @@
 npm run clean &&^
 npm run dev-build &&^
 move %cd%\dist\index.html %cd%\dist\index.ssr.html &&^
-%cd%\build\cpm.cmd &&^
 echo "build for development success."
diff --git a/jvue-front/build/build.dev.sh b/jvue-front/build/build.dev.sh
@@ -3,5 +3,4 @@ pwd
 npm run clean
 npm run dev-build
 mv dist/index.html dist/index.ssr.html
-build/cpm.sh
 echo "build for development success."
diff --git a/jvue-front/build/build.prod.cmd b/jvue-front/build/build.prod.cmd
@@ -1,5 +1,4 @@
 npm run clean &&^
 npm run build &&^
 move %cd%\dist\index.html %cd%\dist\index.ssr.html &&^
-%cd%\build\cpm.cmd &&^
 echo "build for production success."
diff --git a/jvue-front/build/build.prod.sh b/jvue-front/build/build.prod.sh
@@ -2,5 +2,4 @@
 npm run clean
 npm run build
 mv dist/index.html dist/index.ssr.html
-build/cpm.sh
 echo "build for production success."
diff --git a/jvue-front/build/cpm.cmd b/jvue-front/build/cpm.cmd
diff --git a/jvue-front/build/cpm.sh b/jvue-front/build/cpm.sh
diff --git a/jvue-front/package.json b/jvue-front/package.json
@@ -6,6 +6,7 @@
     "clean": "rimraf dist",
     "lint": "vue-cli-service lint",
     "serve": "cross-env NODE_ENV=development vue-cli-service serve  --port 3000",
+    "dev":"npm run clean && npm run dev-build && mv dist/index.html dist/index.ssr.html && npm run dev-start",
     "dev-build-entry-client": "cross-env SSR_ENV=client vue-cli-service build --mode development",
     "build-entry-client": "cross-env SSR_ENV=client vue-cli-service build",
     "dev-build-entry-server": "cross-env SSR_ENV=server vue-cli-service build --mode development --no-clean",