Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '18' # 或者您需要的其他版本
node-version: '20.19.0' # 或者您需要的其他版本

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ yarn public -m standalone
yarn public -m ci

# serve with hot reload at localhost:xxxx
cd ./devops-repository
cd ./core/devops-repository
yarn dev
```
6 changes: 4 additions & 2 deletions src/frontend/core/devops-op/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
module.exports = {
presets: [
// https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
'@vue/cli-plugin-babel/preset'
['@vue/cli-plugin-babel/preset', {
useBuiltIns: 'usage',
corejs: 3
}]
],
'env': {
'development': {
Expand Down
8 changes: 4 additions & 4 deletions src/frontend/core/devops-op/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"dev": "vue-cli-service serve",
"public": "vue-cli-service build",
"public:master": "vue-cli-service build",
"public:master": "vue-cli-service build && node rename-after-build.js",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
Expand All @@ -16,7 +16,7 @@
},
"dependencies": {
"axios": "1.12.0",
"core-js": "3.38.1",
"core-js": "^3.48.0",
"element-ui": "2.15.14",
"js-cookie": "2.2.0",
"js-yaml": "^4.1.0",
Expand All @@ -29,7 +29,7 @@
"nprogress": "0.2.0",
"path-browserify": "^1.0.1",
"path-to-regexp": "8.0.0",
"vue": "2.6.14",
"vue": "^2.7.16",
"vue-router": "3.0.6",
"vuex": "3.1.0"
},
Expand All @@ -45,7 +45,7 @@
"eslint-plugin-vue": "^9.28.0",
"html-webpack-plugin": "^5.6.0",
"serve-static": "1.13.2",
"svgo": "3.3.2",
"svgo": "3.3.3",
"tasksfile": "^5.1.1"
},
"browserslist": [
Expand Down
13 changes: 13 additions & 0 deletions src/frontend/core/devops-op/rename-after-build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const fs = require('fs')
const path = require('path')

const distDir = path.resolve(__dirname, '../../frontend/ui')
const oldFile = path.join(distDir, 'frontend_admin_index.html')
const newFile = path.join(distDir, 'frontend#admin#index.html')

if (fs.existsSync(oldFile)) {
fs.renameSync(oldFile, newFile)
console.log(`Renamed ${oldFile} -> ${newFile}`)
} else {
console.error(`File ${oldFile} not found!`)
}
2 changes: 1 addition & 1 deletion src/frontend/core/devops-op/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module.exports = {
config
.plugin('html')
.use(new HtmlWebpackPlugin({
filename: process.env.NODE_ENV !== 'development' ? '../ui/frontend#admin#index.html' : 'index.html',
filename: process.env.NODE_ENV !== 'development' ? '../ui/frontend_admin_index.html' : 'index.html',
templateParameters: {
BASE_URL: `/`
},
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/core/devops-repository/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"public": "webpack --mode production",
"public:dev": "cross-env NODE_ENV=dev yarn public --",
"public:test": "cross-env NODE_ENV=test yarn public --",
"public:master": "cross-env NODE_ENV=master yarn public --",
"public:master": "cross-env NODE_ENV=master yarn public -- && node rename-after-build.js",
"public:external": "cross-env NODE_ENV=external yarn public --"
},
"dependencies": {
Expand All @@ -20,6 +20,7 @@
"@vue-office/pdf": "^2.0.2",
"@vue/composition-api": "^1.7.2",
"axios": "^1.12.0",
"bk-magic-vue": "^2.5.10-beta.17",
"js-base64": "^3.7.7",
"js-cookie": "^2.2.1",
"marked": "^4.3.0",
Expand Down
13 changes: 13 additions & 0 deletions src/frontend/core/devops-repository/rename-after-build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const fs = require('fs')
const path = require('path')

const distDir = path.resolve(__dirname, '../../frontend/ui')
const oldFile = path.join(distDir, 'frontend_ui_index.html')
const newFile = path.join(distDir, 'frontend#ui#index.html')

if (fs.existsSync(oldFile)) {
fs.renameSync(oldFile, newFile)
console.log(`Renamed ${oldFile} -> ${newFile}`)
} else {
console.error(`File ${oldFile} not found!`)
}
7 changes: 1 addition & 6 deletions src/frontend/core/devops-repository/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = (env, argv) => {
config.plugins = [
...config.plugins,
new HtmlWebpackPlugin({
filename: isProd ? `${dist}/frontend#ui#index.html` : `${dist}/index.html`,
filename: isProd ? `${dist}/frontend_ui_index.html` : `${dist}/index.html`,
template: 'index.html',
inject: true,
title: '制品库 | 腾讯蓝鲸智云'
Expand All @@ -35,11 +35,6 @@ module.exports = (env, argv) => {
})
]

console.log('\n=== 启动信息 ===')
console.log('📡 访问地址: http://localhost:8086/bkrepo/ui/')
console.log('📁 输出目录:', dist)
console.log('🔗 资源路径:', config.output.publicPath)

config.devServer.historyApiFallback = {
rewrites: [
{ from: /^\/ui/, to: '/ui/index.html' }
Expand Down
11 changes: 6 additions & 5 deletions src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"eslint-webpack-plugin": "^3.2.0",
"gulp": "^5.0.0",
"husky": "^9.1.7",
"lerna": "8.2.4",
"lerna": "9.0.5",
"lint-staged": "^15.2.10",
"mini-css-extract-plugin": "~2.4.5",
"ora": "^3.4.0",
Expand All @@ -46,11 +46,11 @@
"svg-sprite-loader": "^6.0.11",
"vue-loader": "^15.9.8",
"vue-style-loader": "^3.0.3",
"vue-template-compiler": "2.6.14",
"vue-template-compiler": "2.7.16",
"webpack": "^5.71.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.2.2"
"webpack-dev-server": "^5.2.3"
},
"scripts": {
"start": "npm install",
Expand All @@ -77,7 +77,8 @@
"micromatch": "^4.0.8",
"svg-sprite-loader/**/micromatch": "^4.0.8",
"svg-sprite-loader/**/braces": "3.0.3",
"webpack-dev-server": "^5.2.2",
"form-data": "^4.0.4"
"webpack-dev-server": "^5.2.3",
"form-data": "^4.0.4",
"tar": "7.5.10"
}
}
Loading
Loading