feat: upgrade to the latest version of ajv and sass

josdejong · Jul 15, 2024 · 8604049 · 8604049
1 parent b08b1f6
commit 8604049
Show file tree

Hide file tree

Showing 8 changed files with 469 additions and 590 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@lezer/highlight": "^1.2.0",
     "@replit/codemirror-indentation-markers": "^6.5.2",
-    "ajv": "^8.16.0",
+    "ajv": "^8.17.1",
     "codemirror-wrapped-line-indent": "^1.0.8",
     "diff-sequences": "^29.6.3",
     "immutable-json-patch": "6.0.1",
@@ -97,7 +97,7 @@
     "lodash-es": "^4.17.21",
     "memoize-one": "^6.0.0",
     "natural-compare-lite": "^1.4.0",
-    "sass": "^1.77.6",
+    "sass": "^1.77.8",
     "svelte-awesome": "^3.3.1",
     "svelte-select": "^5.8.3",
     "vanilla-picker": "^2.12.3"
@@ -106,8 +106,8 @@
     "svelte": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.24.7",
-    "@babel/preset-env": "7.24.7",
+    "@babel/core": "7.24.8",
+    "@babel/preset-env": "7.24.8",
     "@commitlint/cli": "19.3.0",
     "@commitlint/config-conventional": "19.2.2",
     "@rollup/plugin-babel": "6.0.4",
@@ -125,30 +125,30 @@
     "@types/cookie": "0.6.0",
     "@types/jmespath": "0.15.2",
     "@types/lodash-es": "4.17.12",
-    "@typescript-eslint/eslint-plugin": "7.15.0",
-    "@typescript-eslint/parser": "7.15.0",
-    "@vitest/coverage-v8": "1.6.0",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
+    "@vitest/coverage-v8": "2.0.2",
     "cpy-cli": "5.0.0",
     "del-cli": "5.1.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-svelte": "2.41.0",
+    "eslint-plugin-svelte": "2.42.0",
     "husky": "9.0.11",
     "jsdom": "24.1.0",
     "lossless-json": "4.0.1",
     "npm-run-all": "4.1.5",
-    "prettier": "3.3.2",
+    "prettier": "3.3.3",
     "prettier-plugin-svelte": "3.2.5",
-    "rollup": "4.18.0",
+    "rollup": "4.18.1",
     "rollup-plugin-dts": "6.1.1",
     "rollup-plugin-svelte": "7.2.2",
     "standard-version": "9.5.0",
     "svelte": "^4.2.18",
     "svelte-check": "3.8.4",
-    "svelte-preprocess": "6.0.1",
+    "svelte-preprocess": "6.0.2",
     "typescript": "5.5.3",
     "vite": "5.3.3",
-    "vitest": "1.6.0"
+    "vitest": "2.0.2"
   }
 }
diff --git a/src/lib/components/controls/DropdownButton.scss b/src/lib/components/controls/DropdownButton.scss
@@ -29,6 +29,7 @@
     width: 2em;
     background: $context-menu-background;
     color: $context-menu-color;
+    border-radius: 0;
 
     &.jse-visible {
       background: $background;
@@ -46,8 +47,6 @@
       color: $context-menu-color-disabled;
       background: unset;
     }
-
-    border-radius: 0;
   }
 
   .jse-dropdown-items {

diff --git a/src/lib/components/controls/SearchBox.scss b/src/lib/components/controls/SearchBox.scss
@@ -107,14 +107,13 @@ $input-min-width: 50px;
       }
 
       .jse-replace-section {
+        flex: 1;
+        display: flex;
         padding-left: $padding-section-left;
 
         button {
           width: auto;
         }
-
-        flex: 1;
-        display: flex;
       }
     }
   }

diff --git a/src/lib/components/modals/TransformModal.scss b/src/lib/components/modals/TransformModal.scss
@@ -9,10 +9,9 @@
 }
 
 .jse-modal-contents {
-  @include jse-modal-contents;
-
   color: inherit;
-  padding: 0;
+
+  @include jse-modal-contents($modal-padding: 0);
 
   .jse-main-contents {
     flex: 1;

diff --git a/src/lib/components/modes/tablemode/TableModeWelcome.scss b/src/lib/components/modes/tablemode/TableModeWelcome.scss
@@ -36,10 +36,10 @@
     }
 
     button.jse-nested-array-action {
-      @include jsoneditor-button-primary;
-
       text-align: left;
 
+      @include jsoneditor-button-primary;
+
       .jse-nested-array-count {
         opacity: 0.5;
         white-space: nowrap;

diff --git a/src/lib/components/modes/textmode/StatusBar.scss b/src/lib/components/modes/textmode/StatusBar.scss
@@ -11,13 +11,13 @@
   border-left: $main-border;
   border-right: $main-border;
 
+  display: flex;
+  gap: $padding;
+
   &:last-child {
     border-bottom: $main-border;
   }
 
-  display: flex;
-  gap: $padding;
-
   .jse-status-bar-info {
     padding: 2px;
   }

diff --git a/src/lib/styles.scss b/src/lib/styles.scss
@@ -157,11 +157,11 @@ $errors-overview-max-height: 25%;
   color: $text-color;
 }
 
-@mixin jse-modal-contents {
+@mixin jse-modal-contents($modal-padding: 20px) {
   flex: 1;
   display: flex;
   flex-direction: column;
-  padding: 20px;
+  padding: $modal-padding;
   overflow: auto;
   min-width: 0;
   min-height: 0;