Merge branch 'main' into dependabot/npm_and_yarn/screen2.0/mui/icons-…

…material-5.14.1
weng-lab · Jul 27, 2023 · b534a88 · b534a88
2 parents def0e02 + 48319c0
commit b534a88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/screen2.0/package.json b/screen2.0/package.json
@@ -47,7 +47,7 @@
     "@weng-lab/psychscreen-ui-components": "^0.7.6",
     "@weng-lab/ts-ztable": "^4.0.1",
     "autoprefixer": "10.4.14",
-    "eslint": "8.44.0",
+    "eslint": "8.45.0",
     "eslint-config-next": "13.4.10",
     "graphql": "^16.7.1",
     "jubilant-carnival": "^0.6.0",

diff --git a/screen2.0/yarn.lock b/screen2.0/yarn.lock
@@ -2981,9 +2981,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.44.0":
-  version: 8.44.0
-  resolution: "eslint@npm:8.44.0"
+"eslint@npm:8.45.0":
+  version: 8.45.0
+  resolution: "eslint@npm:8.45.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
     "@eslint-community/regexpp": ^4.4.0
@@ -3010,7 +3010,6 @@ __metadata:
     globals: ^13.19.0
     graphemer: ^1.4.0
     ignore: ^5.2.0
-    import-fresh: ^3.0.0
     imurmurhash: ^0.1.4
     is-glob: ^4.0.0
     is-path-inside: ^3.0.3
@@ -3022,11 +3021,10 @@ __metadata:
     natural-compare: ^1.4.0
     optionator: ^0.9.3
     strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: d06309ce4aafb9d27d558c8e5e5aa5cba3bbec3ce8ceccbc7d4b7a35f2b67fd40189159155553270e2e6febeb69bd8a3b60d6241c8f5ddc2ef1702ccbd328501
+  checksum: 3e6dcce5cc43c5e301662db88ee26d1d188b22c177b9f104d7eefd1191236980bd953b3670fe2fac287114b26d7c5420ab48407d7ea1c3a446d6313c000009da
   languageName: node
   linkType: hard
 
@@ -3956,7 +3954,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1":
+"import-fresh@npm:^3.2.1":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
   dependencies:
@@ -6409,7 +6407,7 @@ __metadata:
     "@weng-lab/psychscreen-ui-components": ^0.7.6
     "@weng-lab/ts-ztable": ^4.0.1
     autoprefixer: 10.4.14
-    eslint: 8.44.0
+    eslint: 8.45.0
     eslint-config-next: 13.4.10
     file-loader: ^6.2.0
     graphql: ^16.7.1
@@ -6987,7 +6985,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443