Skip to content

Commit 64f05e6

Browse files
Merge branch 'main' into fix/aria-labels
2 parents 36766dc + f99f88d commit 64f05e6

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

package-lock.json

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

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,11 @@
167167
"yaml": "^2.8.2"
168168
},
169169
"resolutions": {
170-
"react-redux": "^7.2.0"
170+
"react-redux": "^7.2.0",
171+
"clean-stack": "5.2.0"
172+
},
173+
"overrides": {
174+
"clean-stack": "5.2.0"
171175
},
172176
"version": "0.0.0",
173177
"packageManager": "npm@10.8.1+sha1.1f1cb1305cd9246b9efe07d8629874df23157a2f"

packages/decap-server/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"sideEffects": false,
1414
"scripts": {
1515
"build": "webpack",
16-
"prestart": "yarn build",
16+
"prestart": "npm run build",
1717
"start": "node dist/index.js",
1818
"develop": "nodemon --watch 'src/**/*.ts' --ignore 'src/**/*.spec.ts' --exec 'ts-node' --files src/index.ts",
1919
"test": "jest",
20-
"test:watch": "yarn test --watch",
21-
"test:coverage": "yarn test --coverage"
20+
"test:watch": "jest --watch",
21+
"test:coverage": "jest --coverage"
2222
},
2323
"dependencies": {
2424
"@hapi/joi": "^17.0.2",

0 commit comments

Comments
 (0)