Skip to content

Commit 49f4253

Browse files
committed
fix(deps): specify all versions as exact versions
All versions in package.json are now specified as exact versions (matching the versions specified by yarn.lock, not package.json) to hopefully minimize yarn.lock desync from bad merge conflict resolution. Also include yarnrc to install exact versions by default, and explicit dependabot config to make sure versions are bumped correctly. Also drop `native-url`, since preact-cli was updated in a merge commit and is now no longer missing dependencies.
1 parent 9102953 commit 49f4253

File tree

4 files changed

+200
-126
lines changed

4 files changed

+200
-126
lines changed

.dependabot/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 1
2+
update_configs:
3+
- package_manager: javascript
4+
directory: /
5+
update_schedule: weekly
6+
version_requirement_updates: increase_versions

.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-prefix ""

package.json

+57-58
Original file line numberDiff line numberDiff line change
@@ -26,67 +26,66 @@
2626
}
2727
},
2828
"dependencies": {
29-
"@google-cloud/storage": "^5.0.1",
30-
"ajv": "^6.12.2",
31-
"data-uri-to-buffer": "^3.0.0",
32-
"dotenv": "^8.2.0",
33-
"email-validator": "^2.0.4",
34-
"express": "^4.17.1",
35-
"got": "^11.1.4",
36-
"helmet": "^3.22.0",
37-
"jss-plugin-global": "^10.1.1",
38-
"mustache": "^4.0.0",
39-
"node-pg-migrate": "^5.0.0",
40-
"nodemailer": "^6.4.6",
41-
"pg": "^8.2.1",
42-
"redis": "^3.0.2",
43-
"uuid": "^8.1.0"
29+
"@google-cloud/storage": "5.0.1",
30+
"ajv": "6.12.2",
31+
"data-uri-to-buffer": "3.0.0",
32+
"dotenv": "8.2.0",
33+
"email-validator": "2.0.4",
34+
"express": "4.17.1",
35+
"got": "11.1.4",
36+
"helmet": "3.22.0",
37+
"jss-plugin-global": "10.1.1",
38+
"mustache": "4.0.1",
39+
"node-pg-migrate": "5.0.0",
40+
"nodemailer": "6.4.6",
41+
"pg": "8.2.1",
42+
"redis": "3.0.2",
43+
"uuid": "8.1.0"
4444
},
4545
"devDependencies": {
46-
"@types/express": "^4.17.6",
47-
"@typescript-eslint/eslint-plugin": "^2.34.0",
48-
"@typescript-eslint/parser": "^2.34.0",
49-
"ava": "^3.8.2",
50-
"babel-eslint": "^10.0.3",
51-
"babel-plugin-transform-export-extensions": "^6.22.0",
52-
"cirrus-ui": "^0.5.5",
53-
"commitizen": "^4.1.2",
54-
"compression": "^1.7.4",
55-
"concurrently": "^5.2.0",
56-
"cpy-cli": "^3.1.1",
57-
"cross-env": "^7.0.2",
46+
"@types/express": "4.17.6",
47+
"@typescript-eslint/eslint-plugin": "2.34.0",
48+
"@typescript-eslint/parser": "2.34.0",
49+
"ava": "3.8.2",
50+
"babel-eslint": "10.1.0",
51+
"babel-plugin-transform-export-extensions": "6.22.0",
52+
"cirrus-ui": "0.5.5",
53+
"commitizen": "4.1.2",
54+
"compression": "1.7.4",
55+
"concurrently": "5.2.0",
56+
"cpy-cli": "3.1.1",
57+
"cross-env": "7.0.2",
5858
"cz-conventional-changelog": "3.2.0",
59-
"eslint": "^6.8.0",
60-
"eslint-config-preact": "^1.1.1",
61-
"eslint-config-standard": "^14.1.1",
62-
"eslint-plugin-ava": "^10.3.0",
63-
"eslint-plugin-import": "^2.20.2",
64-
"eslint-plugin-node": "^11.1.0",
65-
"eslint-plugin-promise": "^4.2.1",
66-
"eslint-plugin-standard": "^4.0.1",
67-
"faker": "^4.1.0",
68-
"get-port": "^5.1.1",
69-
"glob": "^7.1.6",
70-
"husky": "^4.2.5",
71-
"jss": "^10.0.4",
72-
"jss-camel-case": "^6.1.0",
73-
"jss-nested": "^6.0.1",
74-
"jss-vendor-prefixer": "^8.0.1",
75-
"linkstate": "^1.1.1",
76-
"loader-utils": "^2.0.0",
77-
"native-url": "^0.3.1",
78-
"nodemon": "^2.0.4",
79-
"nyc": "^15.0.1",
80-
"pascal-case": "^3.1.1",
81-
"preact": "^10.4.4",
82-
"preact-cli": "^3.0.0-rc.13",
83-
"preact-markup": "^2.0.0",
84-
"preact-router": "^3.2.1",
85-
"purgecss-webpack-plugin": "^2.2.0",
86-
"snarkdown": "^1.2.2",
87-
"supertest": "^4.0.2",
88-
"svg-sprite-loader": "^5.0.0",
89-
"typescript": "^3.9.3"
59+
"eslint": "6.8.0",
60+
"eslint-config-preact": "1.1.1",
61+
"eslint-config-standard": "14.1.1",
62+
"eslint-plugin-ava": "10.3.0",
63+
"eslint-plugin-import": "2.20.2",
64+
"eslint-plugin-node": "11.1.0",
65+
"eslint-plugin-promise": "4.2.1",
66+
"eslint-plugin-standard": "4.0.1",
67+
"faker": "4.1.0",
68+
"get-port": "5.1.1",
69+
"glob": "7.1.6",
70+
"husky": "4.2.5",
71+
"jss": "10.1.1",
72+
"jss-camel-case": "6.1.0",
73+
"jss-nested": "6.0.1",
74+
"jss-vendor-prefixer": "8.0.1",
75+
"linkstate": "1.1.1",
76+
"loader-utils": "2.0.0",
77+
"nodemon": "2.0.4",
78+
"nyc": "15.0.1",
79+
"pascal-case": "3.1.1",
80+
"preact": "10.4.4",
81+
"preact-cli": "3.0.0-rc.14",
82+
"preact-markup": "2.0.0",
83+
"preact-router": "3.2.1",
84+
"purgecss-webpack-plugin": "2.2.0",
85+
"snarkdown": "1.2.2",
86+
"supertest": "4.0.2",
87+
"svg-sprite-loader": "5.0.0",
88+
"typescript": "3.9.3"
9089
},
9190
"description": "rctf is RedpwnCTF's CTF platform. It is developed and maintained by the [redpwn](https://redpwn.net) CTF team.",
9291
"repository": {

0 commit comments

Comments
 (0)