fix merge issues

OpenC3 · Dec 5, 2024 · 590d29f · 590d29f
1 parent e9386ee
commit 590d29f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 61 deletions.
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/.babelrc b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/.babelrc
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/.eslintrc.cjs b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/.eslintrc.cjs
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/babel.config.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/babel.config.json
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/eslint.config.mjs b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/eslint.config.mjs
@@ -23,12 +23,8 @@ export default [...compat.extends("plugin:prettier/recommended"), {
             ...globals.node,
         },
 
-        ecmaVersion: 5,
-        sourceType: "commonjs",
-
-        parserOptions: {
-            parser: "@babel/eslint-parser",
-        },
+        ecmaVersion: 2020,
+        sourceType: "module",
     },
 
     rules: {