@parcel/utils 2.0.0-nightly.92 → 2.0.0-nightly.934

package/lib/openInBrowser.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = openInBrowser;
+
+function _open() {
+  const data = _interopRequireDefault(require("open"));
+
+  _open = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _child_process() {
+  const data = require("child_process");
+
+  _child_process = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _logger() {
+  const data = _interopRequireDefault(require("@parcel/logger"));
+
+  _logger = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Chrome app name is platform dependent. we should not hard code it.
+// https://github.com/react-native-community/cli/blob/e2be8a905285d9b37512fc78c9755b9635ecf805/packages/cli/src/commands/server/launchDebugger.ts#L28
+function getChromeAppName() {
+  switch (process.platform) {
+    case 'darwin':
+      return 'google chrome';
+
+    case 'win32':
+      return 'chrome';
+
+    case 'linux':
+      if (commandExistsUnixSync('google-chrome')) {
+        return 'google-chrome';
+      }
+
+      if (commandExistsUnixSync('chromium-browser')) {
+        return 'chromium-browser';
+      }
+
+      return 'chromium';
+
+    default:
+      return 'google-chrome';
+  }
+}
+
+function commandExistsUnixSync(commandName) {
+  try {
+    const stdout = (0, _child_process().execSync)(`command -v ${commandName} 2>/dev/null` + ` && { echo >&1 '${commandName} found'; exit 0; }`);
+    return !!stdout;
+  } catch (error) {
+    return false;
+  }
+}
+
+function getAppName(appName) {
+  if (['google', 'chrome'].includes(appName)) {
+    return getChromeAppName();
+  } else if (['brave', 'Brave'].includes(appName)) {
+    return 'Brave Browser';
+  } else return appName;
+}
+
+async function openInBrowser(url, browser) {
+  try {
+    const options = typeof browser === 'string' && browser.length > 0 ? {
+      app: [getAppName(browser)]
+    } : undefined;
+    await (0, _open().default)(url, options);
+  } catch (err) {
+    _logger().default.error(`Unexpected error while opening in browser: ${browser}`, '@parcel/utils');
+
+    _logger().default.error(err, '@parcel/utils');
+  }
+}

package/lib/path.js

@@ -3,20 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isAbsolute = isAbsolute;
 exports.normalizeSeparators = normalizeSeparators;
+exports.normalizePath = normalizePath;
+exports.relativePath = relativePath;
 
-var _path = _interopRequireDefault(require("path"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const COMMON_SEPARATORS = ['/', '\\'];
+const ABSOLUTE_PATH_REGEX = /^([a-zA-Z]:){0,1}[\\/]+/;
+const SEPARATOR_REGEX = /[\\]+/g;
+
+function isAbsolute(filepath) {
+  return ABSOLUTE_PATH_REGEX.test(filepath);
+}
 
 function normalizeSeparators(filePath) {
-  let ret = filePath;
+  return filePath.replace(SEPARATOR_REGEX, '/');
+}
+
+function normalizePath(filePath, leadingDotSlash = true) {
+  if (leadingDotSlash && (filePath[0] !== '.' || filePath[1] !== '.' && filePath[1] !== '/' && filePath[1] !== '\\') && !_path().default.isAbsolute(filePath)) {
+    return normalizeSeparators('./' + filePath);
+  } else {
+    return normalizeSeparators(filePath);
+  }
+}
 
-  for (let separator of COMMON_SEPARATORS) {
-    ret = ret.split(separator).join(_path.default.sep);
+function relativePath(from, to, leadingDotSlash = true) {
+  // Fast path
+  if (to.startsWith(from + '/')) {
+    return (leadingDotSlash ? './' : '') + to.slice(from.length + 1);
   }
 
-  return ret;
+  return normalizePath(_path().default.relative(from, to), leadingDotSlash);
 }

package/lib/prettyDiagnostic.js

@@ -5,51 +5,133 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = prettyDiagnostic;
 
-var _codeframe = _interopRequireDefault(require("@parcel/codeframe"));
+function _codeframe() {
+  const data = _interopRequireDefault(require("@parcel/codeframe"));
 
-var _markdownAnsi = _interopRequireDefault(require("@parcel/markdown-ansi"));
+  _codeframe = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _markdownAnsi() {
+  const data = _interopRequireDefault(require("@parcel/markdown-ansi"));
+
+  _markdownAnsi = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+
+  _nullthrows = function () {
+    return data;
+  };
 
-var _chalk = _interopRequireDefault(require("chalk"));
+  return data;
+}
 
-var _path = _interopRequireDefault(require("path"));
+function _terminalLink() {
+  const data = _interopRequireDefault(require("terminal-link"));
+
+  _terminalLink = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function prettyDiagnostic(diagnostic) {
+// $FlowFixMe
+async function prettyDiagnostic(diagnostic, options, terminalWidth) {
   let {
     origin,
     message,
     stack,
-    codeFrame,
+    codeFrames,
     hints,
-    filePath,
-    language,
-    skipFormatting
+    skipFormatting,
+    documentationURL
   } = diagnostic;
   let result = {
-    message: '',
+    message: (0, _markdownAnsi().default)(`**${origin !== null && origin !== void 0 ? origin : 'unknown'}**: `) + (skipFormatting ? message : (0, _markdownAnsi().default)(message)),
     stack: '',
     codeframe: '',
-    hints: []
+    hints: [],
+    documentation: ''
   };
-  result.message = (0, _markdownAnsi.default)(`**${origin !== null && origin !== void 0 ? origin : 'unknown'}**: `) + (skipFormatting ? message : (0, _markdownAnsi.default)(message));
-  result.stack = stack || '';
-
-  if (codeFrame !== undefined) {
-    let highlights = Array.isArray(codeFrame.codeHighlights) ? codeFrame.codeHighlights : [codeFrame.codeHighlights];
-    let formattedCodeFrame = (0, _codeframe.default)(codeFrame.code, highlights, {
-      useColor: true,
-      syntaxHighlighting: true,
-      language: // $FlowFixMe sketchy null checks do not matter here...
-      language || (filePath ? _path.default.extname(filePath).substr(1) : undefined)
-    });
-    result.codeframe += typeof filePath !== 'string' ? '' : _chalk.default.underline(`${filePath}:${highlights[0].start.line}:${highlights[0].start.column}\n`);
-    result.codeframe += formattedCodeFrame;
+
+  if (codeFrames != null) {
+    for (let codeFrame of codeFrames) {
+      var _codeFrame$code;
+
+      let filePath = codeFrame.filePath;
+
+      if (filePath != null && options && !_path().default.isAbsolute(filePath)) {
+        filePath = _path().default.join(options.projectRoot, filePath);
+      }
+
+      let highlights = codeFrame.codeHighlights;
+      let code = (_codeFrame$code = codeFrame.code) !== null && _codeFrame$code !== void 0 ? _codeFrame$code : options && (await options.inputFS.readFile((0, _nullthrows().default)(filePath), 'utf8'));
+      let formattedCodeFrame = '';
+
+      if (code != null) {
+        formattedCodeFrame = (0, _codeframe().default)(code, highlights, {
+          useColor: true,
+          syntaxHighlighting: true,
+          language: // $FlowFixMe sketchy null checks do not matter here...
+          codeFrame.language || (filePath != null ? _path().default.extname(filePath).substr(1) : undefined),
+          terminalWidth
+        });
+      }
+
+      result.codeframe += typeof filePath !== 'string' ? '' : _chalk().default.gray.underline(`${filePath}:${highlights[0].start.line}:${highlights[0].start.column}\n`);
+      result.codeframe += formattedCodeFrame;
+
+      if (codeFrame !== codeFrames[codeFrames.length - 1]) {
+        result.codeframe += '\n\n';
+      }
+    }
+  }
+
+  if (stack != null) {
+    result.stack = stack;
   }
 
   if (Array.isArray(hints) && hints.length) {
     result.hints = hints.map(h => {
-      return (0, _markdownAnsi.default)(h);
+      return (0, _markdownAnsi().default)(h);
+    });
+  }
+
+  if (documentationURL != null) {
+    result.documentation = (0, _terminalLink().default)('Learn more', documentationURL, {
+      fallback: (text, url) => `${text}: ${url}`
     });
   }
 

package/lib/relativeBundlePath.js

@@ -5,20 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.relativeBundlePath = relativeBundlePath;
 
-var _path = _interopRequireDefault(require("path"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-var _nullthrows = _interopRequireDefault(require("nullthrows"));
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
+
+var _path2 = require("./path");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function relativeBundlePath(from, to, opts = {
   leadingDotSlash: true
 }) {
-  let p = _path.default.relative(_path.default.dirname((0, _nullthrows.default)(from.filePath)), (0, _nullthrows.default)(to.filePath)).replace(/\\/g, '/');
+  let fromPath = _path().default.join(from.target.distDir, from.name);
 
-  if (opts.leadingDotSlash && p[0] !== '.') {
-    p = './' + p;
-  }
+  let toPath = _path().default.join(to.target.distDir, to.name);
 
-  return p;
+  return (0, _path2.relativePath)(_path().default.dirname(fromPath), toPath, opts.leadingDotSlash);
 }

package/lib/relativeUrl.js

@@ -5,12 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = relativeUrl;
 
-var _path = _interopRequireDefault(require("path"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-var _url = _interopRequireDefault(require("url"));
+  _path = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _url() {
+  const data = _interopRequireDefault(require("url"));
+
+  _url = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function relativeUrl(from, to) {
-  return _url.default.format(_url.default.parse(_path.default.relative(from, to)));
+  return _url().default.format(_url().default.parse(_path().default.relative(from, to)));
 }

package/lib/replaceBundleReferences.js

@@ -5,20 +5,55 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.replaceURLReferences = replaceURLReferences;
 exports.replaceInlineReferences = replaceInlineReferences;
+exports.getURLReplacement = getURLReplacement;
 
-var _stream = require("stream");
+function _stream() {
+  const data = require("stream");
 
-var _nullthrows = _interopRequireDefault(require("nullthrows"));
+  _stream = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+
+  _nullthrows = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+
+  _assert = function () {
+    return data;
+  };
+
+  return data;
+}
 
-var _url = _interopRequireDefault(require("url"));
+function _url() {
+  const data = _interopRequireDefault(require("url"));
 
-var _ = require("../");
+  _url = function () {
+    return data;
+  };
+
+  return data;
+}
+
+var _ = require("./");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /*
  * Replaces references to dependency ids for URL dependencies with:
- *   - in the case of an unresolvable url dependency, the original moduleSpecifier.
+ *   - in the case of an unresolvable url dependency, the original specifier.
  *     These are external requests that Parcel did not bundle.
  *   - in the case of a reference to another bundle, the relative url to that
  *     bundle from the current bundle.
@@ -31,34 +66,42 @@ function replaceURLReferences({
   relative = true
 }) {
   let replacements = new Map();
+  let urlDependencies = [];
+  bundle.traverse(node => {
+    if (node.type === 'dependency' && node.value.specifierType === 'url') {
+      urlDependencies.push(node.value);
+    }
+  });
+
+  for (let dependency of urlDependencies) {
+    var _dependency$meta$plac, _dependency$meta;
 
-  for (let dependency of bundleGraph.getExternalDependencies(bundle)) {
-    if (!dependency.isURL) {
+    if (dependency.specifierType !== 'url') {
       continue;
     }
 
-    let bundleGroup = bundleGraph.resolveExternalDependency(dependency);
+    let placeholder = (_dependency$meta$plac = (_dependency$meta = dependency.meta) === null || _dependency$meta === void 0 ? void 0 : _dependency$meta.placeholder) !== null && _dependency$meta$plac !== void 0 ? _dependency$meta$plac : dependency.id;
+    (0, _assert().default)(typeof placeholder === 'string');
+    let resolved = bundleGraph.getReferencedBundle(dependency, bundle);
 
-    if (bundleGroup == null) {
-      replacements.set(dependency.id, {
-        from: dependency.id,
-        to: dependency.moduleSpecifier
+    if (resolved == null) {
+      replacements.set(placeholder, {
+        from: placeholder,
+        to: dependency.specifier
       });
       continue;
     }
 
-    let [entryBundle] = bundleGraph.getBundlesInBundleGroup(bundleGroup);
-
-    if (entryBundle.isInline) {
+    if (!resolved || resolved.bundleBehavior === 'inline') {
       // If a bundle is inline, it should be replaced with inline contents,
       // not a URL.
       continue;
     }
 
-    replacements.set(dependency.id, getURLReplacement({
+    replacements.set(placeholder, getURLReplacement({
       dependency,
       fromBundle: bundle,
-      toBundle: entryBundle,
+      toBundle: resolved,
       relative
     }));
   }
@@ -80,23 +123,23 @@ async function replaceInlineReferences({
   getInlineBundleContents
 }) {
   let replacements = new Map();
-
-  for (let dependency of bundleGraph.getExternalDependencies(bundle)) {
-    let bundleGroup = bundleGraph.resolveExternalDependency(dependency);
-
-    if (bundleGroup == null) {
-      continue;
+  let dependencies = [];
+  bundle.traverse(node => {
+    if (node.type === 'dependency') {
+      dependencies.push(node.value);
     }
+  });
 
-    let [entryBundle] = bundleGraph.getBundlesInBundleGroup(bundleGroup);
+  for (let dependency of dependencies) {
+    let entryBundle = bundleGraph.getReferencedBundle(dependency, bundle);
 
-    if (!entryBundle.isInline) {
+    if ((entryBundle === null || entryBundle === void 0 ? void 0 : entryBundle.bundleBehavior) !== 'inline') {
       continue;
     }
 
     let packagedBundle = await getInlineBundleContents(entryBundle, bundleGraph);
-    let packagedContents = (packagedBundle.contents instanceof _stream.Readable ? await (0, _.bufferStream)(packagedBundle.contents) : packagedBundle.contents).toString();
-    let inlineType = (0, _nullthrows.default)(entryBundle.getMainEntry()).meta.inlineType;
+    let packagedContents = (packagedBundle.contents instanceof _stream().Readable ? await (0, _.bufferStream)(packagedBundle.contents) : packagedBundle.contents).toString();
+    let inlineType = (0, _nullthrows().default)(entryBundle.getMainEntry()).meta.inlineType;
 
     if (inlineType == null || inlineType === 'string') {
       replacements.set(dependency.id, getInlineReplacement(dependency, inlineType, packagedContents));
@@ -112,22 +155,35 @@ function getURLReplacement({
   toBundle,
   relative
 }) {
-  let url = _url.default.parse(dependency.moduleSpecifier);
+  var _dependency$meta$plac2, _dependency$meta2;
 
   let to;
 
+  let orig = _url().default.parse(dependency.specifier);
+
   if (relative) {
-    url.pathname = (0, _.relativeBundlePath)(fromBundle, toBundle, {
-      leadingDotSlash: false
-    });
-    to = _url.default.format(url);
+    to = _url().default.format({
+      pathname: (0, _.relativeBundlePath)(fromBundle, toBundle, {
+        leadingDotSlash: false
+      }),
+      hash: orig.hash
+    }); // If the resulting path includes a colon character and doesn't start with a ./ or ../
+    // we need to add one so that the first part before the colon isn't parsed as a URL protocol.
+
+    if (to.includes(':') && !to.startsWith('./') && !to.startsWith('../')) {
+      to = './' + to;
+    }
   } else {
-    url.pathname = (0, _nullthrows.default)(toBundle.name);
-    to = (0, _.urlJoin)((0, _nullthrows.default)(toBundle.target.publicUrl), _url.default.format(url));
+    to = (0, _.urlJoin)(toBundle.target.publicUrl, _url().default.format({
+      pathname: (0, _nullthrows().default)(toBundle.name),
+      hash: orig.hash
+    }));
   }
 
+  let placeholder = (_dependency$meta$plac2 = (_dependency$meta2 = dependency.meta) === null || _dependency$meta2 === void 0 ? void 0 : _dependency$meta2.placeholder) !== null && _dependency$meta$plac2 !== void 0 ? _dependency$meta$plac2 : dependency.id;
+  (0, _assert().default)(typeof placeholder === 'string');
   return {
-    from: dependency.id,
+    from: placeholder,
     to
   };
 }