fix: enable support for esm data files

ccontrols · May 7, 2021 · 25b3336 · 25b3336
1 parent f29ccb3
commit 25b3336
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/plugins/cc-cli/package.json b/plugins/cc-cli/package.json
@@ -50,6 +50,7 @@
     "@component-controls/webpack-compile": "^3.9.1",
     "@component-controls/webpack-configs": "^3.9.0",
     "dot": "^1.1.3",
+    "esm": "^3.2.25",
     "path": "^0.12.7"
   },
   "devDependencies": {

diff --git a/plugins/cc-cli/src/cli/save-data-template.ts b/plugins/cc-cli/src/cli/save-data-template.ts
@@ -25,7 +25,14 @@ export const saveDataTemplate = async <P extends TemplateOptions>(
   if (fs.existsSync(filePath)) {
     if (overwrite) {
       //load existing data file
-      existing = require(filePath);
+
+      existing = require('esm')(module)(filePath);
+      if (
+        !existing ||
+        (typeof existing === 'object' && Object.keys(existing).length === 0)
+      ) {
+        existing = require(filePath);
+      }
     } else {
       return undefined;
     }