Skip to content

Commit

Permalink
bump up dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Fine0830 authored Oct 19, 2023
2 parents c2733c3 + 1391e33 commit 5624efe
Show file tree
Hide file tree
Showing 9 changed files with 1,801 additions and 1,267 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Use Node.js 12
- name: Use Node.js 18
uses: actions/setup-node@v1
with:
node-version: '12'
node-version: '18'
- name: Build
run: |
npm install
Expand Down
11 changes: 7 additions & 4 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@

<div id="app">
<button>性能监听</button>
<div>
<div>
<!-- <iframe src="https://www.baidu.com" frameborder="0" height="600px" width="800px"></iframe> -->
</div>
</div>
</body>
<style>
#app {
width: 300px;
height: 300px;
background-image: linear-gradient(130deg, #f6f8ff 0%, #fcfcff 100%);
}
</style>
</html>
2,999 changes: 1,762 additions & 1,237 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,26 @@
"main": "index.js",
"author": "Qiuxia Fan",
"license": "MIT",
"devDependencies": {
"express": "^4.18.2",
"html-webpack-plugin": "^5.5.0",
"ts-loader": "^9.4.2",
"typescript": "^4.9.5",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"webpack-dev-middleware": "^6.0.1",
"webpack-dev-server": "^4.11.1"
},
"dependencies": {
"skywalking-client-js": "^0.9.0",
"vue": "^2.7.14"
"skywalking-client-js": "^0.10.0",
"vue": "^2.6.11"
},
"scripts": {
"build": "webpack",
"rebuild": "rm -rf ./node_modules && rm -rf ./dist && npm install && webpack",
"start": "webpack-dev-server",
"server": "node server.js"
},
"devDependencies": {
"express": "^4.18.2",
"@types/express": "^4.17.17",
"clean-webpack-plugin": "4.0.0",
"html-webpack-plugin": "^5.5.3",
"ts-loader": "^6.2.1",
"typescript": "^5.2.2",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"webpack-dev-middleware": "^6.1.1",
"webpack-dev-server": "^4.15.1"
}
}
10 changes: 5 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import ClientMonitor from 'skywalking-client-js';
import Vue from 'vue';

ClientMonitor.register({
service: 'test-ui',
pagePath: 'index.html',
serviceVersion: 'v1.0.0',
vue: Vue,
useFmp: true,
service: 'test-ui',
pagePath: 'index.html',
serviceVersion: 'v1.0.0',
vue: Vue,
useFmp: true
});
// // promise error
function foo() {
Expand Down
11 changes: 7 additions & 4 deletions src/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@

<div id="app">
<button>性能监听</button>
<div>
<div>
<!-- <iframe src="https://www.baidu.com" frameborder="0" height="600px" width="800px"></iframe> -->
</div>
</div>
</body>
<style>
#app {
width: 300px;
height: 300px;
background-image: linear-gradient(130deg, #f6f8ff 0%, #fcfcff 100%);
}
</style>
</html>
2 changes: 1 addition & 1 deletion test/Dockerfile-generate-traffic
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM python:3.7

COPY test/test.py /test.py

RUN pip3 install selenium
RUN pip3 install selenium==4.9.1

CMD ["python3", "/test.py"]

2 changes: 1 addition & 1 deletion test/Dockerfile-test-ui
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.23 AS builder
FROM node:18.12 AS builder

WORKDIR /skywalking-client-test

Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
changeOrigin: true,
},
},
hot: true,
static: false,
hot: false,
}
};

0 comments on commit 5624efe

Please sign in to comment.