@atlaspack/core 2.18.6-alshdevreleasescript.0 → 2.18.6-alshintegrationtestslib.0

package/lib/AtlaspackConfig.schema.js

@@ -14,7 +14,13 @@ exports.validatePackageName = validatePackageName;
 // * We do not care about package names
 // * Validation makes interop between parcel/atlaspack confusing.
 //
-function validatePackageName() {}
+function validatePackageName(
+// eslint-disable-next-line no-unused-vars
+pkg,
+// eslint-disable-next-line no-unused-vars
+pluginType,
+// eslint-disable-next-line no-unused-vars
+key) {}
 const validatePluginName = (pluginType, key) => {
   return val => {
     // allow plugin spread...

package/lib/BundleGraph.js

@@ -867,6 +867,7 @@ class BundleGraph {
         if (bundleHasReference(descendant)) {
           isReferenced = true;
           actions.stop();
+          return;
         }
       }, referencer);
       return isReferenced;
@@ -925,6 +926,7 @@ class BundleGraph {
             let childBundles = this.getBundlesInBundleGroup(node.value);
             if (childBundles.some(b => b.id !== bundle.id && b.bundleBehavior !== _types.BundleBehavior.isolated && b.bundleBehavior !== _types.BundleBehavior.inline && this.bundleHasAsset(b, asset))) {
               actions.skipChildren();
+              return;
             }
           }
         }, [bundleGraphEdgeTypes.references, bundleGraphEdgeTypes.bundle]);

package/lib/PackagerRunner.js

@@ -413,9 +413,10 @@ class PackagerRunner {
         inlineSources = this.options.mode === 'production';
       }
     }
+    let mapFilename = fullPath + '.map';
     let isInlineMap = bundleEnv.sourceMap && bundleEnv.sourceMap.inline;
     let stringified = await map.stringify({
-      file: _path().default.basename(fullPath + '.map'),
+      file: _path().default.basename(mapFilename),
       // $FlowFixMe
       fs: this.options.inputFS,
       rootDir: this.options.projectRoot,

package/lib/RequestTracker.js

@@ -722,7 +722,8 @@ class RequestGraph extends _graph().ContentGraph {
         }
       }
       const invalidationsAfter = this.getInvalidNodeCount();
-      invalidationsByPath.set(_path, (invalidationsByPath.get(_path) ?? 0) + (invalidationsAfter - invalidationsBefore));
+      const invalidationsForEvent = invalidationsAfter - invalidationsBefore;
+      invalidationsByPath.set(_path, (invalidationsByPath.get(_path) ?? 0) + invalidationsForEvent);
     }
     if ((0, _featureFlags().getFeatureFlag)('fixQuadraticCacheInvalidation')) {
       cleanUpOrphans(this);
@@ -962,40 +963,41 @@ class RequestTracker {
   }
   createAPI(requestId, previousInvalidations) {
     let subRequestContentKeys = new Set();
-    return {
-      api: {
-        invalidateOnFileCreate: input => this.graph.invalidateOnFileCreate(requestId, input),
-        invalidateOnConfigKeyChange: (filePath, configKey, contentHash) => this.graph.invalidateOnConfigKeyChange(requestId, filePath, configKey, contentHash),
-        invalidateOnFileDelete: filePath => this.graph.invalidateOnFileDelete(requestId, filePath),
-        invalidateOnFileUpdate: filePath => this.graph.invalidateOnFileUpdate(requestId, filePath),
-        invalidateOnStartup: () => this.graph.invalidateOnStartup(requestId),
-        invalidateOnBuild: () => this.graph.invalidateOnBuild(requestId),
-        invalidateOnEnvChange: env => this.graph.invalidateOnEnvChange(requestId, env, this.options.env[env]),
-        invalidateOnOptionChange: option => this.graph.invalidateOnOptionChange(requestId, option, this.options[option]),
-        getInvalidations: () => previousInvalidations,
-        storeResult: (result, cacheKey) => {
-          this.storeResult(requestId, result, cacheKey);
-        },
-        getSubRequests: () => this.graph.getSubRequests(requestId),
-        getInvalidSubRequests: () => this.graph.getInvalidSubRequests(requestId),
-        getPreviousResult: ifMatch => {
-          var _this$graph$getNode;
-          let contentKey = (0, _nullthrows().default)((_this$graph$getNode = this.graph.getNode(requestId)) === null || _this$graph$getNode === void 0 ? void 0 : _this$graph$getNode.id);
-          return this.getRequestResult(contentKey, ifMatch);
-        },
-        getRequestResult: id => this.getRequestResult(id),
-        canSkipSubrequest: contentKey => {
-          if (this.graph.hasContentKey(contentKey) && this.hasValidResult(this.graph.getNodeIdByContentKey(contentKey))) {
-            subRequestContentKeys.add(contentKey);
-            return true;
-          }
-          return false;
-        },
-        runRequest: (subRequest, opts) => {
-          subRequestContentKeys.add(subRequest.id);
-          return this.runRequest(subRequest, opts);
+    let api = {
+      invalidateOnFileCreate: input => this.graph.invalidateOnFileCreate(requestId, input),
+      invalidateOnConfigKeyChange: (filePath, configKey, contentHash) => this.graph.invalidateOnConfigKeyChange(requestId, filePath, configKey, contentHash),
+      invalidateOnFileDelete: filePath => this.graph.invalidateOnFileDelete(requestId, filePath),
+      invalidateOnFileUpdate: filePath => this.graph.invalidateOnFileUpdate(requestId, filePath),
+      invalidateOnStartup: () => this.graph.invalidateOnStartup(requestId),
+      invalidateOnBuild: () => this.graph.invalidateOnBuild(requestId),
+      invalidateOnEnvChange: env => this.graph.invalidateOnEnvChange(requestId, env, this.options.env[env]),
+      invalidateOnOptionChange: option => this.graph.invalidateOnOptionChange(requestId, option, this.options[option]),
+      getInvalidations: () => previousInvalidations,
+      storeResult: (result, cacheKey) => {
+        this.storeResult(requestId, result, cacheKey);
+      },
+      getSubRequests: () => this.graph.getSubRequests(requestId),
+      getInvalidSubRequests: () => this.graph.getInvalidSubRequests(requestId),
+      getPreviousResult: ifMatch => {
+        var _this$graph$getNode;
+        let contentKey = (0, _nullthrows().default)((_this$graph$getNode = this.graph.getNode(requestId)) === null || _this$graph$getNode === void 0 ? void 0 : _this$graph$getNode.id);
+        return this.getRequestResult(contentKey, ifMatch);
+      },
+      getRequestResult: id => this.getRequestResult(id),
+      canSkipSubrequest: contentKey => {
+        if (this.graph.hasContentKey(contentKey) && this.hasValidResult(this.graph.getNodeIdByContentKey(contentKey))) {
+          subRequestContentKeys.add(contentKey);
+          return true;
         }
+        return false;
       },
+      runRequest: (subRequest, opts) => {
+        subRequestContentKeys.add(subRequest.id);
+        return this.runRequest(subRequest, opts);
+      }
+    };
+    return {
+      api,
       subRequestContentKeys
     };
   }
@@ -1147,7 +1149,8 @@ function getWatcherOptions({
   watchDir,
   watchBackend
 }) {
-  const uniqueDirs = [...new Set([...watchIgnore, ...['.git', '.hg'], cacheDir])];
+  const vcsDirs = ['.git', '.hg'];
+  const uniqueDirs = [...new Set([...watchIgnore, ...vcsDirs, cacheDir])];
   const ignore = uniqueDirs.map(dir => _path2().default.resolve(watchDir, dir));
   return {
     ignore,
@@ -1341,13 +1344,15 @@ async function invalidateRequestGraph(requestGraph, options, events) {
   const invalidatedCount = invalidations.reduce((acc, invalidation) => acc + invalidation.count, 0);
   const requestCount = requestGraph.nodes.reduce((acc, node) => acc + ((node === null || node === void 0 ? void 0 : node.type) === REQUEST ? 1 : 0), 0);
   const nodeCount = requestGraph.nodes.length;
+  const nodeInvalidationRatio = invalidatedCount / nodeCount;
+  const requestInvalidationRatio = invalidatedCount / requestCount;
   return {
     invalidations,
     nodeCount,
     requestCount,
     invalidatedCount,
-    nodeInvalidationRatio: invalidatedCount / nodeCount,
-    requestInvalidationRatio: invalidatedCount / requestCount
+    nodeInvalidationRatio,
+    requestInvalidationRatio
   };
 }
 /**

package/lib/Transformation.js

@@ -173,12 +173,12 @@ class Transformation {
     });
 
     // Prefer `isSource` originating from the AssetRequest.
-
+    let isSource = isSourceOverride ?? summarizedIsSource;
     return new _UncommittedAsset.default({
       value: (0, _assetUtils.createAsset)(this.options.projectRoot, {
         code,
         filePath,
-        isSource: isSourceOverride ?? summarizedIsSource,
+        isSource,
         type: _path().default.extname((0, _projectPath.fromProjectPathRelative)(filePath)).slice(1),
         pipeline,
         env,

package/lib/atlaspack-v3/worker/compat/environment.js

@@ -44,13 +44,13 @@ class Environment {
 
   // TODO
   // eslint-disable-next-line no-unused-vars
-  matchesEngines() {
+  matchesEngines(minVersions, defaultValue) {
     return true;
   }
 
   // TODO
   // eslint-disable-next-line no-unused-vars
-  supports() {
+  supports(feature, defaultValue) {
     return true;
   }
 }

package/lib/atlaspack-v3/worker/compat/mutable-asset.js

@@ -126,32 +126,32 @@ class MutableAsset {
   }
 
   // eslint-disable-next-line no-unused-vars
-  addDependency() {
+  addDependency(options) {
     throw new Error('MutableAsset.addDependency()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  addURLDependency() {
+  addURLDependency(url, opts) {
     throw new Error('MutableAsset.addURLDependency()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  setEnvironment() {
+  setEnvironment(opts) {
     throw new Error('MutableAsset.setEnvironment()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileChange() {
+  invalidateOnFileChange(invalidation) {
     // TODO: Forward invalidations to Rust
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileCreate() {
+  invalidateOnFileCreate(invalidation) {
     // TODO: Forward invalidations to Rust
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnEnvChange() {
+  invalidateOnEnvChange(invalidation) {
     // TODO: Forward invalidations to Rust
   }
   invalidateOnStartup() {

package/lib/atlaspack-v3/worker/compat/plugin-config.js

@@ -40,21 +40,21 @@ class PluginConfig {
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileChange() {}
+  invalidateOnFileChange(filePath) {}
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileCreate() {}
+  invalidateOnFileCreate(invalidations) {}
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnEnvChange() {}
+  invalidateOnEnvChange(invalidation) {}
   invalidateOnStartup() {}
   invalidateOnBuild() {}
 
   // eslint-disable-next-line no-unused-vars
-  addDevDependency() {}
+  addDevDependency(options) {}
 
   // eslint-disable-next-line no-unused-vars
-  setCacheKey() {}
+  setCacheKey(key) {}
   getConfig(
   // eslint-disable-next-line no-unused-vars
   filePaths,

package/lib/atlaspack-v3/worker/index.js

@@ -1,3 +1,6 @@
 "use strict";
 
+if (process.env.ATLASPACK_DEV === 'true' || process.env.ATLASPACK_BUILD_ENV === 'test' || process.env.ATLASPACK_SELF_BUILD) {
+  require('@atlaspack/babel-register');
+}
 require('./worker');

package/lib/dumpGraphToGraphViz.js

@@ -47,7 +47,7 @@ const TYPE_COLORS = {
 };
 async function dumpGraphToGraphViz(graph, name, edgeTypes) {
   var _globalThis$ATLASPACK;
-  if ("production" === 'production' && !process.env.ATLASPACK_BUILD_REPL) {
+  if (process.env.ATLASPACK_BUILD_ENV === 'production' && !process.env.ATLASPACK_BUILD_REPL) {
     return;
   }
   let mode = process.env.ATLASPACK_BUILD_REPL ? // $FlowFixMe

package/lib/requests/DevDepRequest.js

@@ -96,7 +96,7 @@ async function createDevDependency(opts, requestDevDeps, options) {
   return devDepRequest;
 }
 async function getDevDepRequests(api) {
-  const previousDevDepRequests = await async function getPreviousDevDepRequests() {
+  async function getPreviousDevDepRequests() {
     if ((0, _featureFlags().getFeatureFlag)('fixBuildAbortCorruption')) {
       const allDevDepRequests = await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, await api.getRequestResult(req.id)]));
       const nonNullDevDepRequests = [];
@@ -109,7 +109,8 @@ async function getDevDepRequests(api) {
     } else {
       return new Map(await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, (0, _nullthrows().default)(await api.getRequestResult(req.id))])));
     }
-  }();
+  }
+  const previousDevDepRequests = await getPreviousDevDepRequests();
   return {
     devDeps: new Map([...previousDevDepRequests.entries()].filter(([id]) => api.canSkipSubrequest(id)).map(([, req]) => [`${req.specifier}:${(0, _projectPath.fromProjectPathRelative)(req.resolveFrom)}`, req.hash])),
     invalidDevDeps: await Promise.all([...previousDevDepRequests.entries()].filter(([id]) => !api.canSkipSubrequest(id)).flatMap(([, req]) => {

package/lib/resolveOptions.js

@@ -139,7 +139,7 @@ async function resolveOptions(initialOptions) {
   // where symlinked dependencies outside the project root need to trigger HMR
   // updates. Default to the project root if not provided.
   let watchDir = initialOptions.watchDir != null ? _path().default.resolve(initialOptions.watchDir) : projectRoot;
-  let cache = function createCache() {
+  function createCache() {
     if (initialOptions.cache) {
       return initialOptions.cache;
     }
@@ -150,7 +150,8 @@ async function resolveOptions(initialOptions) {
       }
     }
     return new (_cache().LMDBLiteCache)(cacheDir);
-  }();
+  }
+  let cache = createCache();
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau = initialOptions.defaultTargetOptions) === null || _initialOptions$defau === void 0 ? void 0 : _initialOptions$defau.shouldOptimize) ?? mode === 'production';
   let publicUrl = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau2 = initialOptions.defaultTargetOptions) === null || _initialOptions$defau2 === void 0 ? void 0 : _initialOptions$defau2.publicUrl) ?? '/';

package/lib/worker.js

@@ -172,7 +172,24 @@ async function childInit() {
   await (_rust().init === null || _rust().init === void 0 ? void 0 : (0, _rust().init)());
 }
 const PKG_RE = /node_modules[/\\]((?:@[^/\\]+[/\\][^/\\]+)|[^/\\]+)(?!.*[/\\]node_modules[/\\])/;
-function invalidateRequireCache() {
+function invalidateRequireCache(workerApi, file) {
+  if (process.env.ATLASPACK_BUILD_ENV === 'test') {
+    // Delete this module and all children in the same node_modules folder
+    let module = require.cache[file];
+    if (module) {
+      var _file$match;
+      delete require.cache[file];
+      let pkg = (_file$match = file.match(PKG_RE)) === null || _file$match === void 0 ? void 0 : _file$match[1];
+      for (let child of module.children) {
+        var _child$id$match;
+        if (pkg === ((_child$id$match = child.id.match(PKG_RE)) === null || _child$id$match === void 0 ? void 0 : _child$id$match[1])) {
+          invalidateRequireCache(workerApi, child.id);
+        }
+      }
+    }
+    atlaspackConfigCache.clear();
+    return;
+  }
   throw new Error('invalidateRequireCache is only for tests');
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.18.6-alshdevreleasescript.0",
+  "version": "2.18.6-alshintegrationtestslib.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,21 +21,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.4-alshdevreleasescript.0",
-    "@atlaspack/cache": "3.2.10-alshdevreleasescript.0",
-    "@atlaspack/diagnostic": "2.14.2-alshdevreleasescript.0",
-    "@atlaspack/events": "2.14.2-alshdevreleasescript.0",
-    "@atlaspack/feature-flags": "2.18.3-alshdevreleasescript.0",
-    "@atlaspack/fs": "2.15.10-alshdevreleasescript.0",
-    "@atlaspack/graph": "3.5.5-alshdevreleasescript.0",
-    "@atlaspack/logger": "2.14.12-alshdevreleasescript.0",
-    "@atlaspack/package-manager": "2.14.15-alshdevreleasescript.0",
-    "@atlaspack/plugin": "2.14.15-alshdevreleasescript.0",
-    "@atlaspack/profiler": "2.14.13-alshdevreleasescript.0",
-    "@atlaspack/rust": "3.3.6-alshdevreleasescript.0",
-    "@atlaspack/types": "2.15.5-alshdevreleasescript.0",
-    "@atlaspack/utils": "2.15.3-alshdevreleasescript.0",
-    "@atlaspack/workers": "2.14.15-alshdevreleasescript.0",
+    "@atlaspack/build-cache": "2.13.4-alshintegrationtestslib.0",
+    "@atlaspack/cache": "3.2.10-alshintegrationtestslib.0",
+    "@atlaspack/diagnostic": "2.14.2-alshintegrationtestslib.0",
+    "@atlaspack/events": "2.14.2-alshintegrationtestslib.0",
+    "@atlaspack/feature-flags": "2.18.3-alshintegrationtestslib.0",
+    "@atlaspack/fs": "2.15.10-alshintegrationtestslib.0",
+    "@atlaspack/graph": "3.5.5-alshintegrationtestslib.0",
+    "@atlaspack/logger": "2.14.12-alshintegrationtestslib.0",
+    "@atlaspack/package-manager": "2.14.15-alshintegrationtestslib.0",
+    "@atlaspack/plugin": "2.14.15-alshintegrationtestslib.0",
+    "@atlaspack/profiler": "2.14.13-alshintegrationtestslib.0",
+    "@atlaspack/rust": "3.3.6-alshintegrationtestslib.0",
+    "@atlaspack/types": "2.15.5-alshintegrationtestslib.0",
+    "@atlaspack/utils": "2.15.3-alshintegrationtestslib.0",
+    "@atlaspack/workers": "2.14.15-alshintegrationtestslib.0",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -49,7 +49,7 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.2-alshdevreleasescript.0",
+    "@atlaspack/babel-register": "2.14.2-alshintegrationtestslib.0",
     "@types/node": ">= 18",
     "graphviz": "^0.0.9",
     "jest-diff": "*",
@@ -60,5 +60,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "4f7731590274737c52fda5fb9ad51310bb89154f"
+  "gitHead": "f6a68fdf5e9837f1040a7ea71443212a6f62ee5b"
 }

package/src/atlaspack-v3/worker/index.js

@@ -1,5 +1,6 @@
 if (
-  process.env.ATLASPACK_BUILD_ENV !== 'production' ||
+  process.env.ATLASPACK_DEV === 'true' ||
+  process.env.ATLASPACK_BUILD_ENV === 'test' ||
   process.env.ATLASPACK_SELF_BUILD
 ) {
   require('@atlaspack/babel-register');