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

feat: 更新APM日志组件 --Story=121710031 #4858

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
3 changes: 2 additions & 1 deletion bklog/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"build": "cross-env MONITOR_APP=log bkmonitor-cli build --log",
"build:apm": "cross-env MONITOR_APP=apm bkmonitor-cli build --log",
"build:trace": "cross-env MONITOR_APP=trace bkmonitor-cli build --log && node ./scripts/prefix-css.js",
"analyze:apm": "bkmonitor-cli build --log -a",
"analyze:apm": "cross-env MONITOR_APP=apm bkmonitor-cli build --log -a",
"analyze:trace": "cross-env MONITOR_APP=trace bkmonitor-cli build --log -a",
"clean": "rimraf ../static/dist/*",
"analyze": "npm run clean && bkmonitor-cli build -a",
"lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
Expand Down
2 changes: 1 addition & 1 deletion bklog/web/scripts/apm-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueking/monitor-apm-log",
"version": "1.0.0",
"version": "1.0.1-beta.1",
"description": "",
"main": "main.js",
"scripts": {
Expand Down
11 changes: 0 additions & 11 deletions bklog/web/scripts/link-package.json

This file was deleted.

10 changes: 5 additions & 5 deletions bkmonitor/webpack/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bkmonitor/webpack/src/monitor-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@antv/g6": "^4.8.24",
"@blueking/fork-resize-detector": "^0.0.2",
"@blueking/monitor-apm-log": "1.0.0",
"@blueking/monitor-apm-log": "1.0.1-beta.1",
"@blueking/monitor-resource-topo": "0.0.1-beta.36",
"@blueking/search-select-v3": "0.0.1-beta.10",
"@toast-ui/editor": "^3.2.2",
Expand Down
Loading