@atlaspack/core 2.38.0 → 2.38.3-dev-ce9f111cb.0

package/lib/requests/TargetRequest.js

@@ -77,9 +77,8 @@ function _featureFlags() {
   };
   return data;
 }
-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 DEFAULT_DIST_DIRNAME = 'dist';
 const JS_RE = /\.[mc]?js$/;
 const JS_EXTENSIONS = ['.js', '.mjs', '.cjs'];

package/lib/requests/ValidationRequest.js

@@ -16,7 +16,7 @@ var _ReporterRunner = require("../ReporterRunner");
 var _Validation = _interopRequireDefault(require("../Validation"));
 var _AtlaspackConfigRequest = _interopRequireDefault(require("./AtlaspackConfigRequest"));
 var _RequestTracker = require("../RequestTracker");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function createValidationRequest(input) {
   return {
     id: 'validation',

package/lib/requests/WriteBundleRequest.js

@@ -86,9 +86,8 @@ function _sourceMap() {
   };
   return data;
 }
-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 }; }
 const HASH_REF_PREFIX_LEN = _constants.HASH_REF_PREFIX.length;
 const BOUNDARY_LENGTH = _constants.HASH_REF_PREFIX.length + 32 - 1;
 const HASH_REF_PLACEHOLDER_LEN = HASH_REF_PREFIX_LEN + _constants.HASH_REF_HASH_LEN;

package/lib/requests/WriteBundlesRequest.js

@@ -39,7 +39,7 @@ function _utils() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /** Length of the hash suffix in output filenames (e.g. .runtime.13dc01ac.js). */
 const NAME_HASH_DISPLAY_LEN = 8;
 

package/lib/requests/asset-graph-diff.js

@@ -15,7 +15,7 @@ function _jestDiff() {
   return data;
 }
 var _projectPath = require("../projectPath");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable no-console */
 // @ts-expect-error missing types
 

package/lib/requests/asset-graph-dot.js

@@ -13,7 +13,7 @@ function _path() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /** @description Renders AssetGraph into GraphViz Dot format */
 function assetGraphToDot(assetGraph, {
   sort = false,

package/lib/resolveOptions.js

@@ -57,7 +57,7 @@ var _loadDotEnv = _interopRequireDefault(require("./loadDotEnv"));
 var _projectPath = require("./projectPath");
 var _AtlaspackConfigRequest = require("./requests/AtlaspackConfigRequest");
 var _constants = require("./constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Default cache directory name
 const DEFAULT_CACHE_DIRNAME = '.parcel-cache';
 const LOCK_FILE_NAMES = ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'];

package/lib/serializerCore.browser.js

@@ -18,8 +18,7 @@ function msgpackr() {
   };
   return data;
 }
-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 _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); }
 let encoder = new (msgpackr().Encoder)({
   structuredClone: true
 });

package/lib/summarizeRequest.js

@@ -11,7 +11,7 @@ function _path() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const NODE_MODULES = `${_path().default.sep}node_modules${_path().default.sep}`;
 const BUFFER_LIMIT = 5000000; // 5mb
 

package/lib/types/atlaspack-v3/worker/compat/index.d.ts

@@ -4,6 +4,5 @@ export * from './environment';
 export * from './target';
 export * from './plugin-config';
 export * from './plugin-tracer';
-export * from './plugin-logger';
 export * from './plugin-options';
 export * from './mutable-asset';

package/lib/utils.js

@@ -36,7 +36,7 @@ function _utils() {
   return data;
 }
 var _projectPath = require("./projectPath");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // flow-to-ts helpers
 
 // /flow-to-ts helpers

package/lib/worker.js

@@ -76,7 +76,7 @@ function _featureFlags() {
 require("@atlaspack/cache");
 require("@atlaspack/package-manager");
 require("@atlaspack/fs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // @ts-expect-error TS2305
 
 // register with serializer
@@ -89,6 +89,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Remove the workerApi type from the TransformationOpts and ValidationOpts types:
 // https://github.com/facebook/flow/issues/2835
+
 // TODO: this should eventually be replaced by an in memory cache layer
 let atlaspackConfigCache = new Map();
 function loadOptions(ref, workerApi) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.38.0",
+  "version": "2.38.3-dev-ce9f111cb.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,27 +22,27 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
+    "@atlaspack/build-cache": "2.13.15-dev-ce9f111cb.0",
+    "@atlaspack/cache": "3.2.56-dev-ce9f111cb.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-ce9f111cb.0",
+    "@atlaspack/events": "2.14.5-dev-ce9f111cb.0",
+    "@atlaspack/feature-flags": "2.31.1-dev-ce9f111cb.0",
+    "@atlaspack/fs": "2.15.56-dev-ce9f111cb.0",
+    "@atlaspack/graph": "3.6.23-dev-ce9f111cb.0",
+    "@atlaspack/logger": "2.14.53-dev-ce9f111cb.0",
+    "@atlaspack/package-manager": "2.14.61-dev-ce9f111cb.0",
+    "@atlaspack/plugin": "2.14.61-dev-ce9f111cb.0",
+    "@atlaspack/profiler": "2.15.22-dev-ce9f111cb.0",
+    "@atlaspack/rust": "3.28.1-dev-ce9f111cb.0",
+    "@atlaspack/source-map": "3.3.5-dev-ce9f111cb.0",
+    "@atlaspack/types": "2.15.51-dev-ce9f111cb.0",
+    "@atlaspack/utils": "3.4.3-dev-ce9f111cb.0",
+    "@atlaspack/workers": "2.14.61-dev-ce9f111cb.0",
     "@mischnic/json-sourcemap": "^0.1.0",
-    "@atlaspack/build-cache": "2.13.14",
-    "@atlaspack/cache": "3.2.53",
-    "@atlaspack/diagnostic": "2.14.4",
-    "@atlaspack/events": "2.14.4",
-    "@atlaspack/feature-flags": "2.31.0",
-    "@atlaspack/fs": "2.15.53",
-    "@atlaspack/graph": "3.6.20",
-    "@atlaspack/logger": "2.14.50",
-    "@atlaspack/package-manager": "2.14.58",
-    "@atlaspack/plugin": "2.14.58",
-    "@atlaspack/profiler": "2.15.19",
-    "@atlaspack/rust": "3.26.0",
-    "@atlaspack/types": "2.15.48",
-    "@atlaspack/utils": "3.4.0",
-    "@atlaspack/workers": "2.14.58",
-    "@atlaspack/source-map": "3.3.2",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
     "clone": "^2.1.1",
-    "dotenv": "^7.0.0",
+    "dotenv": "^12.0.4",
     "dotenv-expand": "^5.1.0",
     "json5": "^2.2.0",
     "msgpackr": "^1.9.9",
@@ -50,15 +50,16 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.4",
+    "@atlaspack/babel-register": "2.14.5-dev-ce9f111cb.0",
     "@types/node": ">= 18",
-    "rfdc": "1",
-    "jest-diff": "*",
     "graphviz": "^0.0.9",
+    "jest-diff": "*",
+    "rfdc": "1",
     "tempy": "^0.2.1"
   },
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "type": "commonjs"
+  "type": "commonjs",
+  "gitHead": "ce9f111cb9f9e852c6a0fdaa8f72308d365fe823"
 }

package/src/atlaspack-v3/NapiWorkerPool.ts

@@ -5,6 +5,8 @@ import process from 'process';
 // @ts-expect-error TS2724
 import type {Transferable} from '@atlaspack/rust';
 import {getAvailableThreads} from '@atlaspack/rust';
+import logger from '@atlaspack/logger';
+import type {LogEvent} from '@atlaspack/types-internal';
 
 const WORKER_PATH = path.join(__dirname, 'worker', 'index.js');
 const ATLASPACK_NAPI_WORKERS =
@@ -43,6 +45,35 @@ export class NapiWorkerPool implements INapiWorkerPool {
           worker.once('message', res),
         ),
       );
+
+      // Re-emit log events from the worker thread into the main-thread logger
+      // so they reach reporters and are subject to log-level filtering.
+      worker.on('message', (message: unknown) => {
+        if (
+          message != null &&
+          typeof message === 'object' &&
+          (message as {type?: unknown}).type === 'logEvent'
+        ) {
+          const event = (message as {type: string; event: LogEvent}).event;
+          switch (event.level) {
+            case 'verbose':
+              logger.verbose(event.diagnostics);
+              break;
+            case 'info':
+              logger.info(event.diagnostics);
+              break;
+            case 'warn':
+              logger.warn(event.diagnostics);
+              break;
+            case 'error':
+              logger.error(event.diagnostics);
+              break;
+            case 'progress':
+              logger.progress(event.message);
+              break;
+          }
+        }
+      });
     }
   }
 
@@ -59,6 +90,13 @@ export class NapiWorkerPool implements INapiWorkerPool {
               if (message === 'stateCleared') {
                 worker.removeListener('message', messageHandler);
                 res();
+              } else if (
+                message != null &&
+                typeof message === 'object' &&
+                (message as {type?: unknown}).type === 'logEvent'
+              ) {
+                // logEvent messages are forwarded asynchronously from the worker
+                // logger bridge and are expected at any time; ignore them here.
               } else {
                 // Log unexpected messages for debugging
                 // eslint-disable-next-line no-console

package/src/atlaspack-v3/worker/compat/index.ts

@@ -4,6 +4,5 @@ export * from './environment';
 export * from './target';
 export * from './plugin-config';
 export * from './plugin-tracer';
-export * from './plugin-logger';
 export * from './plugin-options';
 export * from './mutable-asset';

package/src/atlaspack-v3/worker/worker.ts

@@ -19,14 +19,15 @@ import type {
 } from '@atlaspack/types';
 import type {FeatureFlags} from '@atlaspack/feature-flags';
 import {parentPort} from 'worker_threads';
+import logger from '@atlaspack/logger';
 import * as module from 'module';
 
 import {jsCallable} from '../jsCallable';
+import {PluginLogger} from '@atlaspack/logger';
 import {
   Environment,
   Dependency,
   PluginConfig,
-  PluginLogger,
   PluginTracer,
   PluginOptions,
   MutableAsset,
@@ -130,7 +131,7 @@ export class AtlaspackWorker {
       const dependency = new Dependency(napiDependency, env);
 
       const defaultOptions = {
-        logger: new PluginLogger(),
+        logger: new PluginLogger({origin: key}),
         tracer: new PluginTracer(),
         options: new PluginOptions(this.options),
       } as const;
@@ -236,7 +237,7 @@ export class AtlaspackWorker {
 
     const pluginOptions = new PluginOptions(this.options);
     const defaultOptions = {
-      logger: new PluginLogger(),
+      logger: new PluginLogger({origin: key}),
       tracer: new PluginTracer(),
       options: pluginOptions,
     } as const;
@@ -403,7 +404,7 @@ export class AtlaspackWorker {
 
     if (transformer.setup) {
       let setupResult = await transformer.setup({
-        logger: new PluginLogger(),
+        logger: new PluginLogger({origin: specifier}),
         options: new PluginOptions({
           ...this.options,
           shouldAutoInstall: false,
@@ -448,6 +449,12 @@ export class AtlaspackWorker {
   }
 }
 
+// Forward all logger events from this worker thread to the main thread so
+// they are re-emitted into the main-thread logger and reach reporters.
+logger.onLog((event) => {
+  parentPort?.postMessage({type: 'logEvent', event});
+});
+
 // Create napi worker and send it back to main thread
 const worker = new AtlaspackWorker();
 const napiWorker = napi.newNodejsWorker(worker);