Skip to content

Commit fd37785

Browse files
authored
chore: bump nx version (#170)
1 parent cb4faa7 commit fd37785

File tree

13 files changed

+218
-177
lines changed

13 files changed

+218
-177
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,6 @@ tests_output/
6666
.npmrc
6767

6868
deno.lock
69+
70+
.nx/cache
71+
.nx/workspace-data

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ dist/*
1212
**/.vscode
1313
**/.nyc_output
1414
**/.vs
15+
16+
/.nx/cache
17+
/.nx/workspace-data

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ unsmoke: docker_compose_present
5656
@echo ""
5757
@echo "+++ Spinning down the smokers."
5858
@echo ""
59-
cd smoke-tests && docker-compose down --volumes
59+
cd smoke-tests && docker compose down --volumes
6060

6161
#: use this for local smoke testing
6262
resmoke: unsmoke smoke
@@ -65,4 +65,4 @@ resmoke: unsmoke smoke
6565

6666
.PHONY: docker_compose_present
6767
docker_compose_present:
68-
@which docker-compose || (echo "Required docker-compose command is missing"; exit 1)
68+
@which docker compose || (echo "Required docker compose command is missing"; exit 1)

nx.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
{
2-
"affected": {
3-
"defaultBase": "main"
4-
},
52
"workspaceLayout": {
63
"appsDir": "packages",
74
"libsDir": "packages"
85
},
96
"targetDefaults": {
107
"build": {
11-
"dependsOn": ["^build"]
8+
"dependsOn": ["^build"],
9+
"cache": true
10+
},
11+
"lint": {
12+
"cache": true
13+
},
14+
"test": {
15+
"cache": true
1216
}
1317
},
14-
"tasksRunnerOptions": {
15-
"default": {
16-
"runner": "nx/tasks-runners/default",
17-
"options": {
18-
"cacheableOperations": ["build", "lint", "test"]
19-
}
20-
}
21-
}
18+
"useInferencePlugins": false,
19+
"defaultBase": "main"
2220
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"husky": "^8.0.3",
4343
"jest": "^29.5.0",
4444
"lint-staged": "^13.2.2",
45-
"nx": "^15.9.2",
45+
"nx": "19.6.2",
4646
"prettier": "^3.3.3",
4747
"rimraf": "^5.0.1",
4848
"ts-jest": "^29.1.0",

packages/otel-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"start": "npm-run-all -s compile start:_execute",
77
"start:_execute": "node utils/devServer/runDevServer.js",
88
"prebuild": "npm run postversion",
9-
"build": "npm-run-all -s compile:*",
9+
"build": "npm run compile",
1010
"compile": "npm-run-all -s compile:*",
1111
"compile:browser": "rollup -c",
1212
"compile:tsc": "tsc --build tsconfig.cjs.json tsconfig.esm.json",

packages/session-recorder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "HyperDX distribution OpenTelemetry-based session recording",
55
"scripts": {
66
"prebuild": "npm run postversion",
7-
"build": "npm-run-all -s compile:*",
7+
"build": "npm run compile",
88
"compile": "npm-run-all -s compile:*",
99
"compile:browser": "rollup -c",
1010
"compile:tsc": "tsc --build tsconfig.cjs.json tsconfig.esm.json",

smoke-tests/smoke-sdk-grpc-ts.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ NODE_METER_NAME="node-monitor-meter"
99

1010
setup_file() {
1111
echo "# 🚧" >&3
12-
docker-compose up --build --detach collector ${CONTAINER_NAME}
12+
docker compose up --build --detach collector ${CONTAINER_NAME}
1313
wait_for_ready_app ${CONTAINER_NAME}
1414
curl --silent "http://localhost:3000"
1515
wait_for_traces
@@ -18,8 +18,8 @@ setup_file() {
1818

1919
teardown_file() {
2020
cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
21-
docker-compose stop ${CONTAINER_NAME}
22-
docker-compose restart collector
21+
docker compose stop ${CONTAINER_NAME}
22+
docker compose restart collector
2323
wait_for_flush
2424
}
2525

smoke-tests/smoke-sdk-grpc.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ METER_NAME="hello-world-meter"
88

99
setup_file() {
1010
echo "# 🚧" >&3
11-
docker-compose up --build --detach collector ${CONTAINER_NAME}
11+
docker compose up --build --detach collector ${CONTAINER_NAME}
1212
wait_for_ready_app ${CONTAINER_NAME}
1313
curl --silent "http://localhost:3000"
1414
wait_for_traces
@@ -17,8 +17,8 @@ setup_file() {
1717

1818
teardown_file() {
1919
cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
20-
docker-compose stop ${CONTAINER_NAME}
21-
docker-compose restart collector
20+
docker compose stop ${CONTAINER_NAME}
21+
docker compose restart collector
2222
wait_for_flush
2323
}
2424

smoke-tests/smoke-sdk-http-ts.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ NODE_METER_NAME="node-monitor-meter"
99

1010
setup_file() {
1111
echo "# 🚧" >&3
12-
docker-compose up --build --detach collector ${CONTAINER_NAME}
12+
docker compose up --build --detach collector ${CONTAINER_NAME}
1313
wait_for_ready_app ${CONTAINER_NAME}
1414
curl --silent "http://localhost:3000"
1515
wait_for_traces
@@ -18,8 +18,8 @@ setup_file() {
1818

1919
teardown_file() {
2020
cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
21-
docker-compose stop ${CONTAINER_NAME}
22-
docker-compose restart collector
21+
docker compose stop ${CONTAINER_NAME}
22+
docker compose restart collector
2323
wait_for_flush
2424
}
2525

0 commit comments

Comments
 (0)