Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

依赖漏洞升级 #11259

Merged
merged 11 commits into from
Dec 10, 2024
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
1 change: 1 addition & 0 deletions src/frontend/.husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx --no -- commitlint --edit ${1}
1 change: 1 addition & 0 deletions src/frontend/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm lint-staged
6 changes: 2 additions & 4 deletions src/frontend/bk-permission/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@
"webpack": "~5.76.1"
},
"peerDependencies": {
"vue": "~2.7.16"
},
"dependencies": {
"axios": "^1.7.2"
"vue": "~2.7.16",
"axios": "0.28.0"
}
}
7 changes: 6 additions & 1 deletion src/frontend/bk-permission/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ module.exports = (env = {}, argv) => {
amd: 'vue',
root: 'Vue',
},
axios: 'axios',
axios: {
commonjs: 'axios',
commonjs2: 'axios',
amd: 'axios',
root: 'Axios',
},
},
module: {
rules: [
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/bk-pipeline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"url": "git+https://github.com/Tencent/bk-ci.git"
},
"peerDependencies": {
"bk-magic-vue": "2.5.9-beta.9",
"bk-magic-vue": "2.5.9-beta.41",
"vue": "~2.7.16"
},
"keywords": [
Expand Down
File renamed without changes.
55 changes: 55 additions & 0 deletions src/frontend/common-lib/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"name": "common-lib",
"version": "1.0.1",
"description": "common-lib",
"private": true,
"author": "",
"devDependencies": {
"@babel/core": "^7.15.8",
"@babel/eslint-parser": "^7.15.8",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-decorators": "^7.15.8",
"@babel/plugin-proposal-export-namespace-from": "^7.14.5",
"@babel/plugin-proposal-function-sent": "^7.14.5",
"@babel/plugin-proposal-json-strings": "^7.14.5",
"@babel/plugin-proposal-numeric-separator": "^7.14.5",
"@babel/plugin-proposal-throw-expressions": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-syntax-jsx": "^7.14.5",
"@babel/plugin-transform-object-assign": "^7.14.5",
"@babel/plugin-transform-runtime": "^7.15.8",
"@babel/preset-env": "^7.15.8",
"@babel/preset-react": "^7.16.0",
"@babel/runtime": "^7.15.4",
"@vue/babel-preset-jsx": "^1.2.4",
"@webpack-cli/serve": "^1.7.0",
"add-asset-html-webpack-plugin": "^5.0.2",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^8.2.2",
"babel-plugin-transform-vue-jsx": "^4.0.1",
"copy-webpack-plugin": "9.0.1",
"cross-env": "^7.0.3",
"css-loader": "^6.4.0",
"css-minimizer-webpack-plugin": "^4.2.1",
"eslint": "^7.3.1",
"eslint-config-standard": "^16.0.3",
"eslint-friendly-formatter": "~4.0.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-loader": "^2.1.2",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-promise": "^5.1.1",
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^6.2.2",
"html-webpack-plugin": "^5.3.2",
"mini-css-extract-plugin": "2.4.2",
"nx": "19.5.1",
"sass": "^1.42.1",
"sass-loader": "^12.1.0",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.6",
"vue-loader": "~15.10.0",
"vue-style-loader": "^3.0.3",
"webpack": "~5.76.1"
}
}
3 changes: 2 additions & 1 deletion src/frontend/devops-atomstore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"clipboard": "^2.0.4",
"codemirror": "5.61.0",
"core-js": "3.10.0",
"js-cookie": "3.0.1",
"dayjs": "^1.11.2",
"js-cookie": "^3.0.5",
"mavon-editor": "^2.10.4",
"moment": "^2.29.2",
"vue": "~2.7.16"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@

<script>
import BKChart from '@blueking/bkcharts'
import moment from 'moment'
import dayjs from 'dayjs'
import api from '@/api'

function getTimeRange (time) {
const now = moment(moment().format('YYYY-MM-DD')).subtract(1, 'days')
const now = dayjs(dayjs().format('YYYY-MM-DD')).subtract(1, 'days')
const params = {
endTime: now.format('YYYY-MM-DD HH:mm:ss'),
startTime: now.subtract(1, time)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@
</template>

<script>
import moment from 'moment'
import dayjs from 'dayjs'
import api from '@/api'

function formatterTime (val) {
return moment(val).format('YYYY-MM-DD HH:mm:ss')
return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
}

export default {
data () {
const startTime = formatterTime(moment().subtract(7, 'days'))
const endTime = formatterTime(moment())
const startTime = formatterTime(dayjs().subtract(7, 'days'))
const endTime = formatterTime(dayjs())

return {
searchData: {
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/devops-nav/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
"@blueking/platform-config": "^1.0.4",
"@icon-cool/bk-icon-devops": "^0.1.13",
"axios": "0.28.0",
"bk-magic-vue": "2.5.9-beta.9",
"bk-magic-vue": "2.5.9-beta.41",
"bk-permission": "workspace:bk-permission",
"bluebird": "^3.5.1",
"js-cookie": "^3.0.1",
"js-cookie": "^3.0.5",
"sockjs-client": "1.3.0",
"stompjs": "2.3.3",
"vee-validate": "^2.0.3",
Expand Down
5 changes: 3 additions & 2 deletions src/frontend/devops-pipeline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
"bk-permission": "workspace:bk-permission",
"bkui-pipeline": "workspace:bk-pipeline",
"clipboard": "^1.7.1",
"dayjs": "^1.11.2",
"js-base64": "^3.7.2",
"js-cookie": "^3.0.5",
"mavon-editor": "^2.10.4",
"moment": "^2.29.2",
"monaco-editor": "^0.40.0",
"monaco-editor-webpack-plugin": "^7.1.0",
"monaco-yaml": "^5.1.0",
Expand Down Expand Up @@ -108,4 +109,4 @@
}
}
}
}
}
Loading