@parcel/utils 2.0.0-nightly.941 → 2.0.0-nightly.949

package/lib/collection.js

@@ -7,6 +7,8 @@ exports.unique = unique;
 exports.objectSortedEntries = objectSortedEntries;
 exports.objectSortedEntriesDeep = objectSortedEntriesDeep;
 exports.setDifference = setDifference;
+exports.setIntersect = setIntersect;
+exports.setUnion = setUnion;
 
 function unique(array) {
   return [...new Set(array)];
@@ -48,4 +50,16 @@ function setDifference(a, b) {
   }
 
   return difference;
+}
+
+function setIntersect(a, b) {
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      a.delete(entry);
+    }
+  }
+}
+
+function setUnion(a, b) {
+  return new Set([...a, ...b]);
 }

package/lib/config.js

@@ -112,7 +112,6 @@ async function loadConfig(fs, filepath, filenames, projectRoot, opts) {
       }
 
       let configContent = await fs.readFile(configFile, 'utf8');
-      if (!configContent) return null;
       let config;
 
       if (parse === false) {

package/lib/index.js

@@ -171,6 +171,18 @@ Object.defineProperty(exports, "setDifference", {
     return _collection.setDifference;
   }
 });
+Object.defineProperty(exports, "setIntersect", {
+  enumerable: true,
+  get: function () {
+    return _collection.setIntersect;
+  }
+});
+Object.defineProperty(exports, "setUnion", {
+  enumerable: true,
+  get: function () {
+    return _collection.setUnion;
+  }
+});
 Object.defineProperty(exports, "resolveConfig", {
   enumerable: true,
   get: function () {

package/lib/replaceBundleReferences.js

@@ -92,7 +92,7 @@ function replaceURLReferences({
       continue;
     }
 
-    if (!resolved || resolved.bundleBehavior === 'inline') {
+    if (resolved.bundleBehavior === 'inline') {
       // If a bundle is inline, it should be replaced with inline contents,
       // not a URL.
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.0.0-nightly.941+17404e9a",
+  "version": "2.0.0-nightly.949+588bf4c0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.0",
-    "@parcel/codeframe": "2.0.0-nightly.941+17404e9a",
-    "@parcel/diagnostic": "2.0.0-nightly.941+17404e9a",
-    "@parcel/hash": "2.0.2-nightly.2563+17404e9a",
-    "@parcel/logger": "2.0.0-nightly.941+17404e9a",
-    "@parcel/markdown-ansi": "2.0.0-nightly.941+17404e9a",
+    "@parcel/codeframe": "2.0.0-nightly.949+588bf4c0",
+    "@parcel/diagnostic": "2.0.0-nightly.949+588bf4c0",
+    "@parcel/hash": "2.0.2-nightly.2571+588bf4c0",
+    "@parcel/logger": "2.0.0-nightly.949+588bf4c0",
+    "@parcel/markdown-ansi": "2.0.0-nightly.949+588bf4c0",
     "@parcel/source-map": "^2.0.0",
     "ansi-html-community": "0.0.8",
     "chalk": "^4.1.0",
@@ -51,5 +51,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "17404e9a9ee6323b973a681017937a4bc6966277"
+  "gitHead": "588bf4c0d6d9dac65a9bf89bf734d7684b523ca2"
 }

package/src/collection.js

@@ -43,3 +43,15 @@ export function setDifference<T>(a: Set<T>, b: Set<T>): Set<T> {
   }
   return difference;
 }
+
+export function setIntersect<T>(a: Set<T>, b: Set<T>): void {
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      a.delete(entry);
+    }
+  }
+}
+
+export function setUnion<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
+  return new Set([...a, ...b]);
+}

package/src/config.js

@@ -82,7 +82,6 @@ export async function loadConfig(
       }
 
       let configContent = await fs.readFile(configFile, 'utf8');
-      if (!configContent) return null;
 
       let config;
       if (parse === false) {

package/src/index.js

@@ -35,6 +35,8 @@ export {
   objectSortedEntries,
   objectSortedEntriesDeep,
   setDifference,
+  setIntersect,
+  setUnion,
 } from './collection';
 export {resolveConfig, resolveConfigSync, loadConfig} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';

package/src/replaceBundleReferences.js

@@ -66,7 +66,7 @@ export function replaceURLReferences({
       continue;
     }
 
-    if (!resolved || resolved.bundleBehavior === 'inline') {
+    if (resolved.bundleBehavior === 'inline') {
       // If a bundle is inline, it should be replaced with inline contents,
       // not a URL.
       continue;

package/test/config.test.js

@@ -0,0 +1,50 @@
+// @flow strict-local
+
+import assert from 'assert';
+import {loadConfig} from '../src/config';
+import {inputFS as fs} from '@parcel/test-utils';
+import path from 'path';
+
+describe('loadConfig', () => {
+  it('load config with json', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/config.json'),
+          ['config.json'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {
+        hoge: 'fuga',
+      },
+    );
+  });
+
+  it('should throw error with empty string json', async () => {
+    // $FlowFixMe[prop-missing]
+    await assert.rejects(async () => {
+      await loadConfig(
+        fs,
+        path.join(__dirname, './input/config/empty.json'),
+        ['empty.json'],
+        path.join(__dirname, './input/config/'),
+      );
+    });
+  });
+
+  it('should load with empty string config toml', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/empty.toml'),
+          ['empty.toml'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {},
+    );
+  });
+});

package/test/input/config/config.json

@@ -0,0 +1,3 @@
+{
+    "hoge": "fuga"
+}