fixup: move parse to earlier phase

nodejs · Mar 6, 2019 · 5c81e3d · 5c81e3d
1 parent 10740f9
commit 5c81e3d
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -104,27 +104,28 @@ translators.set('json', async (url) => {
   const pathname = fileURLToPath(url);
   const modulePath = isWindows ?
     StringReplace(pathname, winSepRegEx, '\\') : pathname;
-  const module = CJSModule._cache[modulePath];
+  let module = CJSModule._cache[modulePath];
   if (module && module.loaded) {
     const exports = module.exports;
     return createDynamicModule(['default'], url, (reflect) => {
       reflect.exports.default.set(exports);
     });
   }
   const content = await readFileAsync(pathname, 'utf-8');
+  try {
+    const exports = JsonParse(stripBOM(content));
+    module = {
+      exports,
+      loaded: true
+    };
+  } catch (err) {
+    err.message = pathname + ': ' + err.message;
+    throw err;
+  }
+  CJSModule._cache[modulePath] = module;
   return createDynamicModule(['default'], url, (reflect) => {
     debug(`Parsing JSONModule ${url}`);
-    try {
-      const exports = JsonParse(stripBOM(content));
-      const module = {
-        exports,
-        loaded: true
-      };
-      CJSModule._cache[modulePath] = module;
-      reflect.exports.default.set(exports);
-    } catch (err) {
-      err.message = pathname + ': ' + err.message;
-      throw err;
-    }
+      reflect.exports.default.set(module.exports);
+
   });
 });