@parcel/utils 2.7.0 → 2.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -33,12 +33,12 @@
     }
   },
   "dependencies": {
-    "@parcel/codeframe": "2.7.0",
-    "@parcel/diagnostic": "2.7.0",
-    "@parcel/hash": "2.7.0",
-    "@parcel/logger": "2.7.0",
-    "@parcel/markdown-ansi": "2.7.0",
-    "@parcel/source-map": "^2.0.0",
+    "@parcel/codeframe": "2.8.0",
+    "@parcel/diagnostic": "2.8.0",
+    "@parcel/hash": "2.8.0",
+    "@parcel/logger": "2.8.0",
+    "@parcel/markdown-ansi": "2.8.0",
+    "@parcel/source-map": "^2.1.1",
     "chalk": "^4.1.0"
   },
   "devDependencies": {
@@ -63,5 +63,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "9e5d05586577e89991ccf90400f2c741dca11aa3"
+  "gitHead": "c3bbe0a6160186f496ca2f9e9bead9376c0522f1"
 }

package/src/getModuleParts.js

@@ -0,0 +1,23 @@
+// @flow strict-local
+import path from 'path';
+
+import {normalizeSeparators} from './path';
+
+/**
+ * Returns the package name and the optional subpath
+ */
+export default function getModuleParts(_name: string): [string, ?string] {
+  let name = path.normalize(_name);
+  let splitOn = name.indexOf(path.sep);
+  if (name.charAt(0) === '@') {
+    splitOn = name.indexOf(path.sep, splitOn + 1);
+  }
+  if (splitOn < 0) {
+    return [normalizeSeparators(name), undefined];
+  } else {
+    return [
+      normalizeSeparators(name.substring(0, splitOn)),
+      name.substring(splitOn + 1) || undefined,
+    ];
+  }
+}

package/src/index.js

@@ -11,6 +11,7 @@ export {default as countLines} from './countLines';
 export {default as generateBuildMetrics} from './generateBuildMetrics';
 export {default as generateCertificate} from './generateCertificate';
 export {default as getCertificate} from './getCertificate';
+export {default as getModuleParts} from './getModuleParts';
 export {default as getRootDir} from './getRootDir';
 export {default as isDirectoryInside} from './isDirectoryInside';
 export {default as isURL} from './is-url';

package/src/prettyDiagnostic.js

@@ -6,7 +6,6 @@ import formatCodeFrame from '@parcel/codeframe';
 import mdAnsi from '@parcel/markdown-ansi';
 import chalk from 'chalk';
 import path from 'path';
-import nullthrows from 'nullthrows';
 // $FlowFixMe
 import terminalLink from 'terminal-link';
 
@@ -60,10 +59,10 @@ export default async function prettyDiagnostic(
       }
 
       let highlights = codeFrame.codeHighlights;
-      let code =
-        codeFrame.code ??
-        (options &&
-          (await options.inputFS.readFile(nullthrows(filePath), 'utf8')));
+      let code = codeFrame.code;
+      if (code == null && options && filePath != null) {
+        code = await options.inputFS.readFile(filePath, 'utf8');
+      }
 
       let formattedCodeFrame = '';
       if (code != null) {