Merge branch 'main' into dom/updates

vega · Dec 20, 2023 · 9ebac7c · 9ebac7c
2 parents abaaf10 + fa225a9
commit 9ebac7c
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 250 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,7 +19,7 @@
   "typescript.referencesCodeLens.enabled": true,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",

diff --git a/babel.config.js b/babel.config.js
@@ -10,6 +10,5 @@ module.exports = {
       }
     ],
     '@babel/preset-typescript'
-  ],
-  plugins: ['@babel/proposal-class-properties']
+  ]
 };
diff --git a/package.json b/package.json
@@ -80,7 +80,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.23.6",
     "@babel/preset-typescript": "^7.23.3",
     "@release-it/conventional-changelog": "^8.0.1",
@@ -111,19 +110,24 @@
     "highlight.js": "^11.9.0",
     "jest": "^29.7.0",
     "jest-dev-server": "^9.0.2",
+    "jest-dev-server": "^9.0.2",
     "mkdirp": "^3.0.1",
     "pako": "^2.1.0",
     "prettier": "^3.1.1",
+    "prettier": "^3.1.1",
     "puppeteer": "^15.0.0",
     "release-it": "^17.0.1",
     "rollup": "^4.9.1",
     "rollup-plugin-bundle-size": "^1.0.3",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "serve": "^14.2.1",
     "terser": "^5.26.0",
+    "terser": "^5.26.0",
     "ts-jest": "^29.1.1",
     "ts-json-schema-generator": "^1.5.0",
     "typescript": "~5.3.3",
+    "ts-json-schema-generator": "^1.5.0",
+    "typescript": "~5.3.3",
     "vega-cli": "^5.26.1",
     "vega-datasets": "^2.7.0",
     "vega-embed": "^6.24.0",

diff --git a/test-runtime/babel.config.js b/test-runtime/babel.config.js
@@ -10,6 +10,5 @@ module.exports = {
       }
     ],
     '@babel/preset-typescript'
-  ],
-  plugins: ['@babel/proposal-class-properties']
+  ]
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,5 @@ module.exports = { @@
           }
         ],
         '@babel/preset-typescript'
-      ],
-      plugins: ['@babel/proposal-class-properties']
+      ]
     };