@parcel/utils 2.0.0-nightly.1285 → 2.0.0-nightly.1290

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.0.0-nightly.1285+0356c65e9",
+  "version": "2.0.0-nightly.1290+94b3ac40a",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -33,11 +33,11 @@
     }
   },
   "dependencies": {
-    "@parcel/codeframe": "2.0.0-nightly.1285+0356c65e9",
-    "@parcel/diagnostic": "2.0.0-nightly.1285+0356c65e9",
-    "@parcel/hash": "2.8.4-nightly.2908+0356c65e9",
-    "@parcel/logger": "2.0.0-nightly.1285+0356c65e9",
-    "@parcel/markdown-ansi": "2.0.0-nightly.1285+0356c65e9",
+    "@parcel/codeframe": "2.0.0-nightly.1290+94b3ac40a",
+    "@parcel/diagnostic": "2.0.0-nightly.1290+94b3ac40a",
+    "@parcel/hash": "2.8.4-nightly.2913+94b3ac40a",
+    "@parcel/logger": "2.0.0-nightly.1290+94b3ac40a",
+    "@parcel/markdown-ansi": "2.0.0-nightly.1290+94b3ac40a",
     "@parcel/source-map": "^2.1.1",
     "chalk": "^4.1.0",
     "nullthrows": "^1.1.1"
@@ -65,5 +65,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "0356c65e98c819f38a2935131fc6f114f865ef6e"
+  "gitHead": "94b3ac40a5630c17c0186adbc7d8c64e31e2a7b3"
 }

package/src/config.js

@@ -74,7 +74,7 @@ export async function loadConfig(
       if (extname === 'js' || extname === 'cjs') {
         let output = {
           // $FlowFixMe
-          config: clone(require(configFile)),
+          config: clone(module.require(configFile)),
           files: [{filePath: configFile}],
         };
 
@@ -82,55 +82,7 @@ export async function loadConfig(
         return output;
       }
 
-      let configContent = await fs.readFile(configFile, 'utf8');
-
-      let config;
-      if (parse === false) {
-        config = configContent;
-      } else {
-        let parse = opts?.parser ?? getParser(extname);
-        try {
-          config = parse(configContent);
-        } catch (e) {
-          if (extname !== '' && extname !== 'json') {
-            throw e;
-          }
-
-          let pos = {
-            line: e.lineNumber,
-            column: e.columnNumber,
-          };
-
-          throw new ThrowableDiagnostic({
-            diagnostic: {
-              message: `Failed to parse ${path.basename(configFile)}`,
-              origin: '@parcel/utils',
-              codeFrames: [
-                {
-                  language: 'json5',
-                  filePath: configFile,
-                  code: configContent,
-                  codeHighlights: [
-                    {
-                      start: pos,
-                      end: pos,
-                      message: e.message,
-                    },
-                  ],
-                },
-              ],
-            },
-          });
-        }
-      }
-
-      let output = {
-        config,
-        files: [{filePath: configFile}],
-      };
-
-      configCache.set(String(parse) + configFile, output);
-      return output;
+      return readConfig(fs, configFile, opts);
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND' || err.code === 'ENOENT') {
         return null;
@@ -148,6 +100,76 @@ loadConfig.clear = () => {
   resolveCache.clear();
 };
 
+export async function readConfig(
+  fs: FileSystem,
+  configFile: FilePath,
+  opts: ?ConfigOptions,
+): Promise<ConfigOutput | null> {
+  let parse = opts?.parse ?? true;
+  let cachedOutput = configCache.get(String(parse) + configFile);
+  if (cachedOutput) {
+    return cachedOutput;
+  }
+
+  try {
+    let configContent = await fs.readFile(configFile, 'utf8');
+    let config;
+    if (parse === false) {
+      config = configContent;
+    } else {
+      let extname = path.extname(configFile).slice(1);
+      let parse = opts?.parser ?? getParser(extname);
+      try {
+        config = parse(configContent);
+      } catch (e) {
+        if (extname !== '' && extname !== 'json') {
+          throw e;
+        }
+
+        let pos = {
+          line: e.lineNumber,
+          column: e.columnNumber,
+        };
+
+        throw new ThrowableDiagnostic({
+          diagnostic: {
+            message: `Failed to parse ${path.basename(configFile)}`,
+            origin: '@parcel/utils',
+            codeFrames: [
+              {
+                language: 'json5',
+                filePath: configFile,
+                code: configContent,
+                codeHighlights: [
+                  {
+                    start: pos,
+                    end: pos,
+                    message: e.message,
+                  },
+                ],
+              },
+            ],
+          },
+        });
+      }
+    }
+
+    let output = {
+      config,
+      files: [{filePath: configFile}],
+    };
+
+    configCache.set(String(parse) + configFile, output);
+    return output;
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND' || err.code === 'ENOENT') {
+      return null;
+    }
+
+    throw err;
+  }
+}
+
 function getParser(extname) {
   switch (extname) {
     case 'toml':

package/src/index.js

@@ -40,7 +40,12 @@ export {
   setIntersect,
   setUnion,
 } from './collection';
-export {resolveConfig, resolveConfigSync, loadConfig} from './config';
+export {
+  resolveConfig,
+  resolveConfigSync,
+  loadConfig,
+  readConfig,
+} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
 export {getProgressMessage} from './progress-message.js';