@parcel/utils 2.1.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -19,37 +19,50 @@
   "engines": {
     "node": ">= 12.0.0"
   },
+  "targets": {
+    "main": {
+      "includeNodeModules": {
+        "@parcel/codeframe": false,
+        "@parcel/diagnostic": false,
+        "@parcel/hash": false,
+        "@parcel/logger": false,
+        "@parcel/markdown-ansi": false,
+        "@parcel/source-map": false,
+        "chalk": false
+      }
+    }
+  },
   "dependencies": {
-    "@iarna/toml": "^2.2.0",
-    "@parcel/codeframe": "^2.1.0",
-    "@parcel/diagnostic": "^2.1.0",
-    "@parcel/hash": "^2.1.0",
-    "@parcel/logger": "^2.1.0",
-    "@parcel/markdown-ansi": "^2.1.0",
+    "@parcel/codeframe": "^2.3.0",
+    "@parcel/diagnostic": "^2.3.0",
+    "@parcel/hash": "^2.3.0",
+    "@parcel/logger": "^2.3.0",
+    "@parcel/markdown-ansi": "^2.3.0",
     "@parcel/source-map": "^2.0.0",
+    "chalk": "^4.1.0"
+  },
+  "devDependencies": {
+    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
+    "@iarna/toml": "^2.2.0",
     "ansi-html-community": "0.0.8",
-    "chalk": "^4.1.0",
     "clone": "^2.1.1",
     "fast-glob": "3.1.1",
     "fastest-levenshtein": "^1.0.8",
     "is-glob": "^4.0.0",
     "is-url": "^1.2.2",
-    "json5": "^1.0.1",
+    "json5": "^2.2.0",
     "lru-cache": "^6.0.0",
     "micromatch": "^4.0.4",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.2.1",
     "nullthrows": "^1.1.1",
     "open": "^7.0.3",
+    "random-int": "^1.0.0",
     "terminal-link": "^2.1.1"
   },
-  "devDependencies": {
-    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
-    "random-int": "^1.0.0"
-  },
   "browser": {
     "./src/generateCertificate.js": false,
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "5a80fbe4af8797d0aab248a66f5254f42f00e83e"
+  "gitHead": "65ffb58e88024258c31e1f480241f293e29b25c5"
 }

package/src/config.js

@@ -5,7 +5,7 @@ import type {FileSystem} from '@parcel/fs';
 import ThrowableDiagnostic from '@parcel/diagnostic';
 import path from 'path';
 import clone from 'clone';
-import {parse as json5} from 'json5';
+import json5 from 'json5';
 import {parse as toml} from '@iarna/toml';
 import LRU from 'lru-cache';
 
@@ -154,6 +154,6 @@ function getParser(extname) {
       return toml;
     case 'json':
     default:
-      return json5;
+      return json5.parse;
   }
 }

package/src/glob.js

@@ -5,15 +5,26 @@ import type {FileSystem} from '@parcel/fs';
 
 import _isGlob from 'is-glob';
 import fastGlob, {type FastGlobOptions} from 'fast-glob';
-import {isMatch} from 'micromatch';
+import {isMatch, makeRe, type Options} from 'micromatch';
 import {normalizeSeparators} from './path';
 
 export function isGlob(p: FilePath): any {
   return _isGlob(normalizeSeparators(p));
 }
 
-export function isGlobMatch(filePath: FilePath, glob: Glob): any {
-  return isMatch(filePath, normalizeSeparators(glob));
+export function isGlobMatch(
+  filePath: FilePath,
+  glob: Glob | Array<Glob>,
+  opts?: Options,
+): any {
+  glob = Array.isArray(glob)
+    ? glob.map(normalizeSeparators)
+    : normalizeSeparators(glob);
+  return isMatch(filePath, glob, opts);
+}
+
+export function globToRegex(glob: Glob, opts?: Options): RegExp {
+  return makeRe(glob, opts);
 }
 
 export function globSync(

package/src/index.js

@@ -41,7 +41,7 @@ export {
 export {resolveConfig, resolveConfigSync, loadConfig} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
-export {isGlob, isGlobMatch, globSync, glob} from './glob';
+export {isGlob, isGlobMatch, globSync, glob, globToRegex} from './glob';
 export {hashStream, hashObject, hashFile} from './hash';
 export {SharedBuffer} from './shared-buffer';
 export {fuzzySearch} from './schema';

package/src/replaceBundleReferences.js

@@ -139,8 +139,10 @@ export async function replaceInlineReferences({
 
     let inlineType = nullthrows(entryBundle.getMainEntry()).meta.inlineType;
     if (inlineType == null || inlineType === 'string') {
+      let placeholder = dependency.meta?.placeholder ?? dependency.id;
+      invariant(typeof placeholder === 'string');
       replacements.set(
-        dependency.id,
+        placeholder,
         getInlineReplacement(dependency, inlineType, packagedContents),
       );
     }

package/lib/DefaultMap.js

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DefaultWeakMap = exports.DefaultMap = void 0;
-
-class DefaultMap extends Map {
-  constructor(getDefault, entries) {
-    super(entries);
-    this._getDefault = getDefault;
-  }
-
-  get(key) {
-    let ret;
-
-    if (this.has(key)) {
-      ret = super.get(key);
-    } else {
-      ret = this._getDefault(key);
-      this.set(key, ret);
-    } // $FlowFixMe
-
-
-    return ret;
-  }
-
-} // Duplicated from DefaultMap implementation for Flow
-// Roughly mirrors https://github.com/facebook/flow/blob/2eb5a78d92c167117ba9caae070afd2b9f598599/lib/core.js#L617
-
-
-exports.DefaultMap = DefaultMap;
-
-class DefaultWeakMap extends WeakMap {
-  constructor(getDefault, entries) {
-    super(entries);
-    this._getDefault = getDefault;
-  }
-
-  get(key) {
-    let ret;
-
-    if (this.has(key)) {
-      ret = super.get(key);
-    } else {
-      ret = this._getDefault(key);
-      this.set(key, ret);
-    } // $FlowFixMe
-
-
-    return ret;
-  }
-
-}
-
-exports.DefaultWeakMap = DefaultWeakMap;

package/lib/Deferred.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeDeferredWithPromise = makeDeferredWithPromise;
-
-function _assert() {
-  const data = _interopRequireDefault(require("assert"));
-
-  _assert = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function makeDeferredWithPromise() {
-  let deferred;
-  let promise = new Promise((resolve, reject) => {
-    deferred = {
-      resolve,
-      reject
-    };
-  }); // Promise constructor callback executes synchronously, so this is defined
-
-  (0, _assert().default)(deferred != null);
-  return {
-    deferred,
-    promise
-  };
-}

package/lib/PromiseQueue.js

@@ -1,124 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _Deferred = require("./Deferred");
-
-class PromiseQueue {
-  _numRunning = 0;
-  _queue = [];
-  _runPromise = null;
-  _count = 0;
-  _results = [];
-
-  constructor(opts = {
-    maxConcurrent: Infinity
-  }) {
-    if (opts.maxConcurrent <= 0) {
-      throw new TypeError('maxConcurrent must be a positive, non-zero value');
-    }
-
-    this._maxConcurrent = opts.maxConcurrent;
-  }
-
-  getNumWaiting() {
-    return this._queue.length;
-  }
-
-  add(fn) {
-    return new Promise((resolve, reject) => {
-      let i = this._count++;
-
-      this._queue.push(() => fn().then(result => {
-        this._results[i] = result;
-        resolve(result);
-      }, err => {
-        reject(err);
-        throw err;
-      }));
-
-      if (this._numRunning > 0 && this._numRunning < this._maxConcurrent) {
-        this._next();
-      }
-    });
-  }
-
-  run() {
-    if (this._runPromise != null) {
-      return this._runPromise;
-    }
-
-    if (this._queue.length === 0) {
-      return Promise.resolve([]);
-    }
-
-    let {
-      deferred,
-      promise
-    } = (0, _Deferred.makeDeferredWithPromise)();
-    this._deferred = deferred;
-    this._runPromise = promise;
-
-    while (this._queue.length && this._numRunning < this._maxConcurrent) {
-      this._next();
-    }
-
-    return promise;
-  }
-
-  async _next() {
-    let fn = this._queue.shift();
-
-    await this._runFn(fn);
-
-    if (this._queue.length) {
-      this._next();
-    } else if (this._numRunning === 0) {
-      this._done();
-    }
-  }
-
-  async _runFn(fn) {
-    this._numRunning++;
-
-    try {
-      await fn();
-    } catch (e) {
-      // Only store the first error that occurs.
-      // We don't reject immediately so that any other concurrent
-      // requests have time to complete.
-      if (this._error == null) {
-        this._error = e;
-      }
-    } finally {
-      this._numRunning--;
-    }
-  }
-
-  _resetState() {
-    this._queue = [];
-    this._count = 0;
-    this._results = [];
-    this._runPromise = null;
-    this._numRunning = 0;
-    this._deferred = null;
-  }
-
-  _done() {
-    if (this._deferred != null) {
-      if (this._error != null) {
-        this._deferred.reject(this._error);
-      } else {
-        this._deferred.resolve(this._results);
-      }
-    }
-
-    this._resetState();
-  }
-
-}
-
-exports.default = PromiseQueue;

package/lib/TapStream.js

@@ -1,41 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _stream() {
-  const data = require("stream");
-
-  _stream = function () {
-    return data;
-  };
-
-  return data;
-}
-
-/*
- * "Taps" into the contents of a flowing stream, yielding chunks to the passed
- * callback. Continues to pass data chunks down the stream.
- */
-class TapStream extends _stream().Transform {
-  constructor(tap, options) {
-    super({ ...options
-    });
-    this._tap = tap;
-  }
-
-  _transform(chunk, encoding, callback) {
-    try {
-      this._tap(Buffer.from(chunk));
-
-      callback(null, chunk);
-    } catch (err) {
-      callback(err);
-    }
-  }
-
-}
-
-exports.default = TapStream;

package/lib/alternatives.js

@@ -1,134 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findAlternativeNodeModules = findAlternativeNodeModules;
-exports.findAlternativeFiles = findAlternativeFiles;
-
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-
-  _path = function () {
-    return data;
-  };
-
-  return data;
-}
-
-var _schema = require("./schema");
-
-var _path2 = require("./path");
-
-var _config = require("./config");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-async function findAlternativeNodeModules(fs, moduleName, dir) {
-  let potentialModules = [];
-
-  let root = _path().default.parse(dir).root;
-
-  let isOrganisationModule = moduleName.startsWith('@');
-
-  while (dir !== root) {
-    // Skip node_modules directories
-    if (_path().default.basename(dir) === 'node_modules') {
-      dir = _path().default.dirname(dir);
-    }
-
-    try {
-      let modulesDir = _path().default.join(dir, 'node_modules');
-
-      let stats = await fs.stat(modulesDir);
-
-      if (stats.isDirectory()) {
-        let dirContent = (await fs.readdir(modulesDir)).sort(); // Filter out the modules that interest us
-
-        let modules = dirContent.filter(i => isOrganisationModule ? i.startsWith('@') : !i.startsWith('@')); // If it's an organisation module, loop through all the modules of that organisation
-
-        if (isOrganisationModule) {
-          await Promise.all(modules.map(async item => {
-            let orgDirPath = _path().default.join(modulesDir, item);
-
-            let orgDirContent = (await fs.readdir(orgDirPath)).sort(); // Add all org packages
-
-            potentialModules.push(...orgDirContent.map(i => `${item}/${i}`));
-          }));
-        }
-      }
-    } catch (err) {// ignore
-    } // Move up a directory
-
-
-    dir = _path().default.dirname(dir);
-  }
-
-  return (0, _schema.fuzzySearch)(potentialModules.sort(), moduleName).slice(0, 2);
-}
-
-async function findAllFilesUp({
-  fs,
-  dir,
-  root,
-  basedir,
-  maxlength,
-  collected,
-  leadingDotSlash = true,
-  includeDirectories = true
-}) {
-  let dirContent = (await fs.readdir(dir)).sort();
-  return Promise.all(dirContent.map(async item => {
-    let fullPath = _path().default.join(dir, item);
-
-    let relativeFilePath = (0, _path2.relativePath)(basedir, fullPath, leadingDotSlash);
-
-    if (relativeFilePath.length < maxlength) {
-      let stats = await fs.stat(fullPath);
-      let isDir = stats.isDirectory();
-
-      if (isDir && includeDirectories || stats.isFile()) {
-        collected.push(relativeFilePath);
-      } // If it's a directory, run over each item within said directory...
-
-
-      if (isDir) {
-        return findAllFilesUp({
-          fs,
-          dir: fullPath,
-          root,
-          basedir,
-          maxlength,
-          collected
-        });
-      }
-    }
-  }));
-}
-
-async function findAlternativeFiles(fs, fileSpecifier, dir, projectRoot, leadingDotSlash = true, includeDirectories = true, includeExtension = false) {
-  let potentialFiles = []; // Find our root, we won't recommend files above the package root as that's bad practise
-
-  let pkg = await (0, _config.resolveConfig)(fs, _path().default.join(dir, 'index'), ['package.json'], projectRoot);
-  let pkgRoot = pkg ? _path().default.dirname(pkg) : projectRoot;
-  await findAllFilesUp({
-    fs,
-    dir: pkgRoot,
-    root: pkgRoot,
-    basedir: dir,
-    maxlength: fileSpecifier.length + 10,
-    collected: potentialFiles,
-    leadingDotSlash,
-    includeDirectories
-  });
-
-  if (_path().default.extname(fileSpecifier) === '' && !includeExtension) {
-    potentialFiles = potentialFiles.map(p => {
-      let ext = _path().default.extname(p);
-
-      return ext.length > 0 ? p.slice(0, -ext.length) : p;
-    });
-  }
-
-  return (0, _schema.fuzzySearch)(potentialFiles, fileSpecifier).slice(0, 2);
-}

package/lib/ansi-html.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ansiHtml = ansiHtml;
-
-function _ansiHtmlCommunity() {
-  const data = _interopRequireDefault(require("ansi-html-community"));
-
-  _ansiHtmlCommunity = function () {
-    return data;
-  };
-
-  return data;
-}
-
-var _escapeHtml = require("./escape-html");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ansiHtml(ansi) {
-  return (0, _ansiHtmlCommunity().default)((0, _escapeHtml.escapeHTML)(ansi));
-}

package/lib/blob.js

@@ -1,49 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.blobToBuffer = blobToBuffer;
-exports.blobToString = blobToString;
-
-function _buffer() {
-  const data = require("buffer");
-
-  _buffer = function () {
-    return data;
-  };
-
-  return data;
-}
-
-var _ = require("./");
-
-function _stream() {
-  const data = require("stream");
-
-  _stream = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function blobToBuffer(blob) {
-  if (blob instanceof _stream().Readable) {
-    return (0, _.bufferStream)(blob);
-  } else if (blob instanceof _buffer().Buffer) {
-    return Promise.resolve(_buffer().Buffer.from(blob));
-  } else {
-    return Promise.resolve(_buffer().Buffer.from(blob, 'utf8'));
-  }
-}
-
-async function blobToString(blob) {
-  if (blob instanceof _stream().Readable) {
-    return (await (0, _.bufferStream)(blob)).toString();
-  } else if (blob instanceof _buffer().Buffer) {
-    return blob.toString();
-  } else {
-    return blob;
-  }
-}

package/lib/bundle-url.js

@@ -1,43 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getBaseURL = getBaseURL;
-exports.getBundleURL = void 0;
-let bundleURL = null;
-
-function getBundleURLCached() {
-  if (bundleURL == null) {
-    bundleURL = _getBundleURL();
-  }
-
-  return bundleURL;
-}
-
-function _getBundleURL() {
-  // Attempt to find the URL of the current script and use that as the base URL
-  try {
-    throw new Error();
-  } catch (err) {
-    let stack = typeof err.stack === 'string' ? err.stack : '';
-    let matches = stack.match(/(https?|file|ftp):\/\/[^)\n]+/g);
-
-    if (matches) {
-      return getBaseURL(matches[0]);
-    }
-  }
-
-  return '/';
-}
-
-function getBaseURL(url) {
-  if (url == null) {
-    return '/';
-  }
-
-  return url.replace(/^((?:https?|file|ftp):\/\/.+)\/[^/]+$/, '$1') + '/';
-}
-
-const getBundleURL = getBundleURLCached;
-exports.getBundleURL = getBundleURL;