@atlaspack/core 2.16.2-canary.48 → 2.16.2-canary.481

package/lib/requests/ConfigRequest.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.getConfigHash = getConfigHash;
 exports.getConfigKeyContentHash = getConfigKeyContentHash;
 exports.getConfigRequests = getConfigRequests;
+exports.getValueAtPath = getValueAtPath;
 exports.loadPluginConfig = loadPluginConfig;
+exports.loadPluginSetup = loadPluginSetup;
 exports.runConfigRequest = runConfigRequest;
 function _utils() {
   const data = require("@atlaspack/utils");
@@ -56,9 +58,8 @@ function _profiler() {
 }
 var _RequestTracker = require("../RequestTracker");
 var _projectPath = require("../projectPath");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 async function loadPluginConfig(loadedPlugin, config, options) {
   let loadConfig = loadedPlugin.plugin.loadConfig;
   if (!loadConfig) {
@@ -86,19 +87,66 @@ async function loadPluginConfig(loadedPlugin, config, options) {
     });
   }
 }
+async function loadPluginSetup(pluginName, setup, config, options) {
+  try {
+    let result = await setup({
+      config: new _Config.default(config, options),
+      options: new _PluginOptions.default((0, _utils2.optionsProxy)(options, option => {
+        config.invalidateOnOptionChange.add(option);
+      })),
+      logger: new (_logger().PluginLogger)({
+        origin: pluginName
+      }),
+      tracer: new (_profiler().PluginTracer)({
+        origin: pluginName,
+        category: 'setup'
+      })
+    });
+    config.result = result.config;
+  } catch (e) {
+    throw new (_diagnostic().default)({
+      diagnostic: (0, _diagnostic().errorToDiagnostic)(e, {
+        origin: pluginName
+      })
+    });
+  }
+}
+
+/**
+ * Return value at a given key path within an object.
+ *
+ * @example
+ *     const obj = { a: { b: { c: 'd' } } };
+ *     getValueAtPath(obj, ['a', 'b', 'c']);        // 'd'
+ *     getValueAtPath(obj, ['a', 'b', 'd']);        // undefined
+ *     getValueAtPath(obj, ['a', 'b']);             // { c: 'd' }
+ *     getValueAtPath(obj, ['a', 'b', 'c', 'd']);   // undefined
+ */
+function getValueAtPath(obj, key) {
+  let current = obj;
+  for (let part of key) {
+    if (current == null) {
+      return undefined;
+    }
+    current = current[part];
+  }
+  return current;
+}
 const configKeyCache = (0, _buildCache().createBuildCache)();
 async function getConfigKeyContentHash(filePath, configKey, options) {
-  let cacheKey = `${(0, _projectPath.fromProjectPathRelative)(filePath)}:${configKey}`;
+  let cacheKey = `${(0, _projectPath.fromProjectPathRelative)(filePath)}:${JSON.stringify(configKey)}`;
   let cachedValue = configKeyCache.get(cacheKey);
   if (cachedValue) {
+    // @ts-expect-error TS2322
     return cachedValue;
   }
-  let conf = await (0, _utils().readConfig)(options.inputFS, (0, _projectPath.fromProjectPath)(options.projectRoot, filePath));
-  if (conf == null || conf.config[configKey] == null) {
+  const conf = await (0, _utils().readConfig)(options.inputFS, (0, _projectPath.fromProjectPath)(options.projectRoot, filePath));
+  const value = getValueAtPath(conf === null || conf === void 0 ? void 0 : conf.config, configKey);
+  if (conf == null || value == null) {
     // This can occur when a config key has been removed entirely during `respondToFSEvents`
     return '';
   }
-  let contentHash = typeof conf.config[configKey] === 'object' ? (0, _utils().hashObject)(conf.config[configKey]) : (0, _rust().hashString)(JSON.stringify(conf.config[configKey]));
+  const contentHash = typeof value === 'object' ? (0, _utils().hashObject)(value) : (0, _rust().hashString)(JSON.stringify(value));
   configKeyCache.set(cacheKey, contentHash);
   return contentHash;
 }

package/lib/requests/DevDepRequest.js

@@ -27,7 +27,7 @@ var _assetUtils = require("../assetUtils");
 var _utils = require("../utils");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // A cache of dev dep requests keyed by invalidations.
 // If the package manager returns the same invalidation object, then
 // we can reuse the dev dep request rather than recomputing the project
@@ -89,14 +89,32 @@ async function createDevDependency(opts, requestDevDeps, options) {
   return devDepRequest;
 }
 async function getDevDepRequests(api) {
-  let previousDevDepRequests = 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))])));
+  async function getPreviousDevDepRequests() {
+    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 = [];
+    for (const [id, result] of allDevDepRequests) {
+      if (result != null) {
+        nonNullDevDepRequests.push([id, result]);
+      }
+    }
+
+    // @ts-expect-error TS2769
+    return new Map(nonNullDevDepRequests);
+  }
+  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]) => {
+    devDeps: new Map([...previousDevDepRequests.entries()]
+    // @ts-expect-error TS2769
+    .filter(([id]) => api.canSkipSubrequest(id)).map(([, req]) => [`${req.specifier}:${(0, _projectPath.fromProjectPathRelative)(req.resolveFrom)}`, req.hash])),
+    invalidDevDeps: await Promise.all([...previousDevDepRequests.entries()]
+    // @ts-expect-error TS2769
+    .filter(([id]) => !api.canSkipSubrequest(id)).flatMap(([, req]) => {
       return [{
         specifier: req.specifier,
         resolveFrom: req.resolveFrom
-      }, ...(req.additionalInvalidations ?? []).map(i => ({
+      },
+      // @ts-expect-error TS7006
+      ...(req.additionalInvalidations ?? []).map(i => ({
         specifier: i.specifier,
         resolveFrom: i.resolveFrom
       }))];
@@ -122,7 +140,9 @@ function invalidateDevDeps(invalidDevDeps, options, config) {
 }
 const devDepRequests = (0, _buildCache().createBuildCache)();
 function resolveDevDepRequestRef(devDepRequestRef) {
-  const devDepRequest = devDepRequestRef.type === 'ref' ? devDepRequests.get(devDepRequestRef.hash) : devDepRequestRef;
+  const devDepRequest =
+  // @ts-expect-error TS2339
+  devDepRequestRef.type === 'ref' ? devDepRequests.get(devDepRequestRef.hash) : devDepRequestRef;
   if (devDepRequest == null) {
     throw new Error(`Worker send back a reference to a missing dev dep request.
 
@@ -132,15 +152,21 @@ ${process.env.NODE_ENV === 'test' ? `If this is a unit test, call atlaspack.clea
 
 This is a bug in Atlaspack.`);
   }
+
+  // @ts-expect-error TS2339
   if (devDepRequestRef.type !== 'ref') {
+    // @ts-expect-error TS2345
     devDepRequests.set(devDepRequest.hash, devDepRequest);
   }
+
+  // @ts-expect-error TS2322
   return devDepRequest;
 }
 async function runDevDepRequest(api, devDepRequestRef) {
   await api.runRequest({
     id: 'dev_dep_request:' + devDepRequestRef.specifier + ':' + devDepRequestRef.hash,
     type: _RequestTracker.requestTypes.dev_dep_request,
+    // @ts-expect-error TS2322
     run: ({
       api
     }) => {

package/lib/requests/EntryRequest.js

@@ -35,9 +35,8 @@ function _jsonSourcemap() {
 }
 var _RequestTracker = require("../RequestTracker");
 var _projectPath = require("../projectPath");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const type = 'entry_request';
 function createEntryRequest(input) {
   return {
@@ -47,6 +46,8 @@ function createEntryRequest(input) {
     input
   };
 }
+
+// @ts-expect-error TS7031
 async function run({
   input,
   api,

package/lib/requests/PackageRequest.js

@@ -15,7 +15,29 @@ function _nullthrows() {
 var _ConfigRequest = require("./ConfigRequest");
 var _DevDepRequest = require("./DevDepRequest");
 var _AtlaspackConfigRequest = _interopRequireDefault(require("./AtlaspackConfigRequest"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _EnvironmentManager = require("../EnvironmentManager");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+function _logger() {
+  const data = _interopRequireDefault(require("@atlaspack/logger"));
+  _logger = function () {
+    return data;
+  };
+  return data;
+}
+function _diagnostic() {
+  const data = _interopRequireDefault(require("@atlaspack/diagnostic"));
+  _diagnostic = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function createPackageRequest(input) {
   return {
     type: _RequestTracker.requestTypes.package_request,
@@ -27,7 +49,8 @@ function createPackageRequest(input) {
 async function run({
   input,
   api,
-  farm
+  farm,
+  rustAtlaspack
 }) {
   let {
     bundleGraphReference,
@@ -44,20 +67,40 @@ async function run({
   let {
     cachePath
   } = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
+  let packagingResult;
+  if ((0, _featureFlags().getFeatureFlag)('nativePackager') && (0, _featureFlags().getFeatureFlag)('nativePackagerSSRDev') && rustAtlaspack && (0, _EnvironmentManager.fromEnvironmentId)(bundle.env).context === 'tesseract' && bundle.type === 'js') {
+    // Once this actually does something, the code below will be in an `else` block (i.e. we'll only run one or the other)
+    let result = await rustAtlaspack.package(bundle.id, {
+      inlineRequires: true
+    });
+    let error = null;
+    [packagingResult, error] = result;
+    if (error) {
+      throw new (_diagnostic().default)({
+        diagnostic: error
+      });
+    }
+    _logger().default.verbose({
+      message: JSON.stringify(packagingResult, null, 2),
+      origin: '@atlaspack/core'
+    });
+  } else {
+    packagingResult = await runPackage({
+      bundle,
+      bundleGraphReference,
+      optionsRef,
+      configCachePath: cachePath,
+      previousDevDeps: devDeps,
+      invalidDevDeps,
+      previousInvalidations: api.getInvalidations()
+    });
+  }
   let {
     devDepRequests,
     configRequests,
     bundleInfo,
     invalidations
-  } = await runPackage({
-    bundle,
-    bundleGraphReference,
-    optionsRef,
-    configCachePath: cachePath,
-    previousDevDeps: devDeps,
-    invalidDevDeps,
-    previousInvalidations: api.getInvalidations()
-  });
+  } = packagingResult;
   for (let devDepRequest of devDepRequests) {
     await (0, _DevDepRequest.runDevDepRequest)(api, devDepRequest);
   }
@@ -77,11 +120,12 @@ async function run({
         api.invalidateOnOptionChange(invalidation.key);
         break;
       default:
+        // @ts-expect-error TS2339
         throw new Error(`Unknown invalidation type: ${invalidation.type}`);
     }
   }
 
-  // $FlowFixMe[cannot-write] time is marked read-only, but this is the exception
+  // @ts-expect-error TS2540
   bundleInfo.time = Date.now() - start;
   api.storeResult(bundleInfo);
   return bundleInfo;

package/lib/requests/PathRequest.js

@@ -26,6 +26,13 @@ function _logger() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -50,7 +57,6 @@ function _utils() {
 var _ReporterRunner = require("../ReporterRunner");
 var _Dependency = require("../public/Dependency");
 var _PluginOptions = _interopRequireDefault(require("../public/PluginOptions"));
-var _AtlaspackConfig = require("../AtlaspackConfig");
 var _AtlaspackConfigRequest = _interopRequireWildcard(require("./AtlaspackConfigRequest"));
 var _utils2 = require("../utils");
 var _projectPath = require("../projectPath");
@@ -66,9 +72,8 @@ function _profiler() {
   return data;
 }
 var _RequestTracker = require("../RequestTracker");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const PIPELINE_REGEX = /^([a-z0-9-]+?):(.*)$/i;
 function createPathRequest(input) {
   return {
@@ -78,12 +83,16 @@ function createPathRequest(input) {
     input
   };
 }
+
+// @ts-expect-error TS7031
 async function run({
   input,
   api,
   options
 }) {
-  let configResult = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
+  let configResult = (0, _nullthrows().default)(
+  // @ts-expect-error TS2347
+  await api.runRequest((0, _AtlaspackConfigRequest.default)()));
   let config = (0, _AtlaspackConfigRequest.getCachedAtlaspackConfig)(configResult, options);
   let {
     devDeps,
@@ -127,7 +136,7 @@ async function run({
     let err = new (_diagnostic().default)({
       diagnostic: result.diagnostics
     });
-    // $FlowFixMe[prop-missing]
+    // @ts-expect-error TS2339
     err.code = 'MODULE_NOT_FOUND';
     throw err;
   }
@@ -170,26 +179,34 @@ class ResolverRunner {
           plugin: plugin.name,
           searchPath: (0, _projectPath.toProjectPathUnsafe)('index')
         });
+
+        // @ts-expect-error TS2345
         await (0, _ConfigRequest.loadPluginConfig)(plugin, config, this.options);
         configCache.set(plugin.name, config);
+        // @ts-expect-error TS2345
         this.configs.set(plugin.name, config);
       }
       if (config) {
+        // @ts-expect-error TS2339
         for (let devDep of config.devDeps) {
           let devDepRequest = await (0, _DevDepRequest.createDevDependency)(devDep, this.previousDevDeps, this.options);
           this.runDevDepRequest(devDepRequest);
         }
+
+        // @ts-expect-error TS2345
         this.configs.set(plugin.name, config);
       }
     }
   }
   runDevDepRequest(devDepRequest) {
+    // @ts-expect-error TS2339
     if (devDepRequest.type !== 'ref') {
       let {
         specifier,
         resolveFrom
       } = devDepRequest;
       let key = `${specifier}:${(0, _projectPath.fromProjectPathRelative)(resolveFrom)}`;
+      // @ts-expect-error TS2345
       this.devDepRequests.set(key, devDepRequest);
     }
   }
@@ -259,6 +276,9 @@ class ResolverRunner {
           }
           if (result.priority != null) {
             dependency.priority = _types.Priority[result.priority];
+            if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+              dependency.resolverPriority = dependency.priority;
+            }
           }
           if (result.invalidateOnEnvChange) {
             invalidateOnEnvChange.push(...result.invalidateOnEnvChange);