Skip to content

Commit 009fdb5

Browse files
zone117xzone117x
committed
chore: merge develop
2 parents bcca964 + 5f8bc9f commit 009fdb5

File tree

11 files changed

+21487
-14723
lines changed

11 files changed

+21487
-14723
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-
4141
4242
- name: Install deps
43-
run: npm install --audit=false
43+
run: npm ci --audit=false
4444

4545
- name: Lint ESLint
4646
run: npm run lint:eslint
@@ -81,7 +81,7 @@ jobs:
8181
${{ runner.os }}-
8282
8383
- name: Install deps
84-
run: npm install --audit=false
84+
run: npm ci --audit=false
8585

8686
- name: Build schema & docs
8787
run: npm run build
@@ -126,15 +126,15 @@ jobs:
126126
${{ runner.os }}-
127127
128128
- name: Install deps
129-
run: npm install --audit=false
129+
run: npm ci --audit=false
130130

131131
- name: Install client deps
132132
working-directory: client
133-
run: npm install --audit=false
133+
run: npm ci --audit=false
134134

135135
- name: Install docs deps
136136
working-directory: docs
137-
run: npm install --audit=false
137+
run: npm ci --audit=false
138138

139139
- name: Setup env vars
140140
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV
@@ -193,7 +193,7 @@ jobs:
193193
${{ runner.os }}-
194194
195195
- name: Install deps
196-
run: npm install --audit=false
196+
run: npm ci --audit=false
197197

198198
- name: Setup env vars
199199
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV
@@ -252,7 +252,7 @@ jobs:
252252
${{ runner.os }}-
253253
254254
- name: Install deps
255-
run: npm install --audit=false
255+
run: npm ci --audit=false
256256

257257
- name: Setup env vars
258258
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV
@@ -311,7 +311,7 @@ jobs:
311311
${{ runner.os }}-
312312
313313
- name: Install deps
314-
run: npm install --audit=false
314+
run: npm ci --audit=false
315315

316316
- name: Setup env vars
317317
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0">> $GITHUB_ENV
@@ -378,7 +378,7 @@ jobs:
378378
${{ runner.os }}-
379379
380380
- name: Install deps
381-
run: npm install --audit=false
381+
run: npm ci --audit=false
382382

383383
- name: Setup env vars
384384
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0">> $GITHUB_ENV
@@ -431,7 +431,7 @@ jobs:
431431
node-version-file: '.nvmrc'
432432

433433
- name: Install deps
434-
run: npm install
434+
run: npm ci
435435

436436
- name: Setup env vars
437437
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV

‎.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ports:
99
onOpen: ignore
1010

1111
tasks:
12-
- init: npm install
12+
- init: npm ci
1313
command: npm run dev
1414
- openMode: split-right
1515
command: stacks-node start --config=stacks-blockchain/Stacks-dev.toml

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY . .
55

66
RUN apk add --no-cache --virtual .build-deps alpine-sdk python3 git openjdk8-jre cmake
77
RUN echo "GIT_TAG=$(git tag --points-at HEAD)" >> .env
8-
RUN npm config set unsafe-perm true && npm install && npm run build && npm run build:docs && npm prune --production
8+
RUN npm config set unsafe-perm true && npm ci && npm run build && npm run build:docs && npm prune --production
99
RUN apk del .build-deps
1010

1111
CMD ["node", "./lib/index.js"]

‎client/package-lock.json

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,31 @@
3939
],
4040
"dependencies": {
4141
"@stacks/stacks-blockchain-api-types": "*",
42-
"@types/ws": "^7.4.0",
43-
"cross-fetch": "^3.0.6",
44-
"eventemitter3": "^4.0.4",
45-
"jsonrpc-lite": "^2.2.0",
46-
"socket.io-client": "^4.0.1",
47-
"ws": "^7.4.0"
42+
"@types/ws": "7.4.7",
43+
"cross-fetch": "3.1.4",
44+
"eventemitter3": "4.0.7",
45+
"jsonrpc-lite": "2.2.0",
46+
"socket.io-client": "4.4.0",
47+
"ws": "7.5.6"
4848
},
4949
"devDependencies": {
50-
"@apidevtools/swagger-cli": "^4.0.4",
51-
"@openapitools/openapi-generator-cli": "^2.4.12",
52-
"@stacks/eslint-config": "^1.0.7",
50+
"@apidevtools/swagger-cli": "4.0.4",
51+
"@openapitools/openapi-generator-cli": "2.4.21",
52+
"@stacks/eslint-config": "1.2.0",
5353
"@stacks/prettier-config": "0.0.7",
54-
"@typescript-eslint/eslint-plugin": "^4.22.0",
55-
"@typescript-eslint/parser": "^4.22.0",
56-
"concurrently": "^6.0.2",
57-
"eslint": "^7.25.0",
58-
"eslint-config-prettier": "^8.3.0",
59-
"eslint-plugin-prettier": "^3.4.0",
60-
"http-server": "^14.0.0",
61-
"microbundle": "^0.13.0",
62-
"prettier": "^2.2.1",
63-
"rimraf": "^3.0.2",
64-
"shx": "^0.3.2",
65-
"ts-node": "^9.1.1",
66-
"typedoc": "^0.20.36",
67-
"typescript": "^4.2.4"
54+
"@typescript-eslint/eslint-plugin": "4.33.0",
55+
"@typescript-eslint/parser": "4.33.0",
56+
"concurrently": "6.5.1",
57+
"eslint": "7.32.0",
58+
"eslint-config-prettier": "8.3.0",
59+
"eslint-plugin-prettier": "3.4.1",
60+
"http-server": "14.0.0",
61+
"microbundle": "0.13.3",
62+
"prettier": "2.5.1",
63+
"rimraf": "3.0.2",
64+
"shx": "0.3.3",
65+
"ts-node": "9.1.1",
66+
"typedoc": "0.20.37",
67+
"typescript": "4.2.4"
6868
}
6969
}

‎docker/stx-rosetta.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN apt-get update -y \
3333
&& git clone -b ${STACKS_API_VERSION} --depth 1 https://github.com/${STACKS_API_REPO} . \
3434
&& echo "GIT_TAG=$(git tag --points-at HEAD)" >> .env \
3535
&& npm config set unsafe-perm true \
36-
&& npm install \
36+
&& npm ci \
3737
&& npm run build \
3838
&& npm prune --production
3939

0 commit comments

Comments
 (0)