Merge branch 'master' into mjs

add-js-ext.js

@@ -0,0 +1,16 @@
+module.exports = function (fileInfo, api) {
+  const j = api.jscodeshift;
+  const root = j(fileInfo.source);
+
+  // Find all import declarations
+  root.find(j.ImportDeclaration).forEach(path => {
+    const importPath = path.node.source.value;
+
+    // If the import path doesn't end with .js, add it
+    if (!importPath.endsWith('.js') && importPath.startsWith('.')) {
+      path.node.source = j.literal(importPath + '.js');
+    }
+  });
+
+  return root.toSource();
+};

package.json

@@ -55,7 +55,8 @@
     "ts:web": "yarn workspace dbgate-web ts",
     "ts": "yarn ts:api && yarn ts:web",
     "postinstall": "yarn resetPackagedPlugins && yarn build:lib && patch-package && yarn fillNativeModules && yarn build:plugins:frontend",
-    "dbgate-serve": "node packages/dbgate/bin/dbgate-serve.js"
+    "dbgate-serve": "node packages/dbgate/bin/dbgate-serve.js",
+    "convert:api": "jscodeshift -t node_modules/5to6-codemod/transforms/cjs.js packages/api/src && jscodeshift -t node_modules/5to6-codemod/transforms/exports.js packages/api/src && jscodeshift -t ./add-js-ext.js packages/api/src"
   },
   "dependencies": {
     "concurrently": "^5.1.0",
@@ -63,8 +64,12 @@
     "pino-pretty": "^9.1.1"
   },
   "devDependencies": {
+    "5to6-codemod": "^1.8.0",
+    "ast-types": "^0.14.2",
     "copyfiles": "^2.2.0",
+    "jscodeshift": "^0.15.2",
     "prettier": "^2.2.1",
+    "recast": "^0.23.7",
     "workspaces-run": "^1.0.1"
   }
 }

packages/api/package.json

@@ -9,6 +9,7 @@
   },
   "author": "Jan Prochazka",
   "license": "MIT",
+  "type": "module",
   "keywords": [
     "sql",
     "json",