Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
iRuxu committed Nov 4, 2023
2 parents 8e64b8a + ad23437 commit 56dd5ff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"dev": "cross-env DEV_SERVER=true vue-cli-service serve",
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"preview": "cross-env BUILD_MODE=preview vue-cli-service build",
"lint": "vue-cli-service lint",
"inspect": "vue inspect > output.js",
"update": "npm --registry https://registry.npmjs.org install @jx3box/jx3box-common-ui@latest @jx3box/jx3box-common@latest @jx3box/jx3box-data@latest @jx3box/jx3box-talent@latest @jx3box/jx3box-talent2@latest @jx3box/jx3box-comment-ui@latest @jx3box/jx3box-editor@latest",
Expand Down
3 changes: 3 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ module.exports = {
// },
},

outputDir: process.env["BUILD_MODE"] == "preview" ? path.resolve(__dirname, pkg.name) : 'dist', // 指定构建输出的目录

// ❤️ Porxy ~
devServer: {
proxy: {
Expand Down Expand Up @@ -121,6 +123,7 @@ module.exports = {
publicPath:
//FOR Localhost => development
(process.env.NODE_ENV === "development" && "/") ||
process.env.BUILD_MODE == "preview" && `/${pkg.name}/` ||
//BY origin
(process.env.STATIC_PATH === "origin" && `${JX3BOX.__staticPath["origin"]}${pkg.name}/`) ||
//BY github
Expand Down

0 comments on commit 56dd5ff

Please sign in to comment.