From 76d57698eaed7b706a4d5c0c3a60771314e8bd21 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Nov 2024 18:44:13 -0300
Subject: [PATCH 001/264] DEV: Add tinytest `filter` option

before we relied on the `TINYTEST_FILTER`(and we still do) but now you can use
--filter or -f to filter the tests you want to run.
---
 tools/cli/commands.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index cc79168e02..cf4606fdfd 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -516,7 +516,7 @@ async function doRunCommand(options) {
           open(`http://localhost:${options.port}`)
         }
       }
-    }, 
+    },
     open: options.open,
   });
 }
@@ -2047,7 +2047,10 @@ testCommandOptions = {
 
     'extra-packages': { type: String },
 
-    'exclude-archs': { type: String }
+    'exclude-archs': { type: String },
+    
+    // Same as TINYTEST_FILTER
+    filter: { type: String, short: 'f' },
   }
 };
 
@@ -2068,6 +2071,9 @@ main.registerCommand(Object.assign(
 });
 
 async function doTestCommand(options) {
+  if (options.filter) {
+    process.env.TINYTEST_FILTER = options.filter;
+  }
   // This "metadata" is accessed in a few places. Using a global
   // variable here was more expedient than navigating the many layers
   // of abstraction across the build process.

From ae80c98d6c870e27cb878e9e5801bb3a3d009298 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Nov 2024 18:51:42 -0300
Subject: [PATCH 002/264] DOCS: update cli docs to include tinytest filter
 option

---
 v3-docs/docs/cli/index.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 8cdcb64636..2a19726209 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -932,6 +932,21 @@ argument will run tests for all local packages. The results are displayed in an
 app that runs at `localhost:3000` by default. If you need to, you can pass the
 `--settings` and `--port` arguments.
 
+If you want to filter the tests by name, you can use `--filter` or `-f`
+followed by the name of the test you want to run, it supports regex's.
+
+```sh
+meteor test-packages --filter myTestName
+```
+
+this command will run only the tests that have `myTestName` in their name.
+
+Alternatively, you can use the `TINYTEST_FILTER` environment variable to filter:
+
+```sh
+TINYTEST_FILTER=myTestName meteor test-packages
+```
+Has the same effect as the previous command.
 
 ## meteor admin {meteoradmin}
 

From e558c50de480e036760234eea09f66ac2dcb69e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Mar 2025 13:44:46 +0100
Subject: [PATCH 003/264] adapt babel compile behavior to use SWC by default
 and fallback to babel

---
 meteor                                        |  2 +-
 packages/autoupdate/autoupdate_server.js      |  2 +-
 packages/babel-compiler/babel-compiler.js     | 48 ++++++++++++++++++-
 packages/babel-compiler/package.js            |  3 +-
 packages/boilerplate-generator/generator.js   |  8 ++--
 .../ddp-client/common/livedata_connection.js  |  3 +-
 packages/ecmascript/runtime-tests.js          |  4 +-
 packages/ejson/ejson.js                       |  2 +-
 packages/mongo/collection/methods_index.js    |  8 ++--
 scripts/dev-bundle-tool-package.js            |  4 +-
 10 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/meteor b/meteor
index 745c3affbf..0c7f6125a9 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.4
+BUNDLE_VERSION=22.14.0.5
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/packages/autoupdate/autoupdate_server.js b/packages/autoupdate/autoupdate_server.js
index 7d20443c27..82af4c65e6 100644
--- a/packages/autoupdate/autoupdate_server.js
+++ b/packages/autoupdate/autoupdate_server.js
@@ -25,6 +25,7 @@
 // The ID of each document is the client architecture, and the fields of
 // the document are the versions described above.
 
+import { onMessage } from "meteor/inter-process-messaging";
 import { ClientVersions } from "./client_versions.js";
 
 export const Autoupdate = __meteor_runtime_config__.autoupdate = {
@@ -152,7 +153,6 @@ function enqueueVersionsRefresh() {
 
 const setupListeners = () => {
   // Listen for messages pertaining to the client-refresh topic.
-  import { onMessage } from "meteor/inter-process-messaging";
   onMessage("client-refresh", enqueueVersionsRefresh);
 
   // Another way to tell the process to refresh: send SIGHUP signal
diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 11cf63f923..3f2f2e22a7 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -1,5 +1,6 @@
 var semver = Npm.require("semver");
 var JSON5 = Npm.require("json5");
+var SWC = Npm.require("@swc/core");
 
 /**
  * A compiler that can be instantiated with features and used inside
@@ -145,7 +146,52 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     try {
       var result = profile('Babel.compile', function () {
-        return Babel.compile(source, babelOptions, cacheOptions);
+        let compilation;
+        try {
+          const packagesSkipSwc = [];
+          const fileSkipSwc = ['webapp_server.js']; // top level await
+
+          // Determine if SWC should be used based on package and file criteria.
+          const shouldUseSwc =
+            ['minimongo', 'random'].includes(packageName) ||
+            (!packagesSkipSwc.includes(packageName) &&
+              !fileSkipSwc.includes(inputFilePath));
+
+          if (shouldUseSwc) {
+            const isTypescriptSyntax =
+              inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+            const hasTSXSupport = inputFilePath.endsWith('.tsx');
+            const hasJSXSupport = inputFilePath.endsWith('.jsx');
+
+            const transformed = SWC.transformSync(source, {
+              jsc: {
+                target: 'es2015',
+                parser: {
+                  syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
+                  jsx: hasJSXSupport,
+                  tsx: hasTSXSupport,
+                },
+              },
+              module: { type: 'commonjs' },
+              minify: false,
+              sourceMaps: true,
+            });
+
+            compilation = {
+              code: transformed.code,
+              map: JSON.parse(transformed.map),
+              hash: toBeAdded.hash,
+              sourceType: 'module',
+            };
+          } else {
+            compilation = Babel.compile(source, babelOptions, cacheOptions);
+          }
+        } catch (e) {
+          // If SWC fails, fall back to Babel
+          compilation = Babel.compile(source, babelOptions, cacheOptions);
+        }
+
+        return compilation;
       });
     } catch (e) {
       if (e.loc) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 03822c789b..812b3e96af 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -7,7 +7,8 @@ Package.describe({
 Npm.depends({
   '@meteorjs/babel': '7.20.1',
   'json5': '2.2.3',
-  'semver': '7.6.3'
+  'semver': '7.6.3',
+  "@swc/core": "1.11.11",
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/generator.js b/packages/boilerplate-generator/generator.js
index 0c4d8d426d..6b36f0adf3 100644
--- a/packages/boilerplate-generator/generator.js
+++ b/packages/boilerplate-generator/generator.js
@@ -1,8 +1,8 @@
 import {readFileSync} from 'fs';
 import { create as createStream } from "combined-stream2";
 
-import WebBrowserTemplate from './template-web.browser';
-import WebCordovaTemplate from './template-web.cordova';
+import { headTemplate as modernHeadTemplate, closeTemplate as modernCloseTemplate } from './template-web.browser';
+import { headTemplate as cordovaHeadTemplate, closeTemplate as cordovaCloseTemplate } from './template-web.cordova';
 
 // Copied from webapp_server
 const readUtf8FileSync = filename => readFileSync(filename, 'utf8');
@@ -151,11 +151,11 @@ function getTemplate(arch) {
   const prefix = arch.split(".", 2).join(".");
 
   if (prefix === "web.browser") {
-    return WebBrowserTemplate;
+    return { headTemplate: modernHeadTemplate, closeTemplate: modernCloseTemplate };
   }
 
   if (prefix === "web.cordova") {
-    return WebCordovaTemplate;
+    return { headTemplate: cordovaHeadTemplate, closeTemplate: cordovaCloseTemplate };
   }
 
   throw new Error("Unsupported arch: " + arch);
diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index abe1161d21..a568c7ca70 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -4,6 +4,7 @@ import { Tracker } from 'meteor/tracker';
 import { EJSON } from 'meteor/ejson';
 import { Random } from 'meteor/random';
 import { MongoID } from 'meteor/mongo-id';
+import { ClientStream } from "meteor/socket-stream-client";
 import { DDP } from './namespace.js';
 import { MethodInvoker } from './method_invoker';
 import {
@@ -74,8 +75,6 @@ export class Connection {
     if (typeof url === 'object') {
       self._stream = url;
     } else {
-      import { ClientStream } from "meteor/socket-stream-client";
-
       self._stream = new ClientStream(url, {
         retry: options.retry,
         ConnectionError: DDP.ConnectionError,
diff --git a/packages/ecmascript/runtime-tests.js b/packages/ecmascript/runtime-tests.js
index a276d7e380..693116b7e0 100644
--- a/packages/ecmascript/runtime-tests.js
+++ b/packages/ecmascript/runtime-tests.js
@@ -1,3 +1,5 @@
+import { testExport as oyez } from './runtime-tests.js';
+
 const isNode8OrLater = Meteor.isServer && parseInt(process.versions.node) >= 8;
 
 Tinytest.add('ecmascript - runtime - template literals', test => {
@@ -169,14 +171,12 @@ Tinytest.add('ecmascript - runtime - classes - properties', test => {
     static staticProp = 1234;
 
     check = self => {
-      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
       test.isTrue(self === this);
       test.equal(this.property, 'property');
     };
 
     method() {
-      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
     }
   }
diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index e83d099279..76ef364651 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -9,6 +9,7 @@ import {
   isInfOrNaN,
   handleError,
 } from './utils';
+import canonicalStringify from './stringify';
 
 /**
  * @namespace
@@ -395,7 +396,6 @@ EJSON.stringify = handleError((item, options) => {
   let serialized;
   const json = EJSON.toJSONValue(item);
   if (options && (options.canonical || options.indent)) {
-    import canonicalStringify from './stringify';
     serialized = canonicalStringify(json, options);
   } else {
     serialized = JSON.stringify(json);
diff --git a/packages/mongo/collection/methods_index.js b/packages/mongo/collection/methods_index.js
index 05d1186054..0731e7a5e1 100644
--- a/packages/mongo/collection/methods_index.js
+++ b/packages/mongo/collection/methods_index.js
@@ -1,3 +1,5 @@
+import { Log } from 'meteor/logging';
+
 export const IndexMethods = {
   // We'll actually design an index API later. For now, we just pass through to
   // Mongo's, but make it synchronous.
@@ -21,8 +23,6 @@ export const IndexMethods = {
     if (self._collection.createIndexAsync) {
       await self._collection.createIndexAsync(index, options);
     } else {
-      import { Log } from 'meteor/logging';
-
       Log.debug(`ensureIndexAsync has been deprecated, please use the new 'createIndexAsync' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`)
       await self._collection.ensureIndexAsync(index, options);
     }
@@ -54,8 +54,6 @@ export const IndexMethods = {
         ) &&
         Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch
       ) {
-        import { Log } from 'meteor/logging';
-
         Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`);
         await self._collection.dropIndexAsync(index);
         await self._collection.createIndexAsync(index, options);
@@ -88,4 +86,4 @@ export const IndexMethods = {
       throw new Error('Can only call dropIndexAsync on server collections');
     await self._collection.dropIndexAsync(index);
   },
-}
\ No newline at end of file
+}
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 04aaa1029a..d57634cc0d 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -67,7 +67,9 @@ var packageJson = {
     "anser": "2.1.1",
     'xmlbuilder2': '1.8.1',
     "ws": "7.4.5",
-    "open":"8.4.2"
+    "open":"8.4.2",
+    "@swc/core": "1.11.11",
+    "swc-to-babel": "4.0.0",
   }
 };
 

From 0a7c05e6ef8e56ec6226b3fdc0352341e3a1363e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Mar 2025 14:41:54 +0100
Subject: [PATCH 004/264] clean

---
 packages/babel-compiler/babel-compiler.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 3f2f2e22a7..322eaaf96c 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -153,8 +153,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
           // Determine if SWC should be used based on package and file criteria.
           const shouldUseSwc =
-            ['minimongo', 'random'].includes(packageName) ||
-            (!packagesSkipSwc.includes(packageName) &&
+            !packagesSkipSwc.includes(packageName) &&
               !fileSkipSwc.includes(inputFilePath));
 
           if (shouldUseSwc) {

From f13d42cd9a33b3f69e1108a481d895bd9660c19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Mar 2025 15:02:23 +0100
Subject: [PATCH 005/264] clean

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 322eaaf96c..f8d6217d54 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -154,7 +154,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           // Determine if SWC should be used based on package and file criteria.
           const shouldUseSwc =
             !packagesSkipSwc.includes(packageName) &&
-              !fileSkipSwc.includes(inputFilePath));
+              !fileSkipSwc.includes(inputFilePath);
 
           if (shouldUseSwc) {
             const isTypescriptSyntax =

From bdc2df5712d8ee5b9ec2c8ab0e938d7bfc934b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 20 Mar 2025 14:48:29 +0100
Subject: [PATCH 006/264] resolve file.hash to properly resolve caching in some
 scenarios

---
 tools/isobuild/import-scanner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/import-scanner.ts b/tools/isobuild/import-scanner.ts
index fe6d9639bc..c4e3b04c57 100644
--- a/tools/isobuild/import-scanner.ts
+++ b/tools/isobuild/import-scanner.ts
@@ -977,7 +977,7 @@ export default class ImportScanner {
   private async findImportedModuleIdentifiers(
     file: File,
   ): Promise<Record<string, ImportInfo>> {
-    const fileHash = file.hash;
+    const fileHash = file.hash instanceof Promise ? await file.hash : file.hash;
     if (IMPORT_SCANNER_CACHE.has(fileHash)) {
       return IMPORT_SCANNER_CACHE.get(fileHash) as Record<string, ImportInfo>;
     }

From b8472bf257d0b4c29ef3f0e98ca8ef2f6865dd9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 20 Mar 2025 15:04:20 +0100
Subject: [PATCH 007/264] set properly cache on import scanner

---
 tools/isobuild/import-scanner.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/import-scanner.ts b/tools/isobuild/import-scanner.ts
index c4e3b04c57..acec76b398 100644
--- a/tools/isobuild/import-scanner.ts
+++ b/tools/isobuild/import-scanner.ts
@@ -988,8 +988,8 @@ export default class ImportScanner {
     );
 
     // there should always be file.hash, but better safe than sorry
-    if (file.hash) {
-      IMPORT_SCANNER_CACHE.set(file.hash, result);
+    if (fileHash) {
+      IMPORT_SCANNER_CACHE.set(fileHash, result);
     }
 
     return result;

From d34c094bd82dc5ab3ecb30533c022e5f616e6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 22 Mar 2025 08:23:27 +0100
Subject: [PATCH 008/264] support acorn as a faster approach to parse code for
 the analyzer

---
 scripts/dev-bundle-tool-package.js |  2 +-
 tools/isobuild/js-analyze.js       | 43 +++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index d57634cc0d..60cc8d69fa 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -69,7 +69,7 @@ var packageJson = {
     "ws": "7.4.5",
     "open":"8.4.2",
     "@swc/core": "1.11.11",
-    "swc-to-babel": "4.0.0",
+    "acorn": "8.14.1",
   }
 };
 
diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 35a929c083..9ed7b5fae3 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -4,6 +4,7 @@ import LRUCache from "lru-cache";
 import { Profile } from '../tool-env/profile';
 import Visitor from "@meteorjs/reify/lib/visitor.js";
 import { findPossibleIndexes } from "@meteorjs/reify/lib/utils.js";
+import acorn from 'acorn';
 
 const hasOwn = Object.prototype.hasOwnProperty;
 const objToStr = Object.prototype.toString
@@ -15,7 +16,7 @@ function isRegExp(value) {
 var AST_CACHE = new LRUCache({
   max: Math.pow(2, 12),
   length(ast) {
-    return ast.loc.end.line;
+    return ast.end;
   }
 });
 
@@ -28,20 +29,32 @@ function tryToParse(source, hash) {
   let ast;
   try {
     Profile.time('jsAnalyze.parse', () => {
-      ast = parse(source, {
-        strictMode: false,
-        sourceType: 'module',
-        allowImportExportEverywhere: true,
-        allowReturnOutsideFunction: true,
-        allowUndeclaredExports: true,
-        plugins: [
-          // Only plugins for stage 3 features are enabled
-          // Enabling some plugins significantly affects parser performance
-          'importAttributes',
-          'explicitResourceManagement',
-          'decorators'
-        ]
-      });
+      try {
+        ast = acorn.parse(source, {
+          ecmaVersion: 'latest',
+          sourceType: 'script',
+          allowAwaitOutsideFunction: true,
+          allowImportExportEverywhere: true,
+          allowReturnOutsideFunction: true,
+          allowHashBang: true,
+          checkPrivateFields: false
+        });
+      } catch (error) {
+        ast = parse(source, {
+          strictMode: false,
+          sourceType: 'module',
+          allowImportExportEverywhere: true,
+          allowReturnOutsideFunction: true,
+          allowUndeclaredExports: true,
+          plugins: [
+            // Only plugins for stage 3 features are enabled
+            // Enabling some plugins significantly affects parser performance
+            'importAttributes',
+            'explicitResourceManagement',
+            'decorators'
+          ]
+        });
+      }
     });
   } catch (e) {
     if (typeof e.loc === 'object') {

From f257390ccad49fe86078a29a2b9cbe2137ccc2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 22 Mar 2025 09:14:41 +0100
Subject: [PATCH 009/264] get locations to perserve proper cache

---
 tools/isobuild/js-analyze.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 9ed7b5fae3..6e37ded2b1 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -16,7 +16,7 @@ function isRegExp(value) {
 var AST_CACHE = new LRUCache({
   max: Math.pow(2, 12),
   length(ast) {
-    return ast.end;
+    return ast.loc.end.line;
   }
 });
 
@@ -37,7 +37,8 @@ function tryToParse(source, hash) {
           allowImportExportEverywhere: true,
           allowReturnOutsideFunction: true,
           allowHashBang: true,
-          checkPrivateFields: false
+          checkPrivateFields: false,
+          locations: true,
         });
       } catch (error) {
         ast = parse(source, {

From 94e6bd855efb7a46012be030f1bcec6ed1da77d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 22 Mar 2025 09:28:50 +0100
Subject: [PATCH 010/264] calculate and use lines when is possible to perserve
 cache length behavior and also keep less RAM usage

---
 tools/isobuild/js-analyze.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 6e37ded2b1..e4f1c7f3a2 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -16,7 +16,7 @@ function isRegExp(value) {
 var AST_CACHE = new LRUCache({
   max: Math.pow(2, 12),
   length(ast) {
-    return ast.loc.end.line;
+    return ast?.loc?.end?.line || ast?.lines || ast.end;
   }
 });
 
@@ -32,14 +32,14 @@ function tryToParse(source, hash) {
       try {
         ast = acorn.parse(source, {
           ecmaVersion: 'latest',
-          sourceType: 'script',
+          sourceType: 'module',
           allowAwaitOutsideFunction: true,
           allowImportExportEverywhere: true,
           allowReturnOutsideFunction: true,
           allowHashBang: true,
           checkPrivateFields: false,
-          locations: true,
         });
+        Object.assign(ast, { lines: (source?.split('\n')?.length || 0) - 1 });
       } catch (error) {
         ast = parse(source, {
           strictMode: false,

From 51a32122de6c99e12c035c92b97c62c7c1d8b5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 22 Mar 2025 09:29:42 +0100
Subject: [PATCH 011/264] perserve script sourceType

---
 tools/isobuild/js-analyze.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index e4f1c7f3a2..0944af885f 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -32,7 +32,7 @@ function tryToParse(source, hash) {
       try {
         ast = acorn.parse(source, {
           ecmaVersion: 'latest',
-          sourceType: 'module',
+          sourceType: 'script',
           allowAwaitOutsideFunction: true,
           allowImportExportEverywhere: true,
           allowReturnOutsideFunction: true,

From 20930d21b54bbf72e20e7ad6a64bb6be95e4610f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 22 Mar 2025 09:35:34 +0100
Subject: [PATCH 012/264] better way to count lines

---
 tools/isobuild/js-analyze.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 0944af885f..c66f5bb5dd 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -20,6 +20,14 @@ var AST_CACHE = new LRUCache({
   }
 });
 
+function countLines(str) {
+  let count = 0;
+  for (let i = 0; i < str.length; i++) {
+    if (str[i] === '\n') count++;
+  }
+  return count;
+}
+
 // Like babel.parse, but annotates any thrown error with $ParseError = true.
 function tryToParse(source, hash) {
   if (hash && AST_CACHE.has(hash)) {
@@ -39,7 +47,7 @@ function tryToParse(source, hash) {
           allowHashBang: true,
           checkPrivateFields: false,
         });
-        Object.assign(ast, { lines: (source?.split('\n')?.length || 0) - 1 });
+        Object.assign(ast, { lines: countLines(source) });
       } catch (error) {
         ast = parse(source, {
           strictMode: false,

From bd19fe02f8e5968c0e8ad8a279bb178ff8d5cf92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 25 Mar 2025 14:56:53 +0100
Subject: [PATCH 013/264] better approach to count lines

---
 tools/isobuild/js-analyze.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index c66f5bb5dd..8f011fff54 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -21,9 +21,11 @@ var AST_CACHE = new LRUCache({
 });
 
 function countLines(str) {
+  let lastIndex = str.indexOf('\n');
   let count = 0;
-  for (let i = 0; i < str.length; i++) {
-    if (str[i] === '\n') count++;
+  while (lastIndex > -1) {
+    count += 1;
+    lastIndex = str.indexOf('\n', lastIndex + 1);
   }
   return count;
 }

From 00780f91f457bbefd4c3f2ab307934fc109b5907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 25 Mar 2025 15:39:18 +0100
Subject: [PATCH 014/264] use an estimation for cache length for better
 performance

---
 tools/isobuild/js-analyze.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 8f011fff54..2de961be63 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -16,20 +16,12 @@ function isRegExp(value) {
 var AST_CACHE = new LRUCache({
   max: Math.pow(2, 12),
   length(ast) {
-    return ast?.loc?.end?.line || ast?.lines || ast.end;
+    // Estimate cached lines based on average length per character
+    const avgCharsPerLine = 40;
+    return Math.ceil(ast.end / avgCharsPerLine);
   }
 });
 
-function countLines(str) {
-  let lastIndex = str.indexOf('\n');
-  let count = 0;
-  while (lastIndex > -1) {
-    count += 1;
-    lastIndex = str.indexOf('\n', lastIndex + 1);
-  }
-  return count;
-}
-
 // Like babel.parse, but annotates any thrown error with $ParseError = true.
 function tryToParse(source, hash) {
   if (hash && AST_CACHE.has(hash)) {
@@ -49,7 +41,6 @@ function tryToParse(source, hash) {
           allowHashBang: true,
           checkPrivateFields: false,
         });
-        Object.assign(ast, { lines: countLines(source) });
       } catch (error) {
         ast = parse(source, {
           strictMode: false,

From fbd71e9e6aea22f435198d14ed90bba5aba75440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 25 Mar 2025 18:30:24 +0100
Subject: [PATCH 015/264] add caching as part of compilation

---
 packages/babel-compiler/babel-compiler.js | 69 ++++++++++++++++-------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f8d6217d54..f9ea38f32f 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -1,6 +1,8 @@
 var semver = Npm.require("semver");
 var JSON5 = Npm.require("json5");
 var SWC = Npm.require("@swc/core");
+var fs = Npm.require('fs');
+var path = Npm.require('path');
 
 /**
  * A compiler that can be instantiated with features and used inside
@@ -51,7 +53,9 @@ BCp.processFilesForTarget = function (inputFiles) {
 // Returns an object suitable for passing to inputFile.addJavaScript, or
 // null to indicate there was an error, and nothing should be added.
 BCp.processOneFileForTarget = function (inputFile, source) {
+  var self = this; // capture context
   this._babelrcCache = this._babelrcCache || Object.create(null);
+  this._transformCache = this._transformCache || Object.create(null);
 
   if (typeof source !== "string") {
     // Other compiler plugins can call processOneFileForTarget with a
@@ -122,23 +126,18 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    this.inferTypeScriptConfig(
-      features, inputFile, cacheOptions.cacheDeps);
+    this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
     var babelOptions = Babel.getDefaultOptions(features);
     babelOptions.caller = { name: "meteor", arch };
 
-    this.inferExtraBabelOptions(
-      inputFile,
-      babelOptions,
-      cacheOptions.cacheDeps
-    );
+    this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
     babelOptions.sourceMaps = true;
     babelOptions.filename =
       babelOptions.sourceFileName = packageName
-      ? "packages/" + packageName + "/" + inputFilePath
-      : inputFilePath;
+        ? "packages/" + packageName + "/" + inputFilePath
+        : inputFilePath;
 
     if (this.modifyBabelConfig) {
       this.modifyBabelConfig(babelOptions, inputFile);
@@ -146,19 +145,38 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     try {
       var result = profile('Babel.compile', function () {
-        let compilation;
+        // Determine if SWC should be used based on package and file criteria.
+        const packagesSkipSwc = [];
+        const fileSkipSwc = ['webapp_server.js']; // top level await
+        const shouldUseSwc = !packagesSkipSwc.includes(packageName) &&
+          !fileSkipSwc.includes(inputFilePath);
+
+        // Create a cache key based on the source hash and the compiler used.
+        const cacheKey = `${toBeAdded.hash}-${shouldUseSwc ? 'swc' : 'babel'}`;
+
+        // Check RAM cache
+        let compilation = self._transformCache[cacheKey];
+        // Check file system cache if enabled
+        if (!compilation && self.cacheDirectory) {
+          const cacheFilePath = path.join(self.cacheDirectory, 'compilation-cache', cacheKey + '.json');
+          if (fs.existsSync(cacheFilePath)) {
+            try {
+              compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
+              self._transformCache[cacheKey] = compilation;
+            } catch (e) {
+              // If reading/parsing the cache fails, ignore and continue.
+            }
+          }
+        }
+        // Return cached result if found.
+        if (compilation) {
+          return compilation;
+        }
+
+        // Perform compilation
         try {
-          const packagesSkipSwc = [];
-          const fileSkipSwc = ['webapp_server.js']; // top level await
-
-          // Determine if SWC should be used based on package and file criteria.
-          const shouldUseSwc =
-            !packagesSkipSwc.includes(packageName) &&
-              !fileSkipSwc.includes(inputFilePath);
-
           if (shouldUseSwc) {
-            const isTypescriptSyntax =
-              inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+            const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
             const hasTSXSupport = inputFilePath.endsWith('.tsx');
             const hasJSXSupport = inputFilePath.endsWith('.jsx');
 
@@ -190,6 +208,17 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           compilation = Babel.compile(source, babelOptions, cacheOptions);
         }
 
+        // Save result in caches
+        self._transformCache[cacheKey] = compilation;
+        if (self.cacheDirectory) {
+          const cacheFilePath = path.join(self.cacheDirectory, 'compilation-cache', cacheKey + '.json');
+          try {
+            fs.mkdirSync(path.dirname(cacheFilePath), { recursive: true });
+            fs.writeFileSync(cacheFilePath, JSON.stringify(compilation), 'utf8');
+          } catch (e) {
+            // If file caching fails, ignore the error.
+          }
+        }
         return compilation;
       });
     } catch (e) {

From 49a639955bd27ad719148a4e1f1a039ac8ef6c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Mar 2025 15:08:58 +0100
Subject: [PATCH 016/264] apply cache only for swc as meteor-babel already
 describes a cache for babel

---
 packages/babel-compiler/babel-compiler.js | 73 ++++++++++++-----------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f9ea38f32f..9d928d6bd8 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -55,7 +55,7 @@ BCp.processFilesForTarget = function (inputFiles) {
 BCp.processOneFileForTarget = function (inputFile, source) {
   var self = this; // capture context
   this._babelrcCache = this._babelrcCache || Object.create(null);
-  this._transformCache = this._transformCache || Object.create(null);
+  this._swcCache = this._swcCache || Object.create(null);
 
   if (typeof source !== "string") {
     // Other compiler plugins can call processOneFileForTarget with a
@@ -151,35 +151,38 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const shouldUseSwc = !packagesSkipSwc.includes(packageName) &&
           !fileSkipSwc.includes(inputFilePath);
 
-        // Create a cache key based on the source hash and the compiler used.
-        const cacheKey = `${toBeAdded.hash}-${shouldUseSwc ? 'swc' : 'babel'}`;
-
         // Check RAM cache
-        let compilation = self._transformCache[cacheKey];
-        // Check file system cache if enabled
-        if (!compilation && self.cacheDirectory) {
-          const cacheFilePath = path.join(self.cacheDirectory, 'compilation-cache', cacheKey + '.json');
-          if (fs.existsSync(cacheFilePath)) {
-            try {
-              compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-              self._transformCache[cacheKey] = compilation;
-            } catch (e) {
-              // If reading/parsing the cache fails, ignore and continue.
-            }
-          }
-        }
-        // Return cached result if found.
-        if (compilation) {
-          return compilation;
-        }
-
-        // Perform compilation
+        let compilation;
         try {
           if (shouldUseSwc) {
+            // Create a cache key based on the source hash and the compiler used.
+            const cacheKey = toBeAdded.hash;
+            const cacheContext = 'swc-cache';
+
+            // Check RAM cache
+            compilation = self._swcCache[cacheKey];
+            // Check file system cache if enabled
+            if (!compilation && self.cacheDirectory) {
+              const cacheFilePath = path.join(self.cacheDirectory, cacheContext, cacheKey + '.json');
+              if (fs.existsSync(cacheFilePath)) {
+                try {
+                  compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
+                  self._swcCache[cacheKey] = compilation;
+                } catch (e) {
+                  // If reading/parsing the cache fails, ignore and continue.
+                }
+              }
+            }
+            // Return cached result if found.
+            if (compilation) {
+              return compilation;
+            }
+
             const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
             const hasTSXSupport = inputFilePath.endsWith('.tsx');
             const hasJSXSupport = inputFilePath.endsWith('.jsx');
 
+            // Perform compilation
             const transformed = SWC.transformSync(source, {
               jsc: {
                 target: 'es2015',
@@ -200,6 +203,18 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               hash: toBeAdded.hash,
               sourceType: 'module',
             };
+
+            // Save result in cache
+            self._swcCache[cacheKey] = compilation;
+            if (self.cacheDirectory) {
+              const cacheFilePath = path.join(self.cacheDirectory, cacheContext, cacheKey + '.json');
+              try {
+                fs.mkdirSync(path.dirname(cacheFilePath), { recursive: true });
+                fs.writeFileSync(cacheFilePath, JSON.stringify(compilation), 'utf8');
+              } catch (e) {
+                // If file caching fails, ignore the error.
+              }
+            }
           } else {
             compilation = Babel.compile(source, babelOptions, cacheOptions);
           }
@@ -207,18 +222,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           // If SWC fails, fall back to Babel
           compilation = Babel.compile(source, babelOptions, cacheOptions);
         }
-
-        // Save result in caches
-        self._transformCache[cacheKey] = compilation;
-        if (self.cacheDirectory) {
-          const cacheFilePath = path.join(self.cacheDirectory, 'compilation-cache', cacheKey + '.json');
-          try {
-            fs.mkdirSync(path.dirname(cacheFilePath), { recursive: true });
-            fs.writeFileSync(cacheFilePath, JSON.stringify(compilation), 'utf8');
-          } catch (e) {
-            // If file caching fails, ignore the error.
-          }
-        }
         return compilation;
       });
     } catch (e) {

From c4e8fd4c4e628d82fae0b8e26b8db089dcde32bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Mar 2025 15:19:50 +0100
Subject: [PATCH 017/264] better cache context

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 9d928d6bd8..09d680c19e 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -157,7 +157,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           if (shouldUseSwc) {
             // Create a cache key based on the source hash and the compiler used.
             const cacheKey = toBeAdded.hash;
-            const cacheContext = 'swc-cache';
+            const cacheContext = '.swc-cache';
 
             // Check RAM cache
             compilation = self._swcCache[cacheKey];

From c77611f57c63ea1bde03c618677234def26b48c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Mar 2025 15:51:14 +0100
Subject: [PATCH 018/264] async write the cache

---
 packages/babel-compiler/babel-compiler.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 09d680c19e..8181009167 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -209,8 +209,12 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             if (self.cacheDirectory) {
               const cacheFilePath = path.join(self.cacheDirectory, cacheContext, cacheKey + '.json');
               try {
-                fs.mkdirSync(path.dirname(cacheFilePath), { recursive: true });
-                fs.writeFileSync(cacheFilePath, JSON.stringify(compilation), 'utf8');
+                const writeFileCache = async () => {
+                  await fs.promises.mkdir(path.dirname(cacheFilePath), { recursive: true });
+                  await fs.promises.writeFile(cacheFilePath, JSON.stringify(compilation), 'utf8');
+                };
+                // Asynchronously write the cache without blocking
+                writeFileCache();
               } catch (e) {
                 // If file caching fails, ignore the error.
               }

From 09691e422ca149e91f83dd9173549302ef1190c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Mar 2025 18:02:33 +0100
Subject: [PATCH 019/264] prefer more modern syntax on swc compilation

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f8d6217d54..42aed0dd0f 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -164,7 +164,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
             const transformed = SWC.transformSync(source, {
               jsc: {
-                target: 'es2015',
+                target: 'es2022',
                 parser: {
                   syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
                   jsx: hasJSXSupport,

From 5b99337802850a9db319824fc4bb9ca9ed286904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Mar 2025 15:37:37 +0100
Subject: [PATCH 020/264] Revert "prefer more modern syntax on swc compilation"

This reverts commit 09691e422ca149e91f83dd9173549302ef1190c6.
---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 42aed0dd0f..f8d6217d54 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -164,7 +164,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
             const transformed = SWC.transformSync(source, {
               jsc: {
-                target: 'es2022',
+                target: 'es2015',
                 parser: {
                   syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
                   jsx: hasJSXSupport,

From e1e44c15cb8a08078e951def3ae9c44de1fa540b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Mar 2025 16:45:11 +0100
Subject: [PATCH 021/264] perserve Meteor's specifics: reify modules, nested
 imports and top-level await support

---
 packages/babel-compiler/babel-compiler.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f8d6217d54..1de5a197d8 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -1,6 +1,8 @@
 var semver = Npm.require("semver");
 var JSON5 = Npm.require("json5");
 var SWC = Npm.require("@swc/core");
+const reifyCompile = Npm.require("@meteorjs/reify/lib/compiler").compile;
+const reifyAcornTopLevelParse = Npm.require("@meteorjs/reify/lib/parsers/top-level").parse;
 
 /**
  * A compiler that can be instantiated with features and used inside
@@ -149,7 +151,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         let compilation;
         try {
           const packagesSkipSwc = [];
-          const fileSkipSwc = ['webapp_server.js']; // top level await
+          const fileSkipSwc = []; // top level await
 
           // Determine if SWC should be used based on package and file criteria.
           const shouldUseSwc =
@@ -171,13 +173,25 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   tsx: hasTSXSupport,
                 },
               },
-              module: { type: 'commonjs' },
+              module: { type: 'es6' },
               minify: false,
               sourceMaps: true,
             });
 
+            let content = transformed.code;
+            // Perserve Meteor's specifics: reify modules, nested imports and top-level await support.
+            const result = reifyCompile(content, {
+              parse: reifyAcornTopLevelParse,
+              generateLetDeclarations: false,
+              ast: false,
+            });
+            if (!result.identical) {
+              identical = false;
+              content = result.code;
+            }
+
             compilation = {
-              code: transformed.code,
+              code: content,
               map: JSON.parse(transformed.map),
               hash: toBeAdded.hash,
               sourceType: 'module',

From 2ddc37e2123cb7dae5e362579d8adfc1a5ee01ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Mar 2025 17:13:08 +0100
Subject: [PATCH 022/264] revert removal of nested imports as they are still
 compatible

---
 packages/autoupdate/autoupdate_server.js          | 2 +-
 packages/ddp-client/common/livedata_connection.js | 3 ++-
 packages/ecmascript/runtime-tests.js              | 4 ++--
 packages/ejson/ejson.js                           | 2 +-
 packages/mongo/collection/methods_index.js        | 6 ++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/autoupdate/autoupdate_server.js b/packages/autoupdate/autoupdate_server.js
index 82af4c65e6..7d20443c27 100644
--- a/packages/autoupdate/autoupdate_server.js
+++ b/packages/autoupdate/autoupdate_server.js
@@ -25,7 +25,6 @@
 // The ID of each document is the client architecture, and the fields of
 // the document are the versions described above.
 
-import { onMessage } from "meteor/inter-process-messaging";
 import { ClientVersions } from "./client_versions.js";
 
 export const Autoupdate = __meteor_runtime_config__.autoupdate = {
@@ -153,6 +152,7 @@ function enqueueVersionsRefresh() {
 
 const setupListeners = () => {
   // Listen for messages pertaining to the client-refresh topic.
+  import { onMessage } from "meteor/inter-process-messaging";
   onMessage("client-refresh", enqueueVersionsRefresh);
 
   // Another way to tell the process to refresh: send SIGHUP signal
diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index a568c7ca70..abe1161d21 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -4,7 +4,6 @@ import { Tracker } from 'meteor/tracker';
 import { EJSON } from 'meteor/ejson';
 import { Random } from 'meteor/random';
 import { MongoID } from 'meteor/mongo-id';
-import { ClientStream } from "meteor/socket-stream-client";
 import { DDP } from './namespace.js';
 import { MethodInvoker } from './method_invoker';
 import {
@@ -75,6 +74,8 @@ export class Connection {
     if (typeof url === 'object') {
       self._stream = url;
     } else {
+      import { ClientStream } from "meteor/socket-stream-client";
+
       self._stream = new ClientStream(url, {
         retry: options.retry,
         ConnectionError: DDP.ConnectionError,
diff --git a/packages/ecmascript/runtime-tests.js b/packages/ecmascript/runtime-tests.js
index 693116b7e0..a276d7e380 100644
--- a/packages/ecmascript/runtime-tests.js
+++ b/packages/ecmascript/runtime-tests.js
@@ -1,5 +1,3 @@
-import { testExport as oyez } from './runtime-tests.js';
-
 const isNode8OrLater = Meteor.isServer && parseInt(process.versions.node) >= 8;
 
 Tinytest.add('ecmascript - runtime - template literals', test => {
@@ -171,12 +169,14 @@ Tinytest.add('ecmascript - runtime - classes - properties', test => {
     static staticProp = 1234;
 
     check = self => {
+      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
       test.isTrue(self === this);
       test.equal(this.property, 'property');
     };
 
     method() {
+      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
     }
   }
diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index 76ef364651..e83d099279 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -9,7 +9,6 @@ import {
   isInfOrNaN,
   handleError,
 } from './utils';
-import canonicalStringify from './stringify';
 
 /**
  * @namespace
@@ -396,6 +395,7 @@ EJSON.stringify = handleError((item, options) => {
   let serialized;
   const json = EJSON.toJSONValue(item);
   if (options && (options.canonical || options.indent)) {
+    import canonicalStringify from './stringify';
     serialized = canonicalStringify(json, options);
   } else {
     serialized = JSON.stringify(json);
diff --git a/packages/mongo/collection/methods_index.js b/packages/mongo/collection/methods_index.js
index 0731e7a5e1..c516d7522b 100644
--- a/packages/mongo/collection/methods_index.js
+++ b/packages/mongo/collection/methods_index.js
@@ -1,5 +1,3 @@
-import { Log } from 'meteor/logging';
-
 export const IndexMethods = {
   // We'll actually design an index API later. For now, we just pass through to
   // Mongo's, but make it synchronous.
@@ -23,6 +21,8 @@ export const IndexMethods = {
     if (self._collection.createIndexAsync) {
       await self._collection.createIndexAsync(index, options);
     } else {
+      import { Log } from 'meteor/logging';
+
       Log.debug(`ensureIndexAsync has been deprecated, please use the new 'createIndexAsync' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`)
       await self._collection.ensureIndexAsync(index, options);
     }
@@ -54,6 +54,8 @@ export const IndexMethods = {
         ) &&
         Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch
       ) {
+        import { Log } from 'meteor/logging';
+
         Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`);
         await self._collection.dropIndexAsync(index);
         await self._collection.createIndexAsync(index, options);

From 8e8801e2ef08b7a876d4a93e14bf873a178cddc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 08:55:43 +0100
Subject: [PATCH 023/264] remove unrequired nested imports

---
 packages/ecmascript/runtime-tests.js       | 4 ++--
 packages/ejson/ejson.js                    | 2 +-
 packages/mongo/collection/methods_index.js | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/ecmascript/runtime-tests.js b/packages/ecmascript/runtime-tests.js
index a276d7e380..693116b7e0 100644
--- a/packages/ecmascript/runtime-tests.js
+++ b/packages/ecmascript/runtime-tests.js
@@ -1,3 +1,5 @@
+import { testExport as oyez } from './runtime-tests.js';
+
 const isNode8OrLater = Meteor.isServer && parseInt(process.versions.node) >= 8;
 
 Tinytest.add('ecmascript - runtime - template literals', test => {
@@ -169,14 +171,12 @@ Tinytest.add('ecmascript - runtime - classes - properties', test => {
     static staticProp = 1234;
 
     check = self => {
-      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
       test.isTrue(self === this);
       test.equal(this.property, 'property');
     };
 
     method() {
-      import { testExport as oyez } from './runtime-tests.js';
       test.equal(oyez, 'oyez');
     }
   }
diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index e83d099279..76ef364651 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -9,6 +9,7 @@ import {
   isInfOrNaN,
   handleError,
 } from './utils';
+import canonicalStringify from './stringify';
 
 /**
  * @namespace
@@ -395,7 +396,6 @@ EJSON.stringify = handleError((item, options) => {
   let serialized;
   const json = EJSON.toJSONValue(item);
   if (options && (options.canonical || options.indent)) {
-    import canonicalStringify from './stringify';
     serialized = canonicalStringify(json, options);
   } else {
     serialized = JSON.stringify(json);
diff --git a/packages/mongo/collection/methods_index.js b/packages/mongo/collection/methods_index.js
index c516d7522b..0731e7a5e1 100644
--- a/packages/mongo/collection/methods_index.js
+++ b/packages/mongo/collection/methods_index.js
@@ -1,3 +1,5 @@
+import { Log } from 'meteor/logging';
+
 export const IndexMethods = {
   // We'll actually design an index API later. For now, we just pass through to
   // Mongo's, but make it synchronous.
@@ -21,8 +23,6 @@ export const IndexMethods = {
     if (self._collection.createIndexAsync) {
       await self._collection.createIndexAsync(index, options);
     } else {
-      import { Log } from 'meteor/logging';
-
       Log.debug(`ensureIndexAsync has been deprecated, please use the new 'createIndexAsync' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`)
       await self._collection.ensureIndexAsync(index, options);
     }
@@ -54,8 +54,6 @@ export const IndexMethods = {
         ) &&
         Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch
       ) {
-        import { Log } from 'meteor/logging';
-
         Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`);
         await self._collection.dropIndexAsync(index);
         await self._collection.createIndexAsync(index, options);

From 74bdbd8d00f58995c0f606bdca1f3aa796f0074a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 09:12:02 +0100
Subject: [PATCH 024/264] remove unrequired nested imports

---
 packages/autoupdate/autoupdate_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/autoupdate/autoupdate_server.js b/packages/autoupdate/autoupdate_server.js
index 7d20443c27..82af4c65e6 100644
--- a/packages/autoupdate/autoupdate_server.js
+++ b/packages/autoupdate/autoupdate_server.js
@@ -25,6 +25,7 @@
 // The ID of each document is the client architecture, and the fields of
 // the document are the versions described above.
 
+import { onMessage } from "meteor/inter-process-messaging";
 import { ClientVersions } from "./client_versions.js";
 
 export const Autoupdate = __meteor_runtime_config__.autoupdate = {
@@ -152,7 +153,6 @@ function enqueueVersionsRefresh() {
 
 const setupListeners = () => {
   // Listen for messages pertaining to the client-refresh topic.
-  import { onMessage } from "meteor/inter-process-messaging";
   onMessage("client-refresh", enqueueVersionsRefresh);
 
   // Another way to tell the process to refresh: send SIGHUP signal

From a3b12b2eb611f1de3cedef929fe1d4238158486e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 09:26:53 +0100
Subject: [PATCH 025/264] prefer require than nested import

---
 packages/ddp-client/common/livedata_connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index abe1161d21..9755a8012a 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -74,7 +74,7 @@ export class Connection {
     if (typeof url === 'object') {
       self._stream = url;
     } else {
-      import { ClientStream } from "meteor/socket-stream-client";
+      const { ClientStream } = require("meteor/socket-stream-client");
 
       self._stream = new ClientStream(url, {
         retry: options.retry,

From cf6dc9ca5a34d4f961225294c10391e2e4405dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 09:32:40 +0100
Subject: [PATCH 026/264] ensure incompatible files will directly parse with
 babel once detected

---
 packages/babel-compiler/babel-compiler.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 8cf2c4245e..77271959d4 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -58,6 +58,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
   var self = this; // capture context
   this._babelrcCache = this._babelrcCache || Object.create(null);
   this._swcCache = this._swcCache || Object.create(null);
+  this._swcIncompatible = this._swcIncompatible || Object.create(null);
 
   if (typeof source !== "string") {
     // Other compiler plugins can call processOneFileForTarget with a
@@ -150,8 +151,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         // Determine if SWC should be used based on package and file criteria.
         const packagesSkipSwc = [];
         const fileSkipSwc = []; // top level await
-        const shouldUseSwc = !packagesSkipSwc.includes(packageName) &&
-          !fileSkipSwc.includes(inputFilePath);
+        const shouldUseSwc =
+          !packagesSkipSwc.includes(packageName) &&
+          !fileSkipSwc.includes(inputFilePath) &&
+          !self._swcIncompatible[toBeAdded.hash];
 
         // Check RAM cache
         let compilation;
@@ -237,6 +240,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             compilation = Babel.compile(source, babelOptions, cacheOptions);
           }
         } catch (e) {
+          self._swcIncompatible[toBeAdded.hash] = true;
           // If SWC fails, fall back to Babel
           compilation = Babel.compile(source, babelOptions, cacheOptions);
         }

From 42b61a4ecc6f50e8d7160314a231967b2fa7394f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 10:35:23 +0100
Subject: [PATCH 027/264] use latest acorn parser and proper reify options

---
 packages/babel-compiler/babel-compiler.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 77271959d4..d5f0263801 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -2,7 +2,7 @@ var semver = Npm.require("semver");
 var JSON5 = Npm.require("json5");
 var SWC = Npm.require("@swc/core");
 const reifyCompile = Npm.require("@meteorjs/reify/lib/compiler").compile;
-const reifyAcornTopLevelParse = Npm.require("@meteorjs/reify/lib/parsers/top-level").parse;
+const reifyAcornParse = Npm.require("@meteorjs/reify/lib/parsers/acorn").parse;
 var fs = Npm.require('fs');
 var path = Npm.require('path');
 
@@ -205,9 +205,21 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             let content = transformed.code;
             // Perserve Meteor's specifics: reify modules, nested imports and top-level await support.
             const result = reifyCompile(content, {
-              parse: reifyAcornTopLevelParse,
+              parse: reifyAcornParse,
               generateLetDeclarations: false,
               ast: false,
+              // Enforce reify options for proper compatibility (TODO export getReifyOptions)
+              // https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-babel/options.js#L19
+              avoidModernSyntax: true,
+              enforceStrictMode: false,
+              dynamicImport: true,
+              ...features.topLevelAwait && { topLevelAwait: true },
+              ...features.compileForShell && { moduleAlias: 'module' },
+              ...(features.modernBrowsers ||
+                features.nodeMajorVersion >= 8) && {
+                avoidModernSyntax: false,
+                generateLetDeclarations: true,
+              },
             });
             if (!result.identical) {
               identical = false;

From 1d11de08d7afc39cd305f8234809f7d52788ccfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 12:24:21 +0100
Subject: [PATCH 028/264] use reify acorn parser on static-assets server
 runtime

---
 tools/static-assets/server/runtime.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/server/runtime.js b/tools/static-assets/server/runtime.js
index 2b0f800940..9a1c6b15ef 100644
--- a/tools/static-assets/server/runtime.js
+++ b/tools/static-assets/server/runtime.js
@@ -47,7 +47,7 @@ module.exports = function enable ({ cachePath, createLoader = true } = {}) {
   };
 
   const reifyVersion = require("@meteorjs/reify/package.json").version;
-  const reifyBabelParse = require("@meteorjs/reify/lib/parsers/babel").parse;
+  const reifyAcornParse = require("@meteorjs/reify/lib/parsers/acorn").parse;
   const reifyCompile = require("@meteorjs/reify/lib/compiler").compile;
 
   function compileContent (content) {
@@ -55,7 +55,7 @@ module.exports = function enable ({ cachePath, createLoader = true } = {}) {
 
     try {
       const result = reifyCompile(content, {
-        parse: reifyBabelParse,
+        parse: reifyAcornParse,
         generateLetDeclarations: false,
         ast: false,
       });

From 94dd07b2d0826e9bf6ab6c3c083b4774641614ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 28 Mar 2025 12:27:39 +0100
Subject: [PATCH 029/264] use reify acorn parser on import scanner

---
 tools/isobuild/import-scanner.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/import-scanner.ts b/tools/isobuild/import-scanner.ts
index acec76b398..e05900b2f2 100644
--- a/tools/isobuild/import-scanner.ts
+++ b/tools/isobuild/import-scanner.ts
@@ -45,7 +45,7 @@ import {
 
 import { wrap } from "optimism";
 const { compile: reifyCompile } = require("@meteorjs/reify/lib/compiler");
-const { parse: reifyBabelParse } = require("@meteorjs/reify/lib/parsers/babel");
+const { parse: reifyAcornParse } = require("@meteorjs/reify/lib/parsers/acorn");
 
 import Resolver, { Resolution } from "./resolver";
 import LRUCache from 'lru-cache';
@@ -88,7 +88,7 @@ const reifyCompileWithCache = Profile("reifyCompileWithCache", wrap(function (
 
   const isLegacy = isLegacyArch(bundleArch);
   let result = reifyCompile(stripHashBang(source), {
-    parse: reifyBabelParse,
+    parse: reifyAcornParse,
     generateLetDeclarations: !isLegacy,
     avoidModernSyntax: isLegacy,
     enforceStrictMode: false,

From e294d52f8faa11a9cf30665ae02e8aa84827ee68 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 28 Mar 2025 19:26:39 +0200
Subject: [PATCH 030/264] Add replace email utility

---
 docs/_config.yml                              |  1 +
 docs/generators/changelog/versions/3.0.0.md   |  1 +
 docs/source/api/passwords.md                  |  2 +
 packages/accounts-base/accounts-base.d.ts     |  2 +
 packages/accounts-password/password_server.js | 46 +++++++++++++++++++
 packages/accounts-password/password_tests.js  | 26 +++++++++++
 v3-docs/docs/api/accounts.md                  |  2 +
 .../generators/changelog/versions/3.0.0.md    |  1 +
 8 files changed, 81 insertions(+)

diff --git a/docs/_config.yml b/docs/_config.yml
index 6834fe8ced..395aaca44c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -213,6 +213,7 @@ redirects:
   /#/full/accounts-setusername: 'api/passwords.html#accounts-setusername'
   /#/full/accounts-addemail: 'api/passwords.html#accounts-addemail'
   /#/full/accounts-removeemail: 'api/passwords.html#accounts-removeemail'
+  /#/full/accounts_replaceemail: 'api/passwords.html#Accounts-replaceEmail'
   /#/full/accounts_verifyemail: 'api/passwords.html#Accounts-verifyEmail'
   /#/full/accounts-finduserbyusername: 'api/passwords.html#accounts-finduserbyusername'
   /#/full/accounts-finduserbyemail: 'api/passwords.html#accounts-finduserbyemail'
diff --git a/docs/generators/changelog/versions/3.0.0.md b/docs/generators/changelog/versions/3.0.0.md
index c5fa1f1a1e..4c863db6ad 100644
--- a/docs/generators/changelog/versions/3.0.0.md
+++ b/docs/generators/changelog/versions/3.0.0.md
@@ -55,6 +55,7 @@
   - `Accounts.sendVerificationEmail`
   - `Accounts.addEmail`
   - `Accounts.removeEmail`
+  - `Accounts.replaceEmailAsync`
   - `Accounts.verifyEmail`
   - `Accounts.createUserVerifyingEmail`
   - `Accounts.createUser`
diff --git a/docs/source/api/passwords.md b/docs/source/api/passwords.md
index bb0ddf6b17..908617aa3e 100644
--- a/docs/source/api/passwords.md
+++ b/docs/source/api/passwords.md
@@ -59,6 +59,8 @@ By default, an email address is added with `{ verified: false }`. Use
 [`Accounts.sendVerificationEmail`](#Accounts-sendVerificationEmail) to send an
 email with a link the user can use to verify their email address.
 
+{% apibox "Accounts.replaceEmailAsync" %}
+
 {% apibox "Accounts.removeEmail" %}
 
 {% apibox "Accounts.verifyEmail" %}
diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 7fbbfde0a6..b11344ce08 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -188,6 +188,8 @@ export namespace Accounts {
 
   function removeEmail(userId: string, email: string): Promise<void>;
 
+  function replaceEmailAsync(userId: string, oldEmail: string, newEmail: string, verified?: boolean): Promise<void>;
+
   function onCreateUser(
     func: (options: { profile?: {} | undefined }, user: Meteor.User) => void
   ): void;
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 455c071cc3..6477bdcc3d 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1022,6 +1022,52 @@ Meteor.methods(
     }
   });
 
+
+/**
+ * @summary Asynchronously replace an email address for a user. Use this instead of directly
+ * updating the database. The operation will fail if there is a different user
+ * with an email only differing in case. If the specified user has an existing
+ * email only differing in case however, we replace it.
+ * @locus Server
+ * @param {String} userId The ID of the user to update.
+ * @param {String} oldEmail The email address to replace.
+ * @param {String} newEmail The new email address to use.
+ * @param {Boolean} [verified] Optional - whether the new email address should
+ * be marked as verified. Defaults to false.
+ * @importFromPackage accounts-base
+ */
+Accounts.replaceEmailAsync = async (userId, oldEmail, newEmail, verified) => {
+  check(userId, NonEmptyString);
+  check(oldEmail, NonEmptyString);
+  check(newEmail, NonEmptyString);
+  check(verified, Match.Optional(Boolean));
+
+  if (verified === void 0) {
+    verified = false;
+  }
+
+  const user = await getUserById(userId, { fields: { _id: 1 } });
+  if (!user)
+    throw new Meteor.Error(403, "User not found");
+
+  // Ensure no user already has this new email
+  await Accounts._checkForCaseInsensitiveDuplicates(
+    "emails.address",
+    "Email",
+    newEmail,
+    user._id
+  );
+
+  const result = await Meteor.users.updateAsync(
+    { _id: user._id, 'emails.address': oldEmail },
+    { $set: { 'emails.$.address': newEmail, 'emails.$.verified': verified } }
+  );
+  
+  if (result.modifiedCount === 0) {
+    throw new Meteor.Error(404, "No user could be found with old email");
+  }
+};
+
 /**
  * @summary Asynchronously add an email address for a user. Use this instead of directly
  * updating the database. The operation will fail if there is a different user
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index e488c9a89e..08c9b0c4ca 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1789,6 +1789,32 @@ if (Meteor.isServer) (() => {
       ]);
     });
 
+    Tinytest.addAsync("passwords, replace email", async test => {
+      const origEmail = `${ Random.id() }@turing.com`;
+      const userId = await Accounts.createUser({
+        email: origEmail
+      });
+
+      const newEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, newEmail);
+
+      const thirdEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, thirdEmail, true);
+      const u1 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u1.emails, [
+        { address: origEmail, verified: false },
+        { address: newEmail, verified: false },
+        { address: thirdEmail, verified: true }
+      ]);
+
+      await Accounts.replaceEmailAsync(userId, newEmail, thirdEmail);
+      const u2 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u2.emails, [
+        { address: origEmail, verified: false },
+        { address: thirdEmail, verified: true }
+      ]);
+    })
+
   Tinytest.addAsync("passwords - remove email",
     async test => {
       const origEmail = `${ Random.id() }@turing.com`;
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 2ac9317275..ce5b8699f2 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -888,6 +888,8 @@ email with a link the user can use to verify their email address.
 
 <ApiBox name="Accounts.removeEmail" />
 
+<ApiBox name="Accounts.replaceEmail" />
+
 <ApiBox name="Accounts.verifyEmail" />
 
 If the user trying to verify the email has 2FA enabled, this error will be thrown:
diff --git a/v3-docs/docs/generators/changelog/versions/3.0.0.md b/v3-docs/docs/generators/changelog/versions/3.0.0.md
index 15008c98fe..66fcf78b5b 100644
--- a/v3-docs/docs/generators/changelog/versions/3.0.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.0.0.md
@@ -58,6 +58,7 @@
   - `Accounts.sendVerificationEmail`
   - `Accounts.addEmail`
   - `Accounts.removeEmail`
+  - `Accounts.replaceEmail`
   - `Accounts.verifyEmail`
   - `Accounts.createUserVerifyingEmail`
   - `Accounts.createUser`

From d5e479291eaa5bfe2274a0f362db217ace415256 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 28 Mar 2025 23:03:24 +0200
Subject: [PATCH 031/264] Fix test

---
 packages/accounts-password/password_tests.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 08c9b0c4ca..8b14a84b9f 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1790,28 +1790,22 @@ if (Meteor.isServer) (() => {
     });
 
     Tinytest.addAsync("passwords, replace email", async test => {
-      const origEmail = `${ Random.id() }@turing.com`;
+      const origEmail = `originalemail@test.com`;
       const userId = await Accounts.createUser({
         email: origEmail
       });
 
-      const newEmail = `${ Random.id() }@turing.com`;
-      await Accounts.addEmailAsync(userId, newEmail);
+      const newEmail = `newemail@test.com`;
 
-      const thirdEmail = `${ Random.id() }@turing.com`;
-      await Accounts.addEmailAsync(userId, thirdEmail, true);
       const u1 = await Accounts._findUserByQuery({ id: userId })
       test.equal(u1.emails, [
-        { address: origEmail, verified: false },
-        { address: newEmail, verified: false },
-        { address: thirdEmail, verified: true }
+        { address: origEmail, verified: false }
       ]);
 
-      await Accounts.replaceEmailAsync(userId, newEmail, thirdEmail);
+      await Accounts.replaceEmailAsync(userId, origEmail, newEmail);
       const u2 = await Accounts._findUserByQuery({ id: userId })
       test.equal(u2.emails, [
-        { address: origEmail, verified: false },
-        { address: thirdEmail, verified: true }
+        { address: newEmail, verified: false }
       ]);
     })
 

From 9319ca7625730b0dc0f2c0885a1541f73bbf1699 Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Sun, 23 Mar 2025 14:27:08 -0300
Subject: [PATCH 032/264] check for  environment variable before sending
 package usage stats

---
 tools/meteor-services/stats.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/meteor-services/stats.js b/tools/meteor-services/stats.js
index f324df7a34..c9c8439d72 100644
--- a/tools/meteor-services/stats.js
+++ b/tools/meteor-services/stats.js
@@ -22,7 +22,7 @@ var packageList = function (projectContext) {
       name: name,
       version: info.version,
       local: info.kind === 'local',
-      direct: !! projectContext.projectConstraintsFile.getConstraint(name)
+      direct: !!projectContext.projectConstraintsFile.getConstraint(name)
     });
   });
   return versions;
@@ -39,7 +39,8 @@ var recordPackages = async function (options) {
   // Before doing anything, look at the app's dependencies to see if the
   // opt-out package is there; if present, we don't record any stats.
   var packages = packageList(options.projectContext);
-  if (_.findWhere(packages, { name: OPT_OUT_PACKAGE_NAME })) {
+  if (_.findWhere(packages, { name: OPT_OUT_PACKAGE_NAME }) ||
+    process.env.DO_NOT_TRACK) {
     // Print some output for the 'report-stats' self-test.
     if (process.env.METEOR_PACKAGE_STATS_TEST_OUTPUT) {
       process.stdout.write("PACKAGE STATS NOT SENT\n");
@@ -86,9 +87,9 @@ var recordPackages = async function (options) {
     }
 
     var result = await conn.call("recordAppPackages",
-                           appIdentifier,
-                           packages,
-                           details);
+      appIdentifier,
+      packages,
+      details);
 
     // If the stats server sent us a new session, save it for use on
     // subsequent requests.
@@ -112,7 +113,7 @@ var recordPackages = async function (options) {
 
 var logErrorIfInCheckout = function (err) {
   if ((Console.isInteractive() && files.inCheckout())
-      || process.env.METEOR_PACKAGE_STATS_TEST_OUTPUT) {
+    || process.env.METEOR_PACKAGE_STATS_TEST_OUTPUT) {
     Console.warn("Failed to record package usage.");
     Console.warn(
       "(This error is hidden when you are not running Meteor from a",
@@ -145,8 +146,8 @@ var getPackagesForAppIdInTest = function (projectContext) {
 
 var connectToPackagesStatsServer = async function () {
   const sc = new ServiceConnection(
-      config.getPackageStatsServerUrl(),
-      {_dontPrintErrors: true}
+    config.getPackageStatsServerUrl(),
+    { _dontPrintErrors: true }
   );
 
   await sc.init();

From 05c789131e5af977bf6b8c07c9a973e17e75c10c Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Wed, 26 Mar 2025 11:50:24 -0300
Subject: [PATCH 033/264] add documentation for the `DO_NOT_TRACK` CLI flag

---
 v3-docs/docs/cli/environment-variables.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/v3-docs/docs/cli/environment-variables.md b/v3-docs/docs/cli/environment-variables.md
index 1d46eadbc0..bde20413bb 100644
--- a/v3-docs/docs/cli/environment-variables.md
+++ b/v3-docs/docs/cli/environment-variables.md
@@ -31,6 +31,15 @@ In the event that your own deployment platform does not support WebSockets, or y
 
 Set `DISABLE_SOCKJS=1` if you want to use the native WebSocket implementation instead of SockJS on the client side, for example, if you want to use a custom WebSocket implementation (e.g. [uWebSockets.js](https://github.com/uNetworking/uWebSockets.js/)) on the server side.
 
+## DO_NOT_TRACK
+(_development, production_)
+
+Meteor automatically sends usage statistics about which Meteor packages your app uses by default. This behavior can be disabled by setting `DO_NOT_TRACK` to any truthy value (for example, `DO_NOT_TRACK=1`).
+
+Having this variable set globally (say, by adding it to your `.bashrc` file) would disable statistics for all Meteor projects in your computer, and do the same for other programs that respect this flag (like [FerretDB](https://www.ferretdb.com/) or [Bun](https://bun.sh/)).
+
+Alternatively, you can install the `package-stats-opt-out` package by calling `meteor add package-stats-opt-out` inside your Meteor project folder. Having this package installed in your project disables usage statistics being sent to the Meteor project, regardless of whether the `DO_NOT_TRACK` environment variable is set or not.
+
 ## HTTP_FORWARDED_COUNT
 (_production_)
 

From bf5820feb22170d1be1782e03cde98b8d63b36bc Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Sun, 23 Mar 2025 11:51:28 -0300
Subject: [PATCH 034/264] add option to automatically exclude legacy web
 architectures from builds with a package.json flag

---
 tools/cli/commands.js | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 5ee4ead23b..062e7c6bcd 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -261,11 +261,17 @@ export function parseRunTargets(targets) {
   });
 };
 
-const excludableWebArchs = ['web.browser', 'web.browser.legacy', 'web.cordova'];
-function filterWebArchs(webArchs, excludeArchsOption) {
-  if (excludeArchsOption) {
-    const excludeArchs = excludeArchsOption.trim().split(/\s*,\s*/)
-      .filter(arch => excludableWebArchs.includes(arch));
+function isModernArchsOnlyEnabled(appDir) {
+  const packageJsonPath = files.pathJoin(appDir, 'package.json');
+  const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
+  const packageJson = JSON.parse(packageJsonFile);
+  return packageJson?.meteor?.modernWebArchsOnly === true;
+}
+
+function filterWebArchs(webArchs, excludeArchsOption, appDir) {
+  const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
+  if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
+    const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
     webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
   }
   return webArchs;
@@ -509,7 +515,8 @@ async function doRunCommand(options) {
       webArchs.push("web.cordova");
     }
   }
-  webArchs = filterWebArchs(webArchs, options['exclude-archs']);
+
+  webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir);
   const buildMode = options.production ? 'production' : 'development';
 
   let cordovaRunner;
@@ -1391,9 +1398,9 @@ on an OS X system.");
   // For example, if we want to build only android, there is no need to build
   // web.browser.
   let webArchs;
+  const baseWebArchs = projectContext.platformList.getWebArchs();
   if (selectedPlatforms) {
-    const filteredArchs = projectContext.platformList
-      .getWebArchs()
+    const filteredArchs = baseWebArchs
       .filter(arch => selectedPlatforms.includes(arch));
 
     if (
@@ -1404,6 +1411,8 @@ on an OS X system.");
     }
 
     webArchs = filteredArchs.length ? filteredArchs : undefined;
+  } else {
+    webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir);
   }
 
   var buildDir = projectContext.getProjectLocalDirectory('build_tar');
@@ -2465,7 +2474,7 @@ var runTestAppForPackages = async function (projectContext, options) {
   if (options.cordovaRunner) {
     webArchs.push("web.cordova");
   }
-  buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs']);
+  buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory);
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.

From 24bc7cb4a9af14c2af32197b9e103a25b02a41f7 Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Sun, 23 Mar 2025 11:53:35 -0300
Subject: [PATCH 035/264] add modernWebArchsOnly flag to base package.json
 files used for new projects

---
 tools/static-assets/skel-apollo/package.json     | 3 ++-
 tools/static-assets/skel-blaze/package.json      | 3 ++-
 tools/static-assets/skel-chakra-ui/package.json  | 3 ++-
 tools/static-assets/skel-minimal/package.json    | 3 ++-
 tools/static-assets/skel-react/package.json      | 3 ++-
 tools/static-assets/skel-solid/package.json      | 3 ++-
 tools/static-assets/skel-svelte/package.json     | 3 ++-
 tools/static-assets/skel-tailwind/package.json   | 3 ++-
 tools/static-assets/skel-typescript/package.json | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json
index 51ca845233..3bb70f1781 100644
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -21,6 +21,7 @@
       "client": "client/main.jsx",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json
index 59e15689c0..21fba0da58 100644
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -17,6 +17,7 @@
       "client": "client/main.js",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json
index 690f492c11..92bbdf24ad 100644
--- a/tools/static-assets/skel-chakra-ui/package.json
+++ b/tools/static-assets/skel-chakra-ui/package.json
@@ -24,6 +24,7 @@
       "client": "client/main.jsx",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
index 3ade9d3a74..73469db096 100644
--- a/tools/static-assets/skel-minimal/package.json
+++ b/tools/static-assets/skel-minimal/package.json
@@ -16,6 +16,7 @@
       "client": "client/main.js",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json
index 0c0eb6e4a5..08d7e054e3 100644
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -18,6 +18,7 @@
       "client": "client/main.jsx",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index d096a76612..6e8187cbeb 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -18,7 +18,8 @@
       "client": "client/entry-meteor.js",
       "server": "server/entry-meteor.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   },
   "devDependencies": {
     "babel-preset-solid": "^1.8.15",
diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json
index 68e6f37acf..7cf92dfce7 100644
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -27,6 +27,7 @@
         ]
       }
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json
index c02e2d027c..94934d4898 100644
--- a/tools/static-assets/skel-tailwind/package.json
+++ b/tools/static-assets/skel-tailwind/package.json
@@ -22,6 +22,7 @@
       "client": "client/main.jsx",
       "server": "server/main.js"
     },
-    "testModule": "tests/main.js"
+    "testModule": "tests/main.js",
+    "modernWebArchsOnly": true
   }
 }
diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index 1bd98a2050..03ff9ce6c7 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -25,6 +25,7 @@
       "client": "client/main.tsx",
       "server": "server/main.ts"
     },
-    "testModule": "tests/main.ts"
+    "testModule": "tests/main.ts",
+    "modernWebArchsOnly": true
   }
 }

From de7d9a7a7ed3257625dd9de7121c39f5fc7c0c99 Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Sun, 23 Mar 2025 13:51:40 -0300
Subject: [PATCH 036/264] default to false if package.json is not found

---
 tools/cli/commands.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 062e7c6bcd..26956a589a 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -263,6 +263,9 @@ export function parseRunTargets(targets) {
 
 function isModernArchsOnlyEnabled(appDir) {
   const packageJsonPath = files.pathJoin(appDir, 'package.json');
+  if (!files.exists(packageJsonPath)) {
+    return false;
+  }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
   return packageJson?.meteor?.modernWebArchsOnly === true;

From 168afef6c867716885dd4407a038bb15963bafe8 Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Wed, 26 Mar 2025 11:08:53 -0300
Subject: [PATCH 037/264] use `require` instead of `JSON.parse`

---
 tools/cli/commands.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 26956a589a..9d6b91c6c8 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -266,8 +266,7 @@ function isModernArchsOnlyEnabled(appDir) {
   if (!files.exists(packageJsonPath)) {
     return false;
   }
-  const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
-  const packageJson = JSON.parse(packageJsonFile);
+  const packageJson = require(packageJsonPath);
   return packageJson?.meteor?.modernWebArchsOnly === true;
 }
 
@@ -1354,7 +1353,7 @@ var buildCommand = async function (options) {
   let selectedPlatforms = null;
   if (options.platforms) {
     const platformsArray = options.platforms.split(",");
-
+    const excludableWebArchs = ['web.browser', 'web.browser.legacy', 'web.cordova'];
     platformsArray.forEach(plat => {
       if (![...excludableWebArchs, 'android', 'ios'].includes(plat)) {
         throw new Error(`Not allowed platform on '--platforms' flag: ${plat}`)

From 3662d344faccbdd95bfc52e88e543d7b11d750b3 Mon Sep 17 00:00:00 2001
From: 9Morello <caiomorello@protonmail.ch>
Date: Wed, 26 Mar 2025 12:49:34 -0300
Subject: [PATCH 038/264] change `require` call back to `JSON.parse`, since
 Windows seems to dislike requiring .js files by their full path

---
 tools/cli/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 9d6b91c6c8..40b2cfc34e 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -266,7 +266,8 @@ function isModernArchsOnlyEnabled(appDir) {
   if (!files.exists(packageJsonPath)) {
     return false;
   }
-  const packageJson = require(packageJsonPath);
+  const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
+  const packageJson = JSON.parse(packageJsonFile);
   return packageJson?.meteor?.modernWebArchsOnly === true;
 }
 

From ee23cb4e575a2765da82f602d47185b55b5f62bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 1 Apr 2025 19:38:58 +0200
Subject: [PATCH 039/264] ensure SWC.compile profile context and address
 feedback

---
 packages/babel-compiler/babel-compiler.js | 142 ++++++++++++----------
 1 file changed, 78 insertions(+), 64 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index d5f0263801..d5e1f7437a 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -29,6 +29,67 @@ var isMeteorPre144 = semver.lt(process.version, "4.8.1");
 
 var enableClientTLA = process.env.METEOR_ENABLE_CLIENT_TOP_LEVEL_AWAIT === 'true';
 
+function compileWithBabel(source, babelOptions, cacheOptions) {
+  return profile('Babel.compile', function () {
+    return Babel.compile(source, babelOptions, cacheOptions);
+  });
+}
+
+function compileWithSWC(source, { inputFilePath, hash, features, ...swcOptions }) {
+  return profile('SWC.compile', function () {
+    // Determine file extension based syntax.
+    const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+    const hasTSXSupport = inputFilePath.endsWith('.tsx');
+    const hasJSXSupport = inputFilePath.endsWith('.jsx');
+
+    // Perform SWC transformation.
+    const transformed = SWC.transformSync(source, {
+      ...swcOptions,
+      jsc: {
+        target: 'es2015',
+        parser: {
+          syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
+          jsx: hasJSXSupport,
+          tsx: hasTSXSupport,
+        },
+      },
+      module: { type: 'es6' },
+      minify: false,
+      sourceMaps: true,
+    });
+
+    let content = transformed.code;
+
+    // Preserve Meteor-specific features: reify modules, nested imports, and top-level await support.
+    const result = reifyCompile(content, {
+      parse: reifyAcornParse,
+      generateLetDeclarations: false,
+      ast: false,
+      // Enforce reify options for proper compatibility.
+      avoidModernSyntax: true,
+      enforceStrictMode: false,
+      dynamicImport: true,
+      ...features.topLevelAwait && { topLevelAwait: true },
+      ...features.compileForShell && { moduleAlias: 'module' },
+      ...(features.modernBrowsers || features.nodeMajorVersion >= 8) && {
+        avoidModernSyntax: false,
+        generateLetDeclarations: true,
+      },
+    });
+    if (!result.identical) {
+      content = result.code;
+    }
+
+    return {
+      code: content,
+      map: JSON.parse(transformed.map),
+      hash,
+      sourceType: 'module',
+    };
+  });
+}
+
+
 BCp.processFilesForTarget = function (inputFiles) {
   var compiler = this;
 
@@ -147,16 +208,16 @@ BCp.processOneFileForTarget = function (inputFile, source) {
     }
 
     try {
-      var result = profile('Babel.compile', function () {
-        // Determine if SWC should be used based on package and file criteria.
+      var result = (function getTranspilerCompilation() {
         const packagesSkipSwc = [];
         const fileSkipSwc = []; // top level await
+
+        // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc =
           !packagesSkipSwc.includes(packageName) &&
           !fileSkipSwc.includes(inputFilePath) &&
-          !self._swcIncompatible[toBeAdded.hash];
+          !this._swcIncompatible[toBeAdded.hash];
 
-        // Check RAM cache
         let compilation;
         try {
           if (shouldUseSwc) {
@@ -165,14 +226,14 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             const cacheContext = '.swc-cache';
 
             // Check RAM cache
-            compilation = self._swcCache[cacheKey];
+            compilation = this._swcCache[cacheKey];
             // Check file system cache if enabled
-            if (!compilation && self.cacheDirectory) {
-              const cacheFilePath = path.join(self.cacheDirectory, cacheContext, cacheKey + '.json');
+            if (!compilation && this.cacheDirectory) {
+              const cacheFilePath = path.join(this.cacheDirectory, cacheContext, cacheKey + '.json');
               if (fs.existsSync(cacheFilePath)) {
                 try {
                   compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-                  self._swcCache[cacheKey] = compilation;
+                  this._swcCache[cacheKey] = compilation;
                 } catch (e) {
                   // If reading/parsing the cache fails, ignore and continue.
                 }
@@ -183,60 +244,12 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               return compilation;
             }
 
-            const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
-            const hasTSXSupport = inputFilePath.endsWith('.tsx');
-            const hasJSXSupport = inputFilePath.endsWith('.jsx');
-
-            // Perform compilation
-            const transformed = SWC.transformSync(source, {
-              jsc: {
-                target: 'es2015',
-                parser: {
-                  syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
-                  jsx: hasJSXSupport,
-                  tsx: hasTSXSupport,
-                },
-              },
-              module: { type: 'es6' },
-              minify: false,
-              sourceMaps: true,
-            });
-
-            let content = transformed.code;
-            // Perserve Meteor's specifics: reify modules, nested imports and top-level await support.
-            const result = reifyCompile(content, {
-              parse: reifyAcornParse,
-              generateLetDeclarations: false,
-              ast: false,
-              // Enforce reify options for proper compatibility (TODO export getReifyOptions)
-              // https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-babel/options.js#L19
-              avoidModernSyntax: true,
-              enforceStrictMode: false,
-              dynamicImport: true,
-              ...features.topLevelAwait && { topLevelAwait: true },
-              ...features.compileForShell && { moduleAlias: 'module' },
-              ...(features.modernBrowsers ||
-                features.nodeMajorVersion >= 8) && {
-                avoidModernSyntax: false,
-                generateLetDeclarations: true,
-              },
-            });
-            if (!result.identical) {
-              identical = false;
-              content = result.code;
-            }
-
-            compilation = {
-              code: content,
-              map: JSON.parse(transformed.map),
-              hash: toBeAdded.hash,
-              sourceType: 'module',
-            };
+            compilation = compileWithSWC(source, { inputFilePath, hash: toBeAdded.hash, features });
 
             // Save result in cache
-            self._swcCache[cacheKey] = compilation;
-            if (self.cacheDirectory) {
-              const cacheFilePath = path.join(self.cacheDirectory, cacheContext, cacheKey + '.json');
+            this._swcCache[cacheKey] = compilation;
+            if (this.cacheDirectory) {
+              const cacheFilePath = path.join(this.cacheDirectory, cacheContext, cacheKey + '.json');
               try {
                 const writeFileCache = async () => {
                   await fs.promises.mkdir(path.dirname(cacheFilePath), { recursive: true });
@@ -249,15 +262,16 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               }
             }
           } else {
-            compilation = Babel.compile(source, babelOptions, cacheOptions);
+            compilation = compileWithBabel(source, babelOptions, cacheOptions);
           }
         } catch (e) {
-          self._swcIncompatible[toBeAdded.hash] = true;
+          this._swcIncompatible[toBeAdded.hash] = true;
           // If SWC fails, fall back to Babel
-          compilation = Babel.compile(source, babelOptions, cacheOptions);
+          compilation = compileWithBabel(source, babelOptions, cacheOptions);
         }
+
         return compilation;
-      });
+      }).call(this);
     } catch (e) {
       if (e.loc) {
         // Error is from @babel/parser.

From 04c71f1a5b90fa17878c4bc2c5cf19232db29175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 1 Apr 2025 19:40:25 +0200
Subject: [PATCH 040/264] prefer an arrow function

---
 packages/babel-compiler/babel-compiler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index d5e1f7437a..f4df7343c9 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -208,7 +208,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
     }
 
     try {
-      var result = (function getTranspilerCompilation() {
+      var result = (() => {
         const packagesSkipSwc = [];
         const fileSkipSwc = []; // top level await
 
@@ -271,7 +271,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         }
 
         return compilation;
-      }).call(this);
+      })();
     } catch (e) {
       if (e.loc) {
         // Error is from @babel/parser.

From d137aea93c4815f7b399f20d8a63e050b6bb14a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 1 Apr 2025 19:51:11 +0200
Subject: [PATCH 041/264] refactor cache code

---
 packages/babel-compiler/babel-compiler.js | 82 +++++++++++++----------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f4df7343c9..54727ee938 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -35,7 +35,7 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSWC(source, { inputFilePath, hash, features, ...swcOptions }) {
+function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
   return profile('SWC.compile', function () {
     // Determine file extension based syntax.
     const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
@@ -83,7 +83,6 @@ function compileWithSWC(source, { inputFilePath, hash, features, ...swcOptions }
     return {
       code: content,
       map: JSON.parse(transformed.map),
-      hash,
       sourceType: 'module',
     };
   });
@@ -221,46 +220,17 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         let compilation;
         try {
           if (shouldUseSwc) {
-            // Create a cache key based on the source hash and the compiler used.
+            // Create a cache key based on the source hash and the compiler used
             const cacheKey = toBeAdded.hash;
-            const cacheContext = '.swc-cache';
-
-            // Check RAM cache
-            compilation = this._swcCache[cacheKey];
-            // Check file system cache if enabled
-            if (!compilation && this.cacheDirectory) {
-              const cacheFilePath = path.join(this.cacheDirectory, cacheContext, cacheKey + '.json');
-              if (fs.existsSync(cacheFilePath)) {
-                try {
-                  compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-                  this._swcCache[cacheKey] = compilation;
-                } catch (e) {
-                  // If reading/parsing the cache fails, ignore and continue.
-                }
-              }
-            }
+            // Check cache
+            compilation = this.readFromSwcCache({ cacheKey });
             // Return cached result if found.
             if (compilation) {
               return compilation;
             }
-
-            compilation = compileWithSWC(source, { inputFilePath, hash: toBeAdded.hash, features });
-
+            compilation = compileWithSwc(source, {}, { inputFilePath, features });
             // Save result in cache
-            this._swcCache[cacheKey] = compilation;
-            if (this.cacheDirectory) {
-              const cacheFilePath = path.join(this.cacheDirectory, cacheContext, cacheKey + '.json');
-              try {
-                const writeFileCache = async () => {
-                  await fs.promises.mkdir(path.dirname(cacheFilePath), { recursive: true });
-                  await fs.promises.writeFile(cacheFilePath, JSON.stringify(compilation), 'utf8');
-                };
-                // Asynchronously write the cache without blocking
-                writeFileCache();
-              } catch (e) {
-                // If file caching fails, ignore the error.
-              }
-            }
+            this.writeToSwcCache({ cacheKey, compilation });
           } else {
             compilation = compileWithBabel(source, babelOptions, cacheOptions);
           }
@@ -689,3 +659,43 @@ function packageNameFromTopLevelModuleId(id) {
   }
   return parts[0];
 }
+
+const SwcCacheContext = '.swc-cache';
+
+BCp.readFromSwcCache = function({ cacheKey }) {
+  // Check in-memory cache.
+  let compilation = this._swcCache[cacheKey];
+  // If not found, try file system cache if enabled.
+  if (!compilation && this.cacheDirectory) {
+    const cacheFilePath = path.join(this.cacheDirectory, SwcCacheContext, `${cacheKey}.json`);
+    if (fs.existsSync(cacheFilePath)) {
+      try {
+        compilation = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
+        // Save back to in-memory cache.
+        this._swcCache[cacheKey] = compilation;
+      } catch (err) {
+        // Ignore any errors reading/parsing the cache.
+      }
+    }
+  }
+  return compilation;
+};
+
+BCp.writeToSwcCache = function({ cacheKey, compilation }) {
+  // Save to in-memory cache.
+  this._swcCache[cacheKey] = compilation;
+  // If file system caching is enabled, write asynchronously.
+  if (this.cacheDirectory) {
+    const cacheFilePath = path.join(this.cacheDirectory, SwcCacheContext, `${cacheKey}.json`);
+    try {
+      const writeFileCache = async () => {
+        await fs.promises.mkdir(path.dirname(cacheFilePath), { recursive: true });
+        await fs.promises.writeFile(cacheFilePath, JSON.stringify(compilation), 'utf8');
+      };
+      // Invoke without blocking the main flow.
+      writeFileCache();
+    } catch (err) {
+      // If writing fails, ignore the error.
+    }
+  }
+};

From b512040335ca918e27d611092a79dfaab428fc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 1 Apr 2025 19:52:35 +0200
Subject: [PATCH 042/264] remove unrequired self

---
 packages/babel-compiler/babel-compiler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 54727ee938..35e3588df7 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -115,7 +115,6 @@ BCp.processFilesForTarget = function (inputFiles) {
 // Returns an object suitable for passing to inputFile.addJavaScript, or
 // null to indicate there was an error, and nothing should be added.
 BCp.processOneFileForTarget = function (inputFile, source) {
-  var self = this; // capture context
   this._babelrcCache = this._babelrcCache || Object.create(null);
   this._swcCache = this._swcCache || Object.create(null);
   this._swcIncompatible = this._swcIncompatible || Object.create(null);

From 91de1f2c867c42c5b0a88adbabac438f05d43e96 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 1 Apr 2025 20:53:12 -0300
Subject: [PATCH 043/264] DEV: Bump express to 5.1.0 in webapp

Also updated express types
---
 packages/webapp/package.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 6e988ec31c..c57f709f3c 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,12 +1,12 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.5",
+  version: "2.0.6",
 });
 
 Npm.depends({
   "cookie-parser": "1.4.6",
-  express: "5.0.1",
-  "@types/express": "5.0.0",
+  express: "5.1.0",
+  "@types/express": "5.0.1",
   compression: "1.7.4",
   errorhandler: "1.5.1",
   parseurl: "1.3.3",

From 048f81126acf791e0c9f308bc83b94ce6aaa21e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 2 Apr 2025 17:41:31 +0200
Subject: [PATCH 044/264] implement config to enable SWC

---
 packages/babel-compiler/babel-compiler.js | 64 ++++++++++++++++++++---
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 35e3588df7..7903502e4d 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -88,6 +88,53 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
   });
 }
 
+function getMeteorAppDir() {
+  return process.cwd();
+}
+
+function getMeteorAppPackageJson() {
+  return JSON.parse(
+    fs.readFileSync(`${getMeteorAppDir()}/package.json`, 'utf-8'),
+  );
+}
+
+const _regexCache = new Map();
+
+function isRegexLike(str) {
+  return /[.*+?^${}()|[\]\\]/.test(str);
+}
+
+function isExcludedConfig(name, excludeList = []) {
+  return excludeList.some(rule => {
+    if (name === rule) return true;
+    if (isRegexLike(rule)) {
+      let regex = _regexCache.get(rule);
+      if (!regex) {
+        try {
+          regex = new RegExp(rule);
+          _regexCache.set(rule, regex);
+        } catch (err) {
+          console.warn(`Invalid regex in exclude list: "${rule}"`);
+          return false;
+        }
+      }
+      return regex.test(name);
+    }
+
+    return false;
+  });
+}
+
+BCp.initializeMeteorAppConfig = function () {
+  const currentLastModifiedConfigTime = fs
+    .statSync(`${getMeteorAppDir()}/package.json`)
+    ?.mtime?.getTime();
+  if (currentLastModifiedConfigTime !== this.lastModifiedConfigTime) {
+    this.lastModifiedConfigTime = currentLastModifiedConfigTime;
+    this.lastModifiedConfig = getMeteorAppPackageJson()?.meteor;
+  }
+  return this.lastModifiedConfig;
+};
 
 BCp.processFilesForTarget = function (inputFiles) {
   var compiler = this;
@@ -95,6 +142,8 @@ BCp.processFilesForTarget = function (inputFiles) {
   // Reset this cache for each batch processed.
   this._babelrcCache = null;
 
+  this.initializeMeteorAppConfig();
+
   inputFiles.forEach(function (inputFile) {
     if (inputFile.supportsLazyCompilation) {
       inputFile.addJavaScript({
@@ -207,14 +256,17 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     try {
       var result = (() => {
-        const packagesSkipSwc = [];
-        const fileSkipSwc = []; // top level await
-
+        const isAppCode = packageName == null;
+        const config = this.lastModifiedConfig?.modernTranspiler;
+        const hasModernTranspiler = config != null;
+        const shouldSkipSwc =
+          !hasModernTranspiler ||
+          (config.excludeApp === true && isAppCode) ||
+          isExcludedConfig(packageName, config.excludePackages || []) ||
+          (isAppCode && isExcludedConfig(inputFilePath, config.excludeFiles || []));
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc =
-          !packagesSkipSwc.includes(packageName) &&
-          !fileSkipSwc.includes(inputFilePath) &&
-          !this._swcIncompatible[toBeAdded.hash];
+          !shouldSkipSwc && !this._swcIncompatible[toBeAdded.hash];
 
         let compilation;
         try {

From cb68023bf2998dc2811eea3c6d692753ba27d86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 2 Apr 2025 17:56:26 +0200
Subject: [PATCH 045/264] better naming

---
 packages/babel-compiler/babel-compiler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 7903502e4d..9d1c946fdd 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -262,8 +262,8 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const shouldSkipSwc =
           !hasModernTranspiler ||
           (config.excludeApp === true && isAppCode) ||
-          isExcludedConfig(packageName, config.excludePackages || []) ||
-          (isAppCode && isExcludedConfig(inputFilePath, config.excludeFiles || []));
+          (isAppCode && isExcludedConfig(inputFilePath, config.excludeAppFiles || [])) ||
+          isExcludedConfig(packageName, config.excludePackages || []);
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc =
           !shouldSkipSwc && !this._swcIncompatible[toBeAdded.hash];

From b620ff222d8f0d8d54f24a0d68ec37a8c9b65b78 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Wed, 2 Apr 2025 19:00:00 +0200
Subject: [PATCH 046/264] Apply Nacho fixes

---
 packages/accounts-password/password_tests.js | 37 +++++++++++---------
 v3-docs/docs/api/accounts.md                 |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 8b14a84b9f..f34e172dc7 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1789,27 +1789,30 @@ if (Meteor.isServer) (() => {
       ]);
     });
 
-    Tinytest.addAsync("passwords, replace email", async test => {
-      const origEmail = `originalemail@test.com`;
-      const userId = await Accounts.createUser({
-        email: origEmail
-      });
+    
 
-      const newEmail = `newemail@test.com`;
+Tinytest.addAsync("accounts emails - replace email", async test => {
+  const origEmail = `originalemail@test.com`;
+  const userId = await Accounts.createUserAsync({
+    email: origEmail,
+    password: 'password'
+  });
 
-      const u1 = await Accounts._findUserByQuery({ id: userId })
-      test.equal(u1.emails, [
-        { address: origEmail, verified: false }
-      ]);
+  const newEmail = `newemail@test.com`;
 
-      await Accounts.replaceEmailAsync(userId, origEmail, newEmail);
-      const u2 = await Accounts._findUserByQuery({ id: userId })
-      test.equal(u2.emails, [
-        { address: newEmail, verified: false }
-      ]);
-    })
+  const u1 = await Accounts._findUserByQuery({ id: userId })
+  test.equal(u1.emails, [
+    { address: origEmail, verified: false }
+  ]);
 
-  Tinytest.addAsync("passwords - remove email",
+  await Accounts.replaceEmailAsync(userId, origEmail, newEmail);
+  const u2 = await Accounts._findUserByQuery({ id: userId })
+  test.equal(u2.emails, [
+    { address: newEmail, verified: false }
+  ]);
+})
+  
+    Tinytest.addAsync("passwords - remove email",
     async test => {
       const origEmail = `${ Random.id() }@turing.com`;
       const userId = await Accounts.createUser({
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index ce5b8699f2..a40c6ef496 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -888,7 +888,7 @@ email with a link the user can use to verify their email address.
 
 <ApiBox name="Accounts.removeEmail" />
 
-<ApiBox name="Accounts.replaceEmail" />
+<ApiBox name="Accounts.replaceEmailAsync" />
 
 <ApiBox name="Accounts.verifyEmail" />
 

From cc360a3e362d6f6499614dbbdb36cfcd6037eb81 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Wed, 2 Apr 2025 19:01:22 +0200
Subject: [PATCH 047/264] Fix doc

---
 v3-docs/docs/generators/changelog/versions/3.0.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.0.0.md b/v3-docs/docs/generators/changelog/versions/3.0.0.md
index 66fcf78b5b..202729af5d 100644
--- a/v3-docs/docs/generators/changelog/versions/3.0.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.0.0.md
@@ -58,7 +58,7 @@
   - `Accounts.sendVerificationEmail`
   - `Accounts.addEmail`
   - `Accounts.removeEmail`
-  - `Accounts.replaceEmail`
+  - `Accounts.replaceEmailAsync`
   - `Accounts.verifyEmail`
   - `Accounts.createUserVerifyingEmail`
   - `Accounts.createUser`

From fb2bae51979633adcd80f085f0566cbc30bbd86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 4 Apr 2025 14:14:11 +0200
Subject: [PATCH 048/264] support a configuration to exclude by node_modules
 and simplify config

---
 packages/babel-compiler/babel-compiler.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 9d1c946fdd..d388e2b466 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -104,9 +104,11 @@ function isRegexLike(str) {
   return /[.*+?^${}()|[\]\\]/.test(str);
 }
 
-function isExcludedConfig(name, excludeList = []) {
+function isExcludedConfig(name, excludeList = [], startsWith) {
+  if (!name) return false;
   return excludeList.some(rule => {
     if (name === rule) return true;
+    if (startsWith && name.startsWith(rule)) return true;
     if (isRegexLike(rule)) {
       let regex = _regexCache.get(rule);
       if (!regex) {
@@ -256,13 +258,26 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     try {
       var result = (() => {
-        const isAppCode = packageName == null;
+        const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
+        const isAppCode = packageName == null && !isNodeModulesCode;
         const config = this.lastModifiedConfig?.modernTranspiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
           !hasModernTranspiler ||
           (config.excludeApp === true && isAppCode) ||
-          (isAppCode && isExcludedConfig(inputFilePath, config.excludeAppFiles || [])) ||
+          (config.excludeNodeModules === true && isNodeModulesCode) ||
+          (isAppCode &&
+            Array.isArray(config.excludeApp) &&
+            isExcludedConfig(inputFilePath, config.excludeApp || [])) ||
+          (isNodeModulesCode &&
+            Array.isArray(config.excludeNodeModules) &&
+            (isExcludedConfig(inputFilePath, config.excludeNodeModules || []) ||
+              isExcludedConfig(
+                inputFilePath.replace('node_modules/', ''),
+                config.excludeNodeModules || [],
+                true,
+              ))
+          ) ||
           isExcludedConfig(packageName, config.excludePackages || []);
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc =

From 85e7f6e7207e2913002cc1ae0d5c8ee323abd5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 4 Apr 2025 14:36:51 +0200
Subject: [PATCH 049/264] support a configuration to exclude by meteor package
 and its path

---
 packages/babel-compiler/babel-compiler.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index d388e2b466..e280801181 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -105,7 +105,7 @@ function isRegexLike(str) {
 }
 
 function isExcludedConfig(name, excludeList = [], startsWith) {
-  if (!name) return false;
+  if (!name || !excludeList?.length) return false;
   return excludeList.some(rule => {
     if (name === rule) return true;
     if (startsWith && name.startsWith(rule)) return true;
@@ -260,12 +260,14 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       var result = (() => {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
         const isAppCode = packageName == null && !isNodeModulesCode;
+        const isPackageCode = packageName != null;
         const config = this.lastModifiedConfig?.modernTranspiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
           !hasModernTranspiler ||
-          (config.excludeApp === true && isAppCode) ||
-          (config.excludeNodeModules === true && isNodeModulesCode) ||
+          (isAppCode && config.excludeApp === true) ||
+          (isNodeModulesCode && config.excludeNodeModules === true) ||
+          (isPackageCode && config.excludePackages === true) ||
           (isAppCode &&
             Array.isArray(config.excludeApp) &&
             isExcludedConfig(inputFilePath, config.excludeApp || [])) ||
@@ -276,9 +278,14 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                 inputFilePath.replace('node_modules/', ''),
                 config.excludeNodeModules || [],
                 true,
-              ))
-          ) ||
-          isExcludedConfig(packageName, config.excludePackages || []);
+              ))) ||
+          (isPackageCode &&
+            Array.isArray(config.excludePackages) &&
+            (isExcludedConfig(packageName, config.excludePackages || []) ||
+              isExcludedConfig(
+                `${packageName}/${inputFilePath}`,
+                config.excludePackages || [],
+              )));
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc =
           !shouldSkipSwc && !this._swcIncompatible[toBeAdded.hash];

From cc1f6a4943a42606421bb29130e78e574ba51c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 7 Apr 2025 15:31:34 +0200
Subject: [PATCH 050/264] add a verbose config to get insights of transpilation
 process

---
 packages/babel-compiler/babel-compiler.js | 99 ++++++++++++++++++++++-
 1 file changed, 98 insertions(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index e280801181..0b3d9cc4a9 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -104,6 +104,62 @@ function isRegexLike(str) {
   return /[.*+?^${}()|[\]\\]/.test(str);
 }
 
+function color(text, code) {
+  return `\x1b[${code}m${text}\x1b[0m`;
+}
+
+function logTranspilation({
+  packageName,
+  inputFilePath,
+  usedSwc,
+  cacheHit,
+  isNodeModulesCode,
+  errorMessage = '',
+  tip = '',
+}) {
+  const transpiler = usedSwc ? 'SWC' : 'Babel';
+  const transpilerColor = usedSwc ? 32 : 33;
+  const label = color('[Transpiler]', 36);
+  const transpilerPart = `${label} Used ${color(
+    transpiler,
+    transpilerColor,
+  )} for`;
+  const filePathPadded = `${
+    packageName ? `${packageName}/` : ''
+  }${inputFilePath}`.padEnd(50);
+  let rawOrigin = '';
+  if (packageName) {
+    rawOrigin = `(package)`;
+  } else {
+    rawOrigin = isNodeModulesCode ? '(node_modules)' : '(app)';
+  }
+  const originPaddedRaw = rawOrigin.padEnd(35);
+  const originPaddedColored = packageName
+    ? originPaddedRaw
+    : isNodeModulesCode
+    ? color(originPaddedRaw, 90)
+    : color(originPaddedRaw, 35);
+  const cacheStatus = errorMessage
+    ? color('⚠️  Fallback', 33)
+    : usedSwc
+    ? cacheHit
+      ? color('🟢 Cache hit', 32)
+      : color('🔴 Cache miss', 31)
+    : '';
+  console.log(
+    `${transpilerPart} ${filePathPadded}${originPaddedColored}${cacheStatus}`,
+  );
+  if (errorMessage) {
+    console.log();
+    console.log(`  ↳ ${color('Error:', 31)} ${errorMessage}`);
+    if (tip) {
+      console.log();
+      console.log(`  ${color('💡 Tip:', 33)} ${tip}`);
+    }
+    console.log();
+  }
+}
+
 function isExcludedConfig(name, excludeList = [], startsWith) {
   if (!name || !excludeList?.length) return false;
   return excludeList.some(rule => {
@@ -292,6 +348,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
         let compilation;
         try {
+          let usedSwc = false;
           if (shouldUseSwc) {
             // Create a cache key based on the source hash and the compiler used
             const cacheKey = toBeAdded.hash;
@@ -299,18 +356,58 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             compilation = this.readFromSwcCache({ cacheKey });
             // Return cached result if found.
             if (compilation) {
+              if (config?.verbose) {
+                logTranspilation({
+                  usedSwc: true,
+                  inputFilePath,
+                  packageName,
+                  isNodeModulesCode,
+                  cacheHit: true,
+                });
+              }
               return compilation;
             }
-            compilation = compileWithSwc(source, {}, { inputFilePath, features });
+            compilation = compileWithSwc(
+              source,
+              {},
+              { inputFilePath, features },
+            );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
+            usedSwc = true;
           } else {
             compilation = compileWithBabel(source, babelOptions, cacheOptions);
+            usedSwc = false;
+          }
+
+          if (config?.verbose) {
+            logTranspilation({
+              usedSwc,
+              inputFilePath,
+              packageName,
+              isNodeModulesCode,
+              cacheHit: false,
+            });
           }
         } catch (e) {
           this._swcIncompatible[toBeAdded.hash] = true;
           // If SWC fails, fall back to Babel
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
+          if (config?.verbose) {
+            logTranspilation({
+              usedSwc: false,
+              inputFilePath,
+              packageName,
+              isNodeModulesCode,
+              cacheHit: false,
+              errorMessage: e?.message,
+              ...(e?.message?.includes(
+                'cannot be used outside of module code',
+              ) && {
+                tip: 'Remove nested import to support SWC transpilation and improve speed',
+              }),
+            });
+          }
         }
 
         return compilation;

From 14202008ac648e135328715a235e7551f40d5796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 7 Apr 2025 16:22:36 +0200
Subject: [PATCH 051/264] better tip on nested imports

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 0b3d9cc4a9..6402f4dc99 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -404,7 +404,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               ...(e?.message?.includes(
                 'cannot be used outside of module code',
               ) && {
-                tip: 'Remove nested import to support SWC transpilation and improve speed',
+                tip: 'Remove nested imports or replace them with require to support SWC and improve speed.',
               }),
             });
           }

From 681f59a20606b85b388b735547a6f71c5b7dc8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 7 Apr 2025 17:29:57 +0200
Subject: [PATCH 052/264] support swcConfig and plugin support

---
 packages/babel-compiler/babel-compiler.js | 278 +++++++++++++---------
 1 file changed, 169 insertions(+), 109 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 6402f4dc99..526b1cb215 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -42,9 +42,7 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
     const hasTSXSupport = inputFilePath.endsWith('.tsx');
     const hasJSXSupport = inputFilePath.endsWith('.jsx');
 
-    // Perform SWC transformation.
-    const transformed = SWC.transformSync(source, {
-      ...swcOptions,
+    const baseSwcConfig = {
       jsc: {
         target: 'es2015',
         parser: {
@@ -56,7 +54,19 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
       module: { type: 'es6' },
       minify: false,
       sourceMaps: true,
-    });
+    };
+    const nextSwcConfig =
+      Object.keys(swcOptions)?.length > 0
+        ? deepMerge(baseSwcConfig, swcOptions, [
+            'module.type',
+            'jsc.parser.syntax',
+            'jsc.parser.jsx',
+            'jsc.parser.tsx',
+          ])
+        : baseSwcConfig;
+
+    // Perform SWC transformation.
+    const transformed = SWC.transformSync(source, nextSwcConfig);
 
     let content = transformed.code;
 
@@ -88,110 +98,31 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
   });
 }
 
-function getMeteorAppDir() {
-  return process.cwd();
-}
-
-function getMeteorAppPackageJson() {
-  return JSON.parse(
-    fs.readFileSync(`${getMeteorAppDir()}/package.json`, 'utf-8'),
-  );
-}
-
-const _regexCache = new Map();
-
-function isRegexLike(str) {
-  return /[.*+?^${}()|[\]\\]/.test(str);
-}
-
-function color(text, code) {
-  return `\x1b[${code}m${text}\x1b[0m`;
-}
-
-function logTranspilation({
-  packageName,
-  inputFilePath,
-  usedSwc,
-  cacheHit,
-  isNodeModulesCode,
-  errorMessage = '',
-  tip = '',
-}) {
-  const transpiler = usedSwc ? 'SWC' : 'Babel';
-  const transpilerColor = usedSwc ? 32 : 33;
-  const label = color('[Transpiler]', 36);
-  const transpilerPart = `${label} Used ${color(
-    transpiler,
-    transpilerColor,
-  )} for`;
-  const filePathPadded = `${
-    packageName ? `${packageName}/` : ''
-  }${inputFilePath}`.padEnd(50);
-  let rawOrigin = '';
-  if (packageName) {
-    rawOrigin = `(package)`;
-  } else {
-    rawOrigin = isNodeModulesCode ? '(node_modules)' : '(app)';
-  }
-  const originPaddedRaw = rawOrigin.padEnd(35);
-  const originPaddedColored = packageName
-    ? originPaddedRaw
-    : isNodeModulesCode
-    ? color(originPaddedRaw, 90)
-    : color(originPaddedRaw, 35);
-  const cacheStatus = errorMessage
-    ? color('⚠️  Fallback', 33)
-    : usedSwc
-    ? cacheHit
-      ? color('🟢 Cache hit', 32)
-      : color('🔴 Cache miss', 31)
-    : '';
-  console.log(
-    `${transpilerPart} ${filePathPadded}${originPaddedColored}${cacheStatus}`,
-  );
-  if (errorMessage) {
-    console.log();
-    console.log(`  ↳ ${color('Error:', 31)} ${errorMessage}`);
-    if (tip) {
-      console.log();
-      console.log(`  ${color('💡 Tip:', 33)} ${tip}`);
-    }
-    console.log();
-  }
-}
-
-function isExcludedConfig(name, excludeList = [], startsWith) {
-  if (!name || !excludeList?.length) return false;
-  return excludeList.some(rule => {
-    if (name === rule) return true;
-    if (startsWith && name.startsWith(rule)) return true;
-    if (isRegexLike(rule)) {
-      let regex = _regexCache.get(rule);
-      if (!regex) {
-        try {
-          regex = new RegExp(rule);
-          _regexCache.set(rule, regex);
-        } catch (err) {
-          console.warn(`Invalid regex in exclude list: "${rule}"`);
-          return false;
-        }
-      }
-      return regex.test(name);
-    }
-
-    return false;
-  });
-}
-
 BCp.initializeMeteorAppConfig = function () {
   const currentLastModifiedConfigTime = fs
     .statSync(`${getMeteorAppDir()}/package.json`)
     ?.mtime?.getTime();
-  if (currentLastModifiedConfigTime !== this.lastModifiedConfigTime) {
-    this.lastModifiedConfigTime = currentLastModifiedConfigTime;
-    this.lastModifiedConfig = getMeteorAppPackageJson()?.meteor;
+  if (currentLastModifiedConfigTime !== this.lastModifiedMeteorConfigTime) {
+    this.lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
+    this.lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
   }
-  return this.lastModifiedConfig;
+  return this.lastModifiedMeteorConfig;
+};
+
+BCp.initializeMeteorAppSwcrc = function () {
+  if (!fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
+    this.lastModifiedSwcConfig = {};
+    return;
+  }
+
+  const currentLastModifiedConfigTime = fs
+    .statSync(`${getMeteorAppDir()}/.swcrc`)
+    ?.mtime?.getTime();
+  if (currentLastModifiedConfigTime !== this.lastModifiedSwcConfigTime) {
+    this.lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
+    this.lastModifiedSwcConfig = getMeteorAppSwcrc();
+  }
+  return this.lastModifiedSwcConfig;
 };
 
 BCp.processFilesForTarget = function (inputFiles) {
@@ -201,6 +132,7 @@ BCp.processFilesForTarget = function (inputFiles) {
   this._babelrcCache = null;
 
   this.initializeMeteorAppConfig();
+  this.initializeMeteorAppSwcrc();
 
   inputFiles.forEach(function (inputFile) {
     if (inputFile.supportsLazyCompilation) {
@@ -317,7 +249,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
         const isAppCode = packageName == null && !isNodeModulesCode;
         const isPackageCode = packageName != null;
-        const config = this.lastModifiedConfig?.modernTranspiler;
+        const config = this.lastModifiedMeteorConfig?.modernTranspiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
           !hasModernTranspiler ||
@@ -342,16 +274,16 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                 `${packageName}/${inputFilePath}`,
                 config.excludePackages || [],
               )));
+
+        const cacheKey = `${toBeAdded.hash}${this.lastModifiedSwcConfigTime ||''}`;
         // Determine if SWC should be used based on package and file criteria.
-        const shouldUseSwc =
-          !shouldSkipSwc && !this._swcIncompatible[toBeAdded.hash];
+        const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
 
         let compilation;
         try {
           let usedSwc = false;
           if (shouldUseSwc) {
             // Create a cache key based on the source hash and the compiler used
-            const cacheKey = toBeAdded.hash;
             // Check cache
             compilation = this.readFromSwcCache({ cacheKey });
             // Return cached result if found.
@@ -369,7 +301,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             }
             compilation = compileWithSwc(
               source,
-              {},
+              this.lastModifiedSwcConfig,
               { inputFilePath, features },
             );
             // Save result in cache
@@ -390,7 +322,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             });
           }
         } catch (e) {
-          this._swcIncompatible[toBeAdded.hash] = true;
+          this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
@@ -869,3 +801,131 @@ BCp.writeToSwcCache = function({ cacheKey, compilation }) {
     }
   }
 };
+
+function getMeteorAppDir() {
+  return process.cwd();
+}
+
+function getMeteorAppPackageJson() {
+  return JSON.parse(
+    fs.readFileSync(`${getMeteorAppDir()}/package.json`, 'utf-8'),
+  );
+}
+
+function getMeteorAppSwcrc() {
+  try {
+    return JSON.parse(fs.readFileSync(`${getMeteorAppDir()}/.swcrc`, 'utf-8'));
+  } catch (e) {
+    console.error('Error parsing .swcrc file', e);
+  }
+}
+
+const _regexCache = new Map();
+
+function isRegexLike(str) {
+  return /[.*+?^${}()|[\]\\]/.test(str);
+}
+
+function isExcludedConfig(name, excludeList = [], startsWith) {
+  if (!name || !excludeList?.length) return false;
+  return excludeList.some(rule => {
+    if (name === rule) return true;
+    if (startsWith && name.startsWith(rule)) return true;
+    if (isRegexLike(rule)) {
+      let regex = _regexCache.get(rule);
+      if (!regex) {
+        try {
+          regex = new RegExp(rule);
+          _regexCache.set(rule, regex);
+        } catch (err) {
+          console.warn(`Invalid regex in exclude list: "${rule}"`);
+          return false;
+        }
+      }
+      return regex.test(name);
+    }
+
+    return false;
+  });
+}
+
+function color(text, code) {
+  return `\x1b[${code}m${text}\x1b[0m`;
+}
+
+function logTranspilation({
+  packageName,
+  inputFilePath,
+  usedSwc,
+  cacheHit,
+  isNodeModulesCode,
+  errorMessage = '',
+  tip = '',
+}) {
+  const transpiler = usedSwc ? 'SWC' : 'Babel';
+  const transpilerColor = usedSwc ? 32 : 33;
+  const label = color('[Transpiler]', 36);
+  const transpilerPart = `${label} Used ${color(
+    transpiler,
+    transpilerColor,
+  )} for`;
+  const filePathPadded = `${
+    packageName ? `${packageName}/` : ''
+  }${inputFilePath}`.padEnd(50);
+  let rawOrigin = '';
+  if (packageName) {
+    rawOrigin = `(package)`;
+  } else {
+    rawOrigin = isNodeModulesCode ? '(node_modules)' : '(app)';
+  }
+  const originPaddedRaw = rawOrigin.padEnd(35);
+  const originPaddedColored = packageName
+    ? originPaddedRaw
+    : isNodeModulesCode
+    ? color(originPaddedRaw, 90)
+    : color(originPaddedRaw, 35);
+  const cacheStatus = errorMessage
+    ? color('⚠️  Fallback', 33)
+    : usedSwc
+    ? cacheHit
+      ? color('🟢 Cache hit', 32)
+      : color('🔴 Cache miss', 31)
+    : '';
+  console.log(
+    `${transpilerPart} ${filePathPadded}${originPaddedColored}${cacheStatus}`,
+  );
+  if (errorMessage) {
+    console.log();
+    console.log(`  ↳ ${color('Error:', 31)} ${errorMessage}`);
+    if (tip) {
+      console.log();
+      console.log(`  ${color('💡 Tip:', 33)} ${tip}`);
+    }
+    console.log();
+  }
+}
+
+function deepMerge(target, source, preservePaths, inPath = '') {
+  for (const key in source) {
+    const fullPath = inPath ? `${inPath}.${key}` : key;
+
+    // Skip preserved paths
+    if (preservePaths.includes(fullPath)) continue;
+
+    if (
+      typeof source[key] === 'object' &&
+      source[key] !== null &&
+      !Array.isArray(source[key])
+    ) {
+      target[key] = deepMerge(
+        target[key] || {},
+        source[key],
+        preservePaths,
+        fullPath,
+      );
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}

From 630fb0ef233b1e658ffc7afbd114013e6ef5fb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 7 Apr 2025 17:59:24 +0200
Subject: [PATCH 053/264] print configs in verbose modes

---
 packages/babel-compiler/babel-compiler.js | 52 +++++++++++++++++------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 526b1cb215..0d88ec35dd 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -98,31 +98,42 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
   });
 }
 
+let lastModifiedMeteorConfig;
+let lastModifiedMeteorConfigTime;
 BCp.initializeMeteorAppConfig = function () {
   const currentLastModifiedConfigTime = fs
     .statSync(`${getMeteorAppDir()}/package.json`)
     ?.mtime?.getTime();
-  if (currentLastModifiedConfigTime !== this.lastModifiedMeteorConfigTime) {
-    this.lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
-    this.lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
+  if (currentLastModifiedConfigTime !== lastModifiedMeteorConfigTime) {
+    lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
+    lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
+
+    if (lastModifiedMeteorConfig?.modernTranspiler?.verbose) {
+      logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
+    }
   }
-  return this.lastModifiedMeteorConfig;
+  return lastModifiedMeteorConfig;
 };
 
+let lastModifiedSwcConfig;
+let lastModifiedSwcConfigTime;
 BCp.initializeMeteorAppSwcrc = function () {
   if (!fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
-    this.lastModifiedSwcConfig = {};
+    lastModifiedSwcConfig = {};
     return;
   }
-
   const currentLastModifiedConfigTime = fs
     .statSync(`${getMeteorAppDir()}/.swcrc`)
     ?.mtime?.getTime();
-  if (currentLastModifiedConfigTime !== this.lastModifiedSwcConfigTime) {
-    this.lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
-    this.lastModifiedSwcConfig = getMeteorAppSwcrc();
+  if (currentLastModifiedConfigTime !== lastModifiedSwcConfigTime) {
+    lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
+    lastModifiedSwcConfig = getMeteorAppSwcrc();
+
+    if (lastModifiedMeteorConfig?.modernTranspiler?.verbose) {
+      logConfigBlock('SWC Config', lastModifiedSwcConfig);
+    }
   }
-  return this.lastModifiedSwcConfig;
+  return lastModifiedSwcConfig;
 };
 
 BCp.processFilesForTarget = function (inputFiles) {
@@ -249,7 +260,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
         const isAppCode = packageName == null && !isNodeModulesCode;
         const isPackageCode = packageName != null;
-        const config = this.lastModifiedMeteorConfig?.modernTranspiler;
+        const config = lastModifiedMeteorConfig?.modernTranspiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
           !hasModernTranspiler ||
@@ -275,7 +286,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                 config.excludePackages || [],
               )));
 
-        const cacheKey = `${toBeAdded.hash}${this.lastModifiedSwcConfigTime ||''}`;
+        const cacheKey = `${toBeAdded.hash}${lastModifiedSwcConfigTime ||''}`;
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
 
@@ -301,7 +312,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             }
             compilation = compileWithSwc(
               source,
-              this.lastModifiedSwcConfig,
+              lastModifiedSwcConfig,
               { inputFilePath, features },
             );
             // Save result in cache
@@ -905,6 +916,21 @@ function logTranspilation({
   }
 }
 
+function logConfigBlock(description, configObject) {
+  const label = color('[Config]', 36);
+  const descriptionColor = color(description, 90);
+
+  console.log(`${label} ${descriptionColor}`);
+
+  const configLines = JSON.stringify(configObject, null, 2)
+    .replace(/"([^"]+)":/g, '$1:')
+    .split('\n')
+    .map(line => '  ' + line);
+
+  configLines.forEach(line => console.log(line));
+  console.log();
+}
+
 function deepMerge(target, source, preservePaths, inPath = '') {
   for (const key in source) {
     const fullPath = inPath ? `${inPath}.${key}` : key;

From 9370fdfd9c705b85b1b2871ab1fe5a3d33aca84f Mon Sep 17 00:00:00 2001
From: Welkin Wong <welkin.wong@me.com>
Date: Tue, 8 Apr 2025 15:32:06 +0800
Subject: [PATCH 054/264] DEV: Enhance type definitions for Meteor methods

---
 packages/meteor/meteor.d.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/meteor/meteor.d.ts b/packages/meteor/meteor.d.ts
index 94f4a9753f..d14ec0d1ef 100644
--- a/packages/meteor/meteor.d.ts
+++ b/packages/meteor/meteor.d.ts
@@ -162,14 +162,26 @@ export namespace Meteor {
    * @param name Name of method to invoke
    * @param args Optional method arguments
    */
-  function call(name: string, ...args: any[]): any;
+  function call<
+    Result extends
+      | EJSONable
+      | EJSONable[]
+      | EJSONableProperty
+      | EJSONableProperty[]
+  >(name: string, ...args: any[]): Result;
 
   /**
    * Invokes a method with an async stub, passing any number of arguments.
    * @param name Name of method to invoke
    * @param args Optional method arguments
    */
-  function callAsync(name: string, ...args: any[]): Promise<any>;
+  function callAsync<
+    Result extends
+      | EJSONable
+      | EJSONable[]
+      | EJSONableProperty
+      | EJSONableProperty[]
+  >(name: string, ...args: any[]): Promise<Result> & { stubPromise: Promise<Result>, serverPromise: Promise<Result> };
 
   interface MethodApplyOptions<
     Result extends
@@ -226,7 +238,7 @@ export namespace Meteor {
       error: global_Error | Meteor.Error | undefined,
       result?: Result
     ) => void
-  ): any;
+  ): Result;
 
   /**
    * Invokes a method with an async stub, passing any number of arguments.
@@ -249,7 +261,7 @@ export namespace Meteor {
       error: global_Error | Meteor.Error | undefined,
       result?: Result
     ) => void
-  ): Promise<Result>;
+  ): Promise<Result> & { stubPromise: Promise<Result>, serverPromise: Promise<Result> };
   /** Method **/
 
   /** Url **/

From 51dbad059b9fe06dc5f22b2a122c9a1b7c0ffbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 14:56:36 +0200
Subject: [PATCH 055/264] support SWC for legacy browsers

---
 packages/babel-compiler/babel-compiler.js | 53 ++++++++++++++++++++---
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 0d88ec35dd..3694b56c26 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -35,16 +35,17 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
+function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
   return profile('SWC.compile', function () {
     // Determine file extension based syntax.
     const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
     const hasTSXSupport = inputFilePath.endsWith('.tsx');
     const hasJSXSupport = inputFilePath.endsWith('.jsx');
 
+    const isLegacyWebArch = arch.includes('legacy');
     const baseSwcConfig = {
       jsc: {
-        target: 'es2015',
+        ...!isLegacyWebArch && { target: 'es2015' },
         parser: {
           syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
           jsx: hasJSXSupport,
@@ -54,10 +55,14 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features }) {
       module: { type: 'es6' },
       minify: false,
       sourceMaps: true,
+      ...isLegacyWebArch && {
+        env: { targets: lastModifiedSwcLegacyConfig || {} },
+      },
     };
     const nextSwcConfig =
       Object.keys(swcOptions)?.length > 0
         ? deepMerge(baseSwcConfig, swcOptions, [
+            'env.targets',
             'module.type',
             'jsc.parser.syntax',
             'jsc.parser.jsx',
@@ -136,6 +141,16 @@ BCp.initializeMeteorAppSwcrc = function () {
   return lastModifiedSwcConfig;
 };
 
+let lastModifiedSwcLegacyConfig;
+BCp.initializeMeteorAppLegacyConfig = function () {
+  const swcLegacyConfig = convertBabelTargetsForSwc(Babel.getMinimumModernBrowserVersions());
+  if (lastModifiedMeteorConfig?.modernTranspiler?.verbose && !lastModifiedSwcLegacyConfig) {
+    logConfigBlock('SWC Legacy Config', swcLegacyConfig);
+  }
+  lastModifiedSwcLegacyConfig = swcLegacyConfig;
+  return lastModifiedSwcConfig;
+};
+
 BCp.processFilesForTarget = function (inputFiles) {
   var compiler = this;
 
@@ -144,6 +159,7 @@ BCp.processFilesForTarget = function (inputFiles) {
 
   this.initializeMeteorAppConfig();
   this.initializeMeteorAppSwcrc();
+  this.initializeMeteorAppLegacyConfig();
 
   inputFiles.forEach(function (inputFile) {
     if (inputFile.supportsLazyCompilation) {
@@ -260,6 +276,8 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
         const isAppCode = packageName == null && !isNodeModulesCode;
         const isPackageCode = packageName != null;
+        const isLegacyWebArch = arch.includes('legacy');
+
         const config = lastModifiedMeteorConfig?.modernTranspiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
@@ -267,6 +285,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           (isAppCode && config.excludeApp === true) ||
           (isNodeModulesCode && config.excludeNodeModules === true) ||
           (isPackageCode && config.excludePackages === true) ||
+          (isLegacyWebArch && config.excludeLegacy === true) ||
           (isAppCode &&
             Array.isArray(config.excludeApp) &&
             isExcludedConfig(inputFilePath, config.excludeApp || [])) ||
@@ -286,7 +305,9 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                 config.excludePackages || [],
               )));
 
-        const cacheKey = `${toBeAdded.hash}${lastModifiedSwcConfigTime ||''}`;
+        const cacheKey = `${toBeAdded.hash}${lastModifiedSwcConfigTime || ''}${
+          isLegacyWebArch ? 'legacy' : ''
+        }`;
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
 
@@ -306,6 +327,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   packageName,
                   isNodeModulesCode,
                   cacheHit: true,
+                  arch,
                 });
               }
               return compilation;
@@ -313,7 +335,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             compilation = compileWithSwc(
               source,
               lastModifiedSwcConfig,
-              { inputFilePath, features },
+              { inputFilePath, features, arch },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
@@ -330,6 +352,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               packageName,
               isNodeModulesCode,
               cacheHit: false,
+              arch,
             });
           }
         } catch (e) {
@@ -343,6 +366,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               packageName,
               isNodeModulesCode,
               cacheHit: false,
+              arch,
               errorMessage: e?.message,
               ...(e?.message?.includes(
                 'cannot be used outside of module code',
@@ -870,6 +894,7 @@ function logTranspilation({
   usedSwc,
   cacheHit,
   isNodeModulesCode,
+  arch,
   errorMessage = '',
   tip = '',
 }) {
@@ -902,8 +927,9 @@ function logTranspilation({
       ? color('🟢 Cache hit', 32)
       : color('🔴 Cache miss', 31)
     : '';
+  const archPart = arch ? color(` (${arch})`, 90) : '';
   console.log(
-    `${transpilerPart} ${filePathPadded}${originPaddedColored}${cacheStatus}`,
+    `${transpilerPart} ${filePathPadded}${originPaddedColored}${cacheStatus}${archPart}`,
   );
   if (errorMessage) {
     console.log();
@@ -955,3 +981,20 @@ function deepMerge(target, source, preservePaths, inPath = '') {
   }
   return target;
 }
+
+function convertBabelTargetsForSwc(babelTargets) {
+  const allowedEnvs = new Set([
+    'chrome', 'opera', 'edge', 'firefox', 'safari',
+    'ie', 'ios', 'android', 'node', 'electron'
+  ]);
+
+  const filteredTargets = {};
+  for (const [env, version] of Object.entries(babelTargets)) {
+    if (allowedEnvs.has(env)) {
+      // Convert an array version (e.g., [10, 3]) into "10.3", otherwise convert to string.
+      filteredTargets[env] = Array.isArray(version) ? version.join('.') : version.toString();
+    }
+  }
+
+  return filteredTargets;
+}

From 40a3cedce9a66d37a2cb3f530b41c5adae6534fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 16:01:45 +0200
Subject: [PATCH 056/264] clean

---
 packages/babel-compiler/babel-compiler.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 3694b56c26..03176da2dd 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -305,9 +305,13 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                 config.excludePackages || [],
               )));
 
-        const cacheKey = `${toBeAdded.hash}${lastModifiedSwcConfigTime || ''}${
-          isLegacyWebArch ? 'legacy' : ''
-        }`;
+        const cacheKey = [
+          toBeAdded.hash,
+          lastModifiedSwcConfigTime,
+          isLegacyWebArch ? 'legacy' : '',
+        ]
+          .filter(Boolean)
+          .join('-');
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
 

From 9e9c1be76fd7505a7f4a111f80adce8dbe8889c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 16:21:40 +0200
Subject: [PATCH 057/264] use a meteor-specific version for SWC

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 packages/babel-compiler/package.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 03176da2dd..18bd05f828 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -1,6 +1,6 @@
 var semver = Npm.require("semver");
 var JSON5 = Npm.require("json5");
-var SWC = Npm.require("@swc/core");
+var SWC = Npm.require("@meteorjs/swc-core");
 const reifyCompile = Npm.require("@meteorjs/reify/lib/compiler").compile;
 const reifyAcornParse = Npm.require("@meteorjs/reify/lib/parsers/acorn").parse;
 var fs = Npm.require('fs');
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 812b3e96af..0e9c3c420d 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -8,7 +8,7 @@ Npm.depends({
   '@meteorjs/babel': '7.20.1',
   'json5': '2.2.3',
   'semver': '7.6.3',
-  "@swc/core": "1.11.11",
+  "@meteorjs/swc-core": "1.1.2",
 });
 
 Package.onUse(function (api) {

From 252303441446260f4971ca0836f24064e7bf7b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 16:31:32 +0200
Subject: [PATCH 058/264] fix syntax

---
 packages/babel-compiler/babel-compiler.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 18bd05f828..73a39d28b5 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -45,7 +45,7 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
     const isLegacyWebArch = arch.includes('legacy');
     const baseSwcConfig = {
       jsc: {
-        ...!isLegacyWebArch && { target: 'es2015' },
+        ...(!isLegacyWebArch && { target: 'es2015' }),
         parser: {
           syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
           jsx: hasJSXSupport,
@@ -55,9 +55,9 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
       module: { type: 'es6' },
       minify: false,
       sourceMaps: true,
-      ...isLegacyWebArch && {
+      ...(isLegacyWebArch && {
         env: { targets: lastModifiedSwcLegacyConfig || {} },
-      },
+      }),
     };
     const nextSwcConfig =
       Object.keys(swcOptions)?.length > 0

From c69e757bb7686f7b1b8df5ceaf6d37f9deaff4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 16:32:57 +0200
Subject: [PATCH 059/264] remove un-required @swc/core from the meteor bundler

---
 scripts/dev-bundle-tool-package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 60cc8d69fa..2b92b9e5f6 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -68,7 +68,6 @@ var packageJson = {
     'xmlbuilder2': '1.8.1',
     "ws": "7.4.5",
     "open":"8.4.2",
-    "@swc/core": "1.11.11",
     "acorn": "8.14.1",
   }
 };

From 9d9de24b322cca2845f41219062f889a2c27b354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 16:39:07 +0200
Subject: [PATCH 060/264] ignore server babel-compiler file from the check
 legacy syntax as node 22 is modern enough

---
 packages/babel-compiler/babel-compiler.js         | 8 ++++----
 scripts/admin/check-legacy-syntax/check-syntax.js | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 73a39d28b5..c7e4354207 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -84,12 +84,12 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
       avoidModernSyntax: true,
       enforceStrictMode: false,
       dynamicImport: true,
-      ...features.topLevelAwait && { topLevelAwait: true },
-      ...features.compileForShell && { moduleAlias: 'module' },
-      ...(features.modernBrowsers || features.nodeMajorVersion >= 8) && {
+      ...(features.topLevelAwait && { topLevelAwait: true }),
+      ...(features.compileForShell && { moduleAlias: 'module' }),
+      ...((features.modernBrowsers || features.nodeMajorVersion >= 8) && {
         avoidModernSyntax: false,
         generateLetDeclarations: true,
-      },
+      }),
     });
     if (!result.identical) {
       content = result.code;
diff --git a/scripts/admin/check-legacy-syntax/check-syntax.js b/scripts/admin/check-legacy-syntax/check-syntax.js
index d5a1db490f..58b1ce1284 100644
--- a/scripts/admin/check-legacy-syntax/check-syntax.js
+++ b/scripts/admin/check-legacy-syntax/check-syntax.js
@@ -42,6 +42,7 @@ const packages = {
   autopublish: {},
   "babel-compiler": {
     serverFiles: ["babel.js", "babel-compiler.js"],
+    ignoredFiles: ["babel-compiler.js"],
   },
   "babel-runtime": {},
   "browser-policy": {},

From 7bae9b5c91bca0b36b9de69a5edc94a07521508a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 17:05:47 +0200
Subject: [PATCH 061/264] bump meteor bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 0c7f6125a9..70ccbf127d 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.5
+BUNDLE_VERSION=22.14.0.6
 
 
 # OS Check. Put here because here is where we download the precompiled

From 5239dc5da9ba1894b6509f77eab3b70fd8abc7b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 19:45:10 +0200
Subject: [PATCH 062/264] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 70ccbf127d..07a1b72746 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.6
+BUNDLE_VERSION=22.14.0.7
 
 
 # OS Check. Put here because here is where we download the precompiled

From f23c7dac5967a60652d64b929c85dd690c759371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 8 Apr 2025 19:50:23 +0200
Subject: [PATCH 063/264] re-run checks


From b8b59b0b7daec466762d37817d504993e74d1a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Apr 2025 10:39:38 +0200
Subject: [PATCH 064/264] re-run checks


From 3a039e56f4d9c57501f4f4a4a2079605e4ec8926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Apr 2025 14:26:54 +0200
Subject: [PATCH 065/264] precheck on meteor config

---
 packages/babel-compiler/babel-compiler.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index c7e4354207..6f668817bd 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -106,6 +106,9 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
 BCp.initializeMeteorAppConfig = function () {
+  if (!fs.existsSync(`${getMeteorAppDir()}/package.json`)) {
+    return;
+  }
   const currentLastModifiedConfigTime = fs
     .statSync(`${getMeteorAppDir()}/package.json`)
     ?.mtime?.getTime();

From a5022137db1bb9cf7835e483f5ec5c548da965a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Apr 2025 14:28:06 +0200
Subject: [PATCH 066/264] precheck on meteor config

---
 packages/babel-compiler/babel-compiler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 6f668817bd..6bf6c85fea 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -106,7 +106,7 @@ function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
 BCp.initializeMeteorAppConfig = function () {
-  if (!fs.existsSync(`${getMeteorAppDir()}/package.json`)) {
+  if (!lastModifiedMeteorConfig && !fs.existsSync(`${getMeteorAppDir()}/package.json`)) {
     return;
   }
   const currentLastModifiedConfigTime = fs
@@ -126,7 +126,7 @@ BCp.initializeMeteorAppConfig = function () {
 let lastModifiedSwcConfig;
 let lastModifiedSwcConfigTime;
 BCp.initializeMeteorAppSwcrc = function () {
-  if (!fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
+  if (!lastModifiedSwcConfig && !fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
     lastModifiedSwcConfig = {};
     return;
   }

From 3a583d50503863f7ac39005ccad044429e556fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Apr 2025 15:04:22 +0200
Subject: [PATCH 067/264] fix ci

---
 packages/babel-compiler/babel-compiler.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 6bf6c85fea..d323554201 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -35,7 +35,7 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions, { inputFilePath, features, arch }) {
+function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch }) {
   return profile('SWC.compile', function () {
     // Determine file extension based syntax.
     const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
@@ -127,7 +127,6 @@ let lastModifiedSwcConfig;
 let lastModifiedSwcConfigTime;
 BCp.initializeMeteorAppSwcrc = function () {
   if (!lastModifiedSwcConfig && !fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
-    lastModifiedSwcConfig = {};
     return;
   }
   const currentLastModifiedConfigTime = fs

From f1684b42fef2a53b14ebe140b9c518d3261829d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 11:00:48 +0200
Subject: [PATCH 068/264] ensure web.cordova arch is forced when cordova
 commands

---
 tools/cli/commands.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 40b2cfc34e..6b3c2168ff 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -271,11 +271,15 @@ function isModernArchsOnlyEnabled(appDir) {
   return packageJson?.meteor?.modernWebArchsOnly === true;
 }
 
-function filterWebArchs(webArchs, excludeArchsOption, appDir) {
-  const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
-  if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
-    const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
-    webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
+function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
+  const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
+  if (!isCordovaEnabled) {
+    const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
+    if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
+      const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
+      webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
+    }
+    return webArchs;
   }
   return webArchs;
 }
@@ -519,7 +523,7 @@ async function doRunCommand(options) {
     }
   }
 
-  webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir);
+  webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir, options);
   const buildMode = options.production ? 'production' : 'development';
 
   let cordovaRunner;
@@ -1415,7 +1419,7 @@ on an OS X system.");
 
     webArchs = filteredArchs.length ? filteredArchs : undefined;
   } else {
-    webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir);
+    webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir, options);
   }
 
   var buildDir = projectContext.getProjectLocalDirectory('build_tar');
@@ -2477,7 +2481,7 @@ var runTestAppForPackages = async function (projectContext, options) {
   if (options.cordovaRunner) {
     webArchs.push("web.cordova");
   }
-  buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory);
+  buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory, options);
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.

From fb37a8ee2d2b114ecd39ffabada78fd6626ddab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 12:00:02 +0200
Subject: [PATCH 069/264] ensure web.browser.legacy arch is forced when build
 commands except if configured modern-only

---
 tools/cli/commands.js | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 6b3c2168ff..178f9aaf64 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -272,14 +272,29 @@ function isModernArchsOnlyEnabled(appDir) {
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
-  const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
-  if (!isCordovaEnabled) {
-    const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
-    if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
-      const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
-      webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
+  const platforms = (options.platforms || []);
+  const isBuildMode = platforms?.length > 0;
+  if (isBuildMode) {
+    // Build Mode
+    const isModernOnlyPlatform = platforms.includes('modern') && !platforms.includes('legacy');
+    if (isModernOnlyPlatform) {
+      webArchs = webArchs.filter(arch => arch !== 'web.browser.legacy');
+    }
+    const hasCordovaPlatforms = platforms.includes('android') || platforms.includes('ios');
+    if (!hasCordovaPlatforms) {
+      webArchs = webArchs.filter(arch => arch !== 'web.cordova');
+    }
+  } else {
+    // Dev & Test Mode
+    const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
+    if (!isCordovaEnabled) {
+      const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
+      if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
+        const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
+        webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
+      }
+      return webArchs;
     }
-    return webArchs;
   }
   return webArchs;
 }
@@ -1419,7 +1434,10 @@ on an OS X system.");
 
     webArchs = filteredArchs.length ? filteredArchs : undefined;
   } else {
-    webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir, options);
+    webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir, {
+      ...options,
+      platforms: projectContext.platformList.getPlatforms(),
+    });
   }
 
   var buildDir = projectContext.getProjectLocalDirectory('build_tar');

From cf0c412ea61c995d0d336cb33a051ac62d3a8ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 12:06:37 +0200
Subject: [PATCH 070/264] clean

---
 tools/cli/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 178f9aaf64..6f152f371a 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -286,8 +286,8 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
     }
   } else {
     // Dev & Test Mode
-    const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
-    if (!isCordovaEnabled) {
+    const isCordovaDev = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
+    if (!isCordovaDev) {
       const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
       if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
         const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];

From f628ed9745351355a0a72f0a9144ef9c0c61e58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 13:53:36 +0200
Subject: [PATCH 071/264] support build option to profile builds

---
 tools/cli/commands.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 40b2cfc34e..55c5fe08c4 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3362,7 +3362,7 @@ const setupBenchmarkSuite = async (profilingPath) => {
   process.env.GIT_TERMINAL_PROMPT = 0;
 
   const repoUrl = "https://github.com/meteor/performance";
-  const branch = "v3.2.0";
+  const branch = "v3.3.0";
   const gitCommand = [
     `mkdir -p ${profilingPath}`,
     `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${profilingPath}`,
@@ -3401,9 +3401,10 @@ async function doBenchmarkCommand(options) {
 
   const meteorSizeEnvs = [
     !!options['size-only'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
-    !!options['size'] && 'METEOR_BUNDLE_SIZE=true'
+    !!options['size'] && 'METEOR_BUNDLE_SIZE=true',
+    !!options['build'] && 'METEOR_BUNDLE_BUILD=true',
   ].filter(Boolean);
-  const meteorOptions = args.filter(arg => !['--size-only', '--size'].includes(arg));
+  const meteorOptions = args.filter(arg => !['--size-only', '--size', '--build'].includes(arg));
 
   const profilingCommand = [
     `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${meteorOptions.join(' ')}`.trim(),
@@ -3420,8 +3421,9 @@ main.registerCommand(
   maxArgs: Infinity,
   options: {
     ...runCommandOptions.options || {},
-  'size': { type: Boolean },
-  'size-only': { type: Boolean },
+    'size': { type: Boolean },
+    'size-only': { type: Boolean },
+    'build': { type: Boolean },
   },
   catalogRefresh: new catalog.Refresh.Never(),
 }, doBenchmarkCommand);

From fcb317a31f6e6b9d68a69f6bc9253b60f60d1d70 Mon Sep 17 00:00:00 2001
From: Welkin Wong <welkin.wong@me.com>
Date: Thu, 10 Apr 2025 19:57:00 +0800
Subject: [PATCH 072/264] fix(webapp): prevent truncated agent string in
 lookupUserAgent (#13686)

* fix(webapp): prevent truncated agent string in lookupUserAgent

In useragent-ng's lookup function implementation, there are security validations and truncation checks for useragent length.  For certain useragent use cases where the length exceeds 150 characters, premature truncation before being passed to the lookup function results in incorrect agent identification.

* test(webapp): add tests for agent identification including special user agent
---
 packages/webapp/webapp_server.js |  2 +-
 packages/webapp/webapp_tests.js  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 552c3c8587..124e32c9d6 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -132,7 +132,7 @@ var identifyBrowser = function(userAgentString) {
       patch: 0
     };
   }
-  var userAgent = lookupUserAgent(userAgentString.substring(0, 150));
+  var userAgent = lookupUserAgent(userAgentString);
   return {
     name: camelCase(userAgent.family),
     major: +userAgent.major,
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index d4d40394f3..60e6ba8c34 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -153,6 +153,25 @@ Tinytest.addAsync("webapp - modern/legacy static files", test => {
   return Promise.all(promises);
 });
 
+const specialUserAgent =
+  "Mozilla/5.0 (Linux; Android 5.1.1; MI NOTE Pro Build/LMY47V; wv) " +
+  "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/48.0.2564.116 " +
+  "Mobile Safari/537.36 baidubrowser/7.7.13.0 (Baidu; P1 5.1.1)"
+
+Tinytest.addAsync("webapp - agent identification", async function (test) {
+  const modernBrowser = WebAppInternals.identifyBrowser(modernUserAgent);
+  test.equal(modernBrowser.name, "chrome");
+  test.equal(modernBrowser.major, 68);
+  test.equal(modernBrowser.minor, 0);
+  test.equal(modernBrowser.patch, 3440);
+
+  const specialBrowser = WebAppInternals.identifyBrowser(specialUserAgent);
+  test.equal(specialBrowser.name, "baiduBrowser");
+  test.equal(specialBrowser.major, 7);
+  test.equal(specialBrowser.minor, 7);
+  test.equal(specialBrowser.patch, 13);
+})
+
 Tinytest.addAsync(
   "webapp - additional static javascript",
   async function (test) {

From 7ced1c795e9409d0b7cb44b532d9c0982a82a219 Mon Sep 17 00:00:00 2001
From: ericm546 <eric@ericmartin.dev>
Date: Thu, 10 Apr 2025 13:57:30 +0200
Subject: [PATCH 073/264] Fix timing issue with oplog include/exclude
 collections (#13687)

* Fix timing issue with oplog include/exclude collections

* Add a test

---------

Co-authored-by: Jan Dvorak <hello@jandvorak.me>
---
 packages/mongo/oplog_tailing.ts     | 129 +++++++++++++++++-----------
 packages/mongo/tests/oplog_tests.js |  62 +++++++++++++
 2 files changed, 141 insertions(+), 50 deletions(-)

diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index d56bf8e8eb..2df4bf7aaa 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -37,13 +37,15 @@ export class OplogHandle {
   public _dbName: string;
   private _oplogLastEntryConnection: MongoConnection | null;
   private _oplogTailConnection: MongoConnection | null;
-  private _oplogOptions: { excludeCollections?: string[]; includeCollections?: string[] } | null;
+  private _oplogOptions: {
+    excludeCollections?: string[];
+    includeCollections?: string[];
+  };
   private _stopped: boolean;
   private _tailHandle: any;
   private _readyPromiseResolver: (() => void) | null;
   private _readyPromise: Promise<void>;
   public _crossbar: any;
-  private _baseOplogSelector: any;
   private _catchingUpResolvers: CatchingUpResolver[];
   private _lastProcessedTS: any;
   private _onSkippedEntriesHook: any;
@@ -61,29 +63,24 @@ export class OplogHandle {
     this._resolveTimeout = null;
     this._oplogLastEntryConnection = null;
     this._oplogTailConnection = null;
-    this._oplogOptions = null;
     this._stopped = false;
     this._tailHandle = null;
     this._readyPromiseResolver = null;
-    this._readyPromise = new Promise(r => this._readyPromiseResolver = r);
+    this._readyPromise = new Promise(r => this._readyPromiseResolver = r); 
     this._crossbar = new DDPServer._Crossbar({
       factPackage: "mongo-livedata", factName: "oplog-watchers"
     });
-    this._baseOplogSelector = {
-      ns: new RegExp("^(?:" + [
-        // @ts-ignore
-        Meteor._escapeRegExp(this._dbName + "."),
-        // @ts-ignore
-        Meteor._escapeRegExp("admin.$cmd"),
-      ].join("|") + ")"),
 
-      $or: [
-        { op: { $in: ['i', 'u', 'd'] } },
-        { op: 'c', 'o.drop': { $exists: true } },
-        { op: 'c', 'o.dropDatabase': 1 },
-        { op: 'c', 'o.applyOps': { $exists: true } },
-      ]
-    };
+    const includeCollections =
+      Meteor.settings?.packages?.mongo?.oplogIncludeCollections;
+    const excludeCollections =
+      Meteor.settings?.packages?.mongo?.oplogExcludeCollections;
+    if (includeCollections?.length && excludeCollections?.length) {
+      throw new Error(
+        "Can't use both mongo oplog settings oplogIncludeCollections and oplogExcludeCollections at the same time."
+      );
+    }
+    this._oplogOptions = { includeCollections, excludeCollections };
 
     this._catchingUpResolvers = [];
     this._lastProcessedTS = null;
@@ -95,6 +92,67 @@ export class OplogHandle {
     this._startTrailingPromise = this._startTailing();
   }
 
+  private _getOplogSelector(lastProcessedTS?: any): any {
+    const oplogCriteria: any = [
+      {
+        $or: [
+          { op: { $in: ["i", "u", "d"] } },
+          { op: "c", "o.drop": { $exists: true } },
+          { op: "c", "o.dropDatabase": 1 },
+          { op: "c", "o.applyOps": { $exists: true } },
+        ],
+      },
+    ];
+
+    const nsRegex = new RegExp(
+      "^(?:" +
+        [
+          // @ts-ignore
+          Meteor._escapeRegExp(this._dbName + "."),
+          // @ts-ignore
+          Meteor._escapeRegExp("admin.$cmd"),
+        ].join("|") +
+        ")"
+    );
+
+    if (this._oplogOptions.excludeCollections?.length) {
+      oplogCriteria.push({
+        ns: {
+          $regex: nsRegex,
+          $nin: this._oplogOptions.excludeCollections.map(
+            (collName: string) => `${this._dbName}.${collName}`
+          ),
+        },
+      });
+    } else if (this._oplogOptions.includeCollections?.length) {
+      oplogCriteria.push({
+        $or: [
+          { ns: /^admin\.\$cmd/ },
+          {
+            ns: {
+              $in: this._oplogOptions.includeCollections.map(
+                (collName: string) => `${this._dbName}.${collName}`
+              ),
+            },
+          },
+        ],
+      });
+    } else {
+      oplogCriteria.push({
+        ns: nsRegex,
+      });
+    }
+    if(lastProcessedTS) {
+      oplogCriteria.push({
+        ts: { $gt: lastProcessedTS },
+      });
+    }
+
+    return {
+      $and: oplogCriteria,
+    };
+  }
+
   async stop(): Promise<void> {
     if (this._stopped) return;
     this._stopped = true;
@@ -156,10 +214,11 @@ export class OplogHandle {
     let lastEntry: OplogEntry | null = null;
 
     while (!this._stopped) {
+      const oplogSelector = this._getOplogSelector();
       try {
         lastEntry = await this._oplogLastEntryConnection.findOneAsync(
           OPLOG_COLLECTION,
-          this._baseOplogSelector,
+          oplogSelector,
           { projection: { ts: 1 }, sort: { $natural: -1 } }
         );
         break;
@@ -238,41 +297,11 @@ export class OplogHandle {
         { sort: { $natural: -1 }, projection: { ts: 1 } }
       );
 
-      let oplogSelector: any = { ...this._baseOplogSelector };
+      const oplogSelector = this._getOplogSelector(lastOplogEntry?.ts);
       if (lastOplogEntry) {
-        oplogSelector.ts = { $gt: lastOplogEntry.ts };
         this._lastProcessedTS = lastOplogEntry.ts;
       }
 
-      const includeCollections = Meteor.settings?.packages?.mongo?.oplogIncludeCollections;
-      const excludeCollections = Meteor.settings?.packages?.mongo?.oplogExcludeCollections;
-
-      if (includeCollections?.length && excludeCollections?.length) {
-        throw new Error("Can't use both mongo oplog settings oplogIncludeCollections and oplogExcludeCollections at the same time.");
-      }
-
-      if (excludeCollections?.length) {
-        oplogSelector.ns = {
-          $regex: oplogSelector.ns,
-          $nin: excludeCollections.map((collName: string) => `${this._dbName}.${collName}`)
-        };
-        this._oplogOptions = { excludeCollections };
-      } else if (includeCollections?.length) {
-        oplogSelector = {
-          $and: [
-            {
-              $or: [
-                { ns: /^admin\.\$cmd/ },
-                { ns: { $in: includeCollections.map((collName: string) => `${this._dbName}.${collName}`) } }
-              ]
-            },
-            { $or: oplogSelector.$or },
-            { ts: oplogSelector.ts }
-          ]
-        };
-        this._oplogOptions = { includeCollections };
-      }
-
       const cursorDescription = new CursorDescription(
         OPLOG_COLLECTION,
         oplogSelector,
diff --git a/packages/mongo/tests/oplog_tests.js b/packages/mongo/tests/oplog_tests.js
index 201a09e904..eb6f5eb3df 100644
--- a/packages/mongo/tests/oplog_tests.js
+++ b/packages/mongo/tests/oplog_tests.js
@@ -281,6 +281,68 @@ process.env.MONGO_OPLOG_URL && Tinytest.addAsync(
   }
 );
 
+process.env.MONGO_OPLOG_URL &&
+  Tinytest.addAsync(
+    "mongo-livedata - oplog - oplogSettings - oplog doesn't get stuck on waitUntilCaughtUp",
+    async (test) => {
+      try {
+        const includeCollectionName = "oplog-a-" + Random.id();
+        const excludeCollectionName = "oplog-b-" + Random.id();
+        const mongoPackageSettings = {
+          oplogIncludeCollections: [includeCollectionName],
+        };
+
+        previousMongoPackageSettings = {
+          ...(Meteor.settings?.packages?.mongo || {}),
+        };
+        if (!Meteor.settings.packages) Meteor.settings.packages = {};
+        Meteor.settings.packages.mongo = mongoPackageSettings;
+
+        const myOplogHandle = new MongoInternals.OplogHandle(
+          process.env.MONGO_OPLOG_URL,
+          "meteor"
+        );
+        await myOplogHandle._startTrailingPromise;
+        MongoInternals.defaultRemoteCollectionDriver().mongo._setOplogHandle(
+          myOplogHandle
+        );
+
+        const IncludeCollection = new Mongo.Collection(includeCollectionName);
+        const ExcludeCollection = new Mongo.Collection(excludeCollectionName);
+        await IncludeCollection.rawCollection().insertOne({
+          include: "yes",
+          foo: "bar",
+        });
+      
+        // Previously, when the last document inserted in the oplog was excluded from the oplog tailing,
+        // waitUntilCaughtUp would hang until an oplog-tracked document was inserted.
+        // This was preventing the observeChange callbacks from being called.
+        await ExcludeCollection.rawCollection().insertOne({
+          include: "no",
+          foo: "bar",
+        });
+        const shouldBeTracked = Promise.race([
+          new Promise((resolve) => {
+            IncludeCollection.find({ include: "yes" }).observeChanges({
+              added() {
+                resolve(true);
+              },
+            });
+          }),
+          new Promise((resolve) => setTimeout(() => resolve(false), 2000)),
+        ]);
+
+        test.equal(await shouldBeTracked, true);
+      } finally {
+        // Reset:
+        Meteor.settings.packages.mongo = { ...previousMongoPackageSettings };
+        MongoInternals.defaultRemoteCollectionDriver().mongo._setOplogHandle(
+          defaultOplogHandle
+        );
+      }
+    }
+  );
+
 // TODO this is commented for now, but we need to find out the cause
 // PR: https://github.com/meteor/meteor/pull/12057
 // Meteor.isServer && Tinytest.addAsync(

From 89a0b645890a251a67b6d90e236eebcd0a770190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 14:01:53 +0200
Subject: [PATCH 074/264] document new build option

---
 tools/cli/help.txt        |  1 +
 v3-docs/docs/cli/index.md | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index 4694b83b50..d0c16928be 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1173,6 +1173,7 @@ Use METEOR_LOG_DIR=<path-to-directory> to set a custom log directory.
 Options:
   --size         monitor both bundle runtime and size
   --size-only    monitor only the bundle size
+  --build        monitor build time
 
 The rest of options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index e42054b913..08a114cfd9 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -175,13 +175,15 @@ This command monitors the bundler process and tracks key performance metrics to
 
 ### Options
 
-| Option | Description |
-|--------|-------------|
-| `--size` | Monitor both bundle runtime and size |
-| `--size-only` | Monitor only the bundle size |
+| Option        | Description                          |
+|---------------|--------------------------------------|
+| `--size`      | Monitor both bundle runtime and size |
+| `--size-only` | Monitor only the bundle size         |
+| `--build`     | Monitor build time                   |
 
 ::: info
 All other options from `meteor run` are also supported (e.g., `--settings`, `--exclude-archs`).
+If you use the --build option, it also accepts meteor build flags (e.g. `--mobile-settings`, `--architecture`).
 :::
 
 ### Environment Variables
@@ -211,6 +213,9 @@ METEOR_IDLE_TIMEOUT=120 meteor profile --settings settings.json
 
 # Profile with custom entrypoints
 METEOR_CLIENT_ENTRYPOINT=client/main.js METEOR_SERVER_ENTRYPOINT=server/main.js meteor profile
+
+# Monitor build time
+meteor profile --build
 ```
 
 ::: details Customizing the Profiling Process

From 86c106c66e29929c23c7b60fc1aa83546b4f90d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 14:02:49 +0200
Subject: [PATCH 075/264] document new build option

---
 v3-docs/docs/cli/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 08a114cfd9..05ef6d3a7b 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -208,14 +208,14 @@ meteor profile
 # Monitor bundle size only
 meteor profile --size-only
 
+# Monitor build time
+meteor profile --build
+
 # Profile with custom settings and timeout
 METEOR_IDLE_TIMEOUT=120 meteor profile --settings settings.json
 
 # Profile with custom entrypoints
 METEOR_CLIENT_ENTRYPOINT=client/main.js METEOR_SERVER_ENTRYPOINT=server/main.js meteor profile
-
-# Monitor build time
-meteor profile --build
 ```
 
 ::: details Customizing the Profiling Process

From d170fa1857308394cf7c3c047e3d0a2bdba48a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 10 Apr 2025 14:04:23 +0200
Subject: [PATCH 076/264] document new build option

---
 v3-docs/docs/cli/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 05ef6d3a7b..f5bdf21f66 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -219,7 +219,7 @@ METEOR_CLIENT_ENTRYPOINT=client/main.js METEOR_SERVER_ENTRYPOINT=server/main.js
 ```
 
 ::: details Customizing the Profiling Process
-You can pass any option that works with `meteor run` to customize the profiling process. This allows you to profile your application under specific conditions that match your deployment environment.
+You can pass any option that works with `meteor run` to customize the profiling process. This allows you to profile your application under specific conditions that match your deployment environment. The same applies to the `--build` option, which matches `meteor build` options.
 :::
 
 ## meteor create _app-name_ {#meteorcreate}

From 5f7580c3c93fcad9b5656230c7b4b001c62ac2e1 Mon Sep 17 00:00:00 2001
From: 9Morello <caio@quave.com.br>
Date: Thu, 10 Apr 2025 18:07:08 -0300
Subject: [PATCH 077/264] fix type definition of ServerSink (#13689)

---
 packages/server-render/server-render.d.ts | 27 ++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/server-render/server-render.d.ts b/packages/server-render/server-render.d.ts
index 8f55c0fe07..a920e2514f 100644
--- a/packages/server-render/server-render.d.ts
+++ b/packages/server-render/server-render.d.ts
@@ -19,9 +19,34 @@ export interface ClientSink {
   getCookies(): { [key: string]: string };
 }
 
+/**
+ * Meteor parses the user agent string in an attempt to identify the browser.
+ * This is used, for example, to determine whether to serve the modern
+ * or the legacy bundle, in case your app uses both..
+ */
+type IdentifiedBrowser = {
+  name: string;
+  major: number;
+  minor: number;
+  patch: number;
+}
+
+/**
+ * A categorized request is an IncomingMessage with a pre-parsed URL,
+ * and additional properties added by Meteor.
+ */
+export type CategorizedRequest = Omit<http.IncomingMessage, 'url'> & {
+  browser: IdentifiedBrowser;
+  dynamicHead: string | undefined;
+  dynamicBody: string | undefined;
+  modern: boolean;
+  path: string;
+  url: URL;
+}
+
 export interface ServerSink extends ClientSink {
   // Server-only:
-  request: http.IncomingMessage;
+  request: CategorizedRequest;
   arch: string;
   head: string;
   body: string;

From badcdeea1a30cadc969e9d0c086eea7b20f34345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 14:55:33 +0200
Subject: [PATCH 078/264] re-run checks


From c7c7b7bdcfd602354fa90e90592729c1d2bbcda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 15:51:59 +0200
Subject: [PATCH 079/264] re-run checks


From 132c8a676d1ebd35b9f3178adf859d9dcaade0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 16:08:01 +0200
Subject: [PATCH 080/264] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 745c3affbf..f131742641 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.4
+BUNDLE_VERSION=22.14.0.8
 
 
 # OS Check. Put here because here is where we download the precompiled

From 8a61d9faa29ad2fdafe7f63746dad385f485fa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 16:24:47 +0200
Subject: [PATCH 081/264] re-run checks


From 678064515a7762bbb30d04220087d4f653b8ec6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 18:07:49 +0200
Subject: [PATCH 082/264] ensure exclude-archs options override the modern arch
 package.json file

---
 tools/cli/commands.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 436e0ce778..2acc99eac6 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -288,9 +288,11 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
     // Dev & Test Mode
     const isCordovaDev = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
     if (!isCordovaDev) {
-      const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
-      if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
-        const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
+      const excludeArchsOptions = excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : [];
+      const hasExcludeArchsOptions = (excludeArchsOptions?.length || 0) > 0;
+      const automaticallyIgnoredLegacyArchs = (appDir && !hasExcludeArchsOptions && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
+      if (hasExcludeArchsOptions || automaticallyIgnoredLegacyArchs.length) {
+        const excludeArchs = [...excludeArchsOptions, ...automaticallyIgnoredLegacyArchs];
         webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
       }
       return webArchs;

From 083a1ad32cdf607ef84bd0dcb050f298275f609f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 18:15:16 +0200
Subject: [PATCH 083/264] add a warning on use modernWebArchsOnly and
 exclude-archs

---
 tools/cli/commands.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 2acc99eac6..c44a026cd7 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -290,7 +290,11 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
     if (!isCordovaDev) {
       const excludeArchsOptions = excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : [];
       const hasExcludeArchsOptions = (excludeArchsOptions?.length || 0) > 0;
-      const automaticallyIgnoredLegacyArchs = (appDir && !hasExcludeArchsOptions && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
+      const hasModernArchsOnlyEnabled = appDir && isModernArchsOnlyEnabled(appDir);
+      if (hasExcludeArchsOptions && hasModernArchsOnlyEnabled) {
+        console.warn('modernWebArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
+      }
+      const automaticallyIgnoredLegacyArchs = (!hasExcludeArchsOptions && hasModernArchsOnlyEnabled) ? ['web.browser.legacy', 'web.cordova'] : [];
       if (hasExcludeArchsOptions || automaticallyIgnoredLegacyArchs.length) {
         const excludeArchs = [...excludeArchsOptions, ...automaticallyIgnoredLegacyArchs];
         webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));

From c38491519e909a421abb83878104386ed0da9b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 18:30:41 +0200
Subject: [PATCH 084/264] add docs for SWC adoption

---
 v3-docs/docs/.vitepress/config.mts            |  14 +++
 v3-docs/docs/about/modern-build-stack.md      |  13 ++
 .../modern-build-stack/modern-bundler.md      |  19 +++
 .../modern-transpiler-swc.md                  | 113 ++++++++++++++++++
 4 files changed, 159 insertions(+)
 create mode 100644 v3-docs/docs/about/modern-build-stack.md
 create mode 100644 v3-docs/docs/about/modern-build-stack/modern-bundler.md
 create mode 100644 v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 83add47b6a..5e37b0ab0a 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -168,6 +168,20 @@ export default defineConfig({
             text: "Cordova",
             link: "/about/cordova",
           },
+          {
+            text: "Modern Build Stack",
+            link: "/about/modern-build-stack.md",
+            items: [
+              {
+                text: "Modern Transpiler: SWC",
+                link: "/about/modern-build-stack/modern-transpiler-swc.md",
+              },
+              {
+                text: "Modern Bundler",
+                link: "/about/modern-build-stack/modern-bundler.md",
+              },
+            ]
+          },
         ],
         collapsed: true,
       },
diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
new file mode 100644
index 0000000000..6facbd687d
--- /dev/null
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -0,0 +1,13 @@
+# Modern Build Stack
+
+The Meteor bundler is made up of several key components that enhance your experience both during development and when deploying to production. These include:
+
+- **Transpiler**: Responsible for converting each file into a syntax compatible across different browsers and runtime environments.
+- **Bundler**: Handles discovering your app’s files and dependencies, including Meteor packages and core modules, then links them into production-ready bundles. It also applies optimizations to produce lighter builds and faster processes.
+- **Dev Server**: During development, it watches for file changes, and supports fast feedback via HMR, bundle visualizers, debug tools, and more. At runtime, it provides a full-featured server environment with support for SSR and modern APIs powered by Express.
+
+To improve the development and deployment experience for all Meteor projects, we’re revamping each of these components with a focus on better performance, smarter tooling, and leaner bundle sizes:
+
+- **Modern Transpiler**: Meteor is adopting **SWC** as a faster alternative to Babel.
+- **Modern Bundler**: A new bundler will handle only your app’s code, supporting tree-shaking, popular plugins, and better features for both development and production. Meanwhile, Meteor’s core bundler will continue handling Meteor-specific tasks, such as compiling Atmosphere packages, with optimized workflows.
+- **Dev Server Enhancements**: The dev server remains a core part of Meteor, now with ongoing improvements in performance and developer features.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
new file mode 100644
index 0000000000..1c72489185
--- /dev/null
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -0,0 +1,19 @@
+# Modern bundler
+
+Meteor handles watching and linking all project files into the final bundle. While we'd like to offload more of this to modern bundlers, we're still focused on keeping what's left in the Meteor context as fast as possible.
+
+Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
+
+## Modern builds
+
+Starting with Meteor 3.3, new apps skip `web.browser.legacy` and `web.cordova` by default in development mode (unless developing for native).
+
+For existing apps, enable this by adding to `package.json`:
+
+```json
+"meteor": {
+  "modernWebArchsOnly": true
+}
+```
+
+This works like using `--exclude-archs web.browser.legacy,web.cordova` with `meteor run`.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
new file mode 100644
index 0000000000..006a5c15b3
--- /dev/null
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -0,0 +1,113 @@
+# Modern transpiler: SWC
+
+Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, often surpassing Babel.
+
+Since transpilation is one of the slowest steps in development, Meteor now gives you the option to use SWC for your apps.
+
+## Enable SWC
+
+Add this to your app's `package.json`:
+
+```json
+"meteor": {
+  "modernTranspiler": true
+}
+```
+
+When starting your app for web or native, SWC will handle all files: your app, npm packages, and Atmosphere packages. This also applies to production builds.
+
+## Verbose transpilation process
+
+To analyze and improve transpilation, you can enable verbose output. Add this to `package.json`:
+
+```json
+"meteor": {
+  "modernTranspiler": {
+	  "verbose": true
+  }
+}
+```
+
+This shows each file being processed, its context, cache usage, and whether it fell back to Babel due to incompatibilities.
+
+## Adapt your code to benefit from SWC
+
+If all your code uses SWC, you're good and can turn off verbosity. But if you see logs like:
+
+``` shell
+[Transpiler] Used Babel for <file>     (<context>)     Fallback
+  <more-details>
+```
+
+There are a few things you can do.
+
+First, check the fallback details. It may show why SWC couldn’t handle the file. A common reason is nested imports, `import` statements inside a function. Moving them to the top level may fix it. These nested imports work via a Babel plugin specific to Meteor, which SWC doesn’t support.
+
+Other reasons might involve features tied to Babel plugins. If so, you’ll need to find a similar plugin for SWC. See the [SWC plugin list](https://plugins.swc.rs/versions/range/271).
+
+Second, you might choose to ignore the fallback if those files are fine with Babel. Even with SWC enabled, Meteor will continue using Babel for those files on future rebuilds.
+
+Third, you can exclude files or contexts from SWC. For example, if you're using `babel-plugin-react-compiler`, you can exclude your app code adding this to `package.json`:
+
+```json
+"meteor": {
+  "modernTranspiler": {
+	  "excludeApp": true
+  }
+}
+```
+
+Or exclude only specific files like `.jsx`:
+
+```json
+"meteor": {
+  "modernTranspiler": {
+	  "excludeApp": ["\\.jsx"]
+  }
+}
+```
+
+You can also use `excludePackages`, `excludeNodeModules`, and `excludeLegacy` for finer control. See the `modernTranspiler` config docs for more.
+
+When no alternatives exist, these settings let you still get most of SWC’s speed benefits by limiting fallback use.
+
+We expect most apps will benefit just by enabling `modernTranspiler: true`. Most Meteor packages should work right away, except ones using nested imports. Node modules will mostly work too, since they follow common standards. Most app code should also work unless it depends on Babel-specific behavior.
+
+> Remember to turn off verbosity when you're done with optimizations.
+
+## User custom .swcrc
+
+You can use .swcrc config in the root of your project to describe specific [SWC plugins](https://github.com/swc-project/plugins) there, that will be applied to compile the entire files of your project.
+
+## Config API
+
+- `modernTranspiler: [true|false]`
+  Enables or disables the use of the modern transpiler (SWC). If disabled, Babel will be used directly instead.
+
+- `modernTranspiler.excludeApp: [true|false] or [string[]]`
+  If true, the app’s own code (outside of Meteor core and packages) will continue using Babel.
+  Otherwise, a list of file paths or regex-like patterns within the app to exclude from SWC transpilation.
+
+- `modernTranspiler.excludeNodeModules: [true|false] or [string[]]`
+  If true, the app’s node_modules will continue using Babel.
+  Otherwise, a list of NPM packages names, file paths or regex-like patterns within the node_modules folder to exclude from SWC transpilation.
+
+- `modernTranspiler.excludePackages: [true|false] or [string[]]`
+  If true, the Meteor’s packages will continue using Babel.
+  Otherwise, a list of package names, file paths or regex-like patterns within the package to exclude from SWC transpilation.
+
+- `modernTranspiler.excludeLegacy: [true|false]`
+  If true, the Meteor’s bundle for legacy browsers will continue using Babel.
+
+- `modernTranspiler.verbose: [true|false]`
+  If true, the transpilation process for files is shown when running the app. This helps understand which transpiler is used for each file, what fallbacks are applied, and gives a chance to either exclude files to always use Babel or migrate fully to SWC.
+
+## Troubleshotting
+
+If you run into issues, try `meteor reset` or delete the `.meteor` folder.
+
+For help or to report issues, post on [GitHub](https://github.com/meteor/meteor/issues) or the [Meteor forums](https://forums.meteor.com). We’re focused on making Meteor faster and your feedback helps.
+
+You can compare performance before and after enabling `modernTranspiler` by running [`meteor profile`](../../cli/index.md#meteorprofile). Share your results to show progress to others.
+
+> **[Check out modern bundler options](./modern-bundler.md) to improve performance and access newer build features.**

From a5fa1f8208f41cff5dfaca592ec28cfbe3dd28ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 18:41:59 +0200
Subject: [PATCH 085/264] fix docs

---
 v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 006a5c15b3..64aff0fe24 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -104,7 +104,7 @@ You can use .swcrc config in the root of your project to describe specific [SWC
 
 ## Troubleshotting
 
-If you run into issues, try `meteor reset` or delete the `.meteor` folder.
+If you run into issues, try `meteor reset` or delete the `.meteor/local` folder in the project root.
 
 For help or to report issues, post on [GitHub](https://github.com/meteor/meteor/issues) or the [Meteor forums](https://forums.meteor.com). We’re focused on making Meteor faster and your feedback helps.
 

From cc30ec881e2d38c72f024ac156a2e611bd7ca1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 19:02:40 +0200
Subject: [PATCH 086/264] fix docs

---
 .../docs/about/modern-build-stack/modern-transpiler-swc.md    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 64aff0fe24..66f7964a9d 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -67,7 +67,7 @@ Or exclude only specific files like `.jsx`:
 }
 ```
 
-You can also use `excludePackages`, `excludeNodeModules`, and `excludeLegacy` for finer control. See the `modernTranspiler` config docs for more.
+You can also use `excludePackages`, `excludeNodeModules`, and `excludeLegacy` for finer control. See the [`modernTranspiler` config docs](#config-api) for more.
 
 When no alternatives exist, these settings let you still get most of SWC’s speed benefits by limiting fallback use.
 
@@ -75,7 +75,7 @@ We expect most apps will benefit just by enabling `modernTranspiler: true`. Most
 
 > Remember to turn off verbosity when you're done with optimizations.
 
-## User custom .swcrc
+## Custom .swcrc
 
 You can use .swcrc config in the root of your project to describe specific [SWC plugins](https://github.com/swc-project/plugins) there, that will be applied to compile the entire files of your project.
 

From c26bc46b1591647caf508b9c3db009919304a2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 19:05:24 +0200
Subject: [PATCH 087/264] fix docs

---
 v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 66f7964a9d..3a8930089a 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -1,6 +1,6 @@
 # Modern transpiler: SWC
 
-Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, often surpassing Babel.
+Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, reaching parity with Babel.
 
 Since transpilation is one of the slowest steps in development, Meteor now gives you the option to use SWC for your apps.
 

From fdc5a5b64b8f9f2c37d83bc36505468bad0b74a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 14 Apr 2025 21:04:49 +0200
Subject: [PATCH 088/264] fix docs

---
 v3-docs/docs/about/modern-build-stack.md            | 13 +++++++++++++
 .../docs/about/modern-build-stack/modern-bundler.md |  2 +-
 .../modern-build-stack/modern-transpiler-swc.md     |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index 6facbd687d..433782a81d 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -11,3 +11,16 @@ To improve the development and deployment experience for all Meteor projects, we
 - **Modern Transpiler**: Meteor is adopting **SWC** as a faster alternative to Babel.
 - **Modern Bundler**: A new bundler will handle only your app’s code, supporting tree-shaking, popular plugins, and better features for both development and production. Meanwhile, Meteor’s core bundler will continue handling Meteor-specific tasks, such as compiling Atmosphere packages, with optimized workflows.
 - **Dev Server Enhancements**: The dev server remains a core part of Meteor, now with ongoing improvements in performance and developer features.
+
+## Quick start
+
+To start using the new build stack, add the following to your `package.json`:
+
+```json
+"meteor": {
+  "modernWebArchsOnly": true,
+  "modernTranspiler": true
+}
+```
+
+Learn more about these settings in the [Modern Transpiler](modern-build-stack/modern-transpiler.md) and [Modern Bundler](modern-build-stack/modern-bundler.md) guides.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index 1c72489185..d5ebb5b55e 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -1,4 +1,4 @@
-# Modern bundler
+# Modern Bundler
 
 Meteor handles watching and linking all project files into the final bundle. While we'd like to offload more of this to modern bundlers, we're still focused on keeping what's left in the Meteor context as fast as possible.
 
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 3a8930089a..278da99499 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -1,4 +1,4 @@
-# Modern transpiler: SWC
+# Modern Transpiler: SWC
 
 Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, reaching parity with Babel.
 
@@ -47,7 +47,7 @@ Other reasons might involve features tied to Babel plugins. If so, you’ll need
 
 Second, you might choose to ignore the fallback if those files are fine with Babel. Even with SWC enabled, Meteor will continue using Babel for those files on future rebuilds.
 
-Third, you can exclude files or contexts from SWC. For example, if you're using `babel-plugin-react-compiler`, you can exclude your app code adding this to `package.json`:
+Third, you can exclude files or contexts from SWC. For example, if you're using `babel-plugin-react-compiler`, which SWC doesn't support yet, you can exclude your app code adding this to `package.json`:
 
 ```json
 "meteor": {

From 39b8f65c3b6acb72c9de4c23e564e77ccc5bd89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 08:25:21 +0200
Subject: [PATCH 089/264] fix docs

---
 v3-docs/docs/about/modern-build-stack.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index 433782a81d..f76892371d 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -23,4 +23,4 @@ To start using the new build stack, add the following to your `package.json`:
 }
 ```
 
-Learn more about these settings in the [Modern Transpiler](modern-build-stack/modern-transpiler.md) and [Modern Bundler](modern-build-stack/modern-bundler.md) guides.
+Learn more about these settings in the [Modern Transpiler](modern-build-stack/modern-transpiler-swc.md) and [Modern Bundler](modern-build-stack/modern-bundler.md) guides.

From 041f194a84d6501ce8147c9eaa562698cc3ad3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 10:00:23 +0200
Subject: [PATCH 090/264] re-run checks


From 90eb76d64d952f27ce1221e681b1d2351b60527f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 10:01:49 +0200
Subject: [PATCH 091/264] re-run checks


From 3de4c410072ee1fbd22d588e79da80e8e96abea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 11:57:06 +0200
Subject: [PATCH 092/264] re-run checks


From 9a229cd665e9e621a75eefedb428d8480b74c00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 14:35:43 +0200
Subject: [PATCH 093/264] ensure new meteor apps have modernTranspiler enabled

---
 tools/static-assets/skel-apollo/package.json     | 3 ++-
 tools/static-assets/skel-blaze/package.json      | 3 ++-
 tools/static-assets/skel-chakra-ui/package.json  | 3 ++-
 tools/static-assets/skel-minimal/package.json    | 3 ++-
 tools/static-assets/skel-react/package.json      | 3 ++-
 tools/static-assets/skel-solid/package.json      | 3 ++-
 tools/static-assets/skel-svelte/package.json     | 3 ++-
 tools/static-assets/skel-tailwind/package.json   | 3 ++-
 tools/static-assets/skel-typescript/package.json | 3 ++-
 v3-docs/docs/about/modern-build-stack.md         | 2 +-
 10 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json
index 3bb70f1781..5ecaafb90b 100644
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -22,6 +22,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json
index 21fba0da58..241f4001e8 100644
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -18,6 +18,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json
index 92bbdf24ad..561d051ac7 100644
--- a/tools/static-assets/skel-chakra-ui/package.json
+++ b/tools/static-assets/skel-chakra-ui/package.json
@@ -25,6 +25,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
index 73469db096..f0038698c7 100644
--- a/tools/static-assets/skel-minimal/package.json
+++ b/tools/static-assets/skel-minimal/package.json
@@ -17,6 +17,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json
index 08d7e054e3..59d8f0c986 100644
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -19,6 +19,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index 6e8187cbeb..b24dd0ead4 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -19,7 +19,8 @@
       "server": "server/entry-meteor.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   },
   "devDependencies": {
     "babel-preset-solid": "^1.8.15",
diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json
index 7cf92dfce7..07c594351b 100644
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -28,6 +28,7 @@
       }
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json
index 94934d4898..3ad26935c0 100644
--- a/tools/static-assets/skel-tailwind/package.json
+++ b/tools/static-assets/skel-tailwind/package.json
@@ -23,6 +23,7 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index 03ff9ce6c7..a5a9a1e979 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -26,6 +26,7 @@
       "server": "server/main.ts"
     },
     "testModule": "tests/main.ts",
-    "modernWebArchsOnly": true
+    "modernWebArchsOnly": true,
+    "modernTranspiler": true
   }
 }
diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index f76892371d..e16e814e24 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -14,7 +14,7 @@ To improve the development and deployment experience for all Meteor projects, we
 
 ## Quick start
 
-To start using the new build stack, add the following to your `package.json`:
+Start using the new build stack by creating a Meteor app, or add this to your `package.json` in an existing one:
 
 ```json
 "meteor": {

From 6d4251edb612059061579987d82fe577315584bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 15:20:48 +0200
Subject: [PATCH 094/264] bump meteor bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 21b45c3580..b743dccaa9 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.9
+BUNDLE_VERSION=22.14.0.10
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From e26204770be7f5fa12e3b8398fe4f40c162feed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 15:30:53 +0200
Subject: [PATCH 095/264] re-run checks


From 2f7bb724a947b9e0d39d2a5241cb3a78d3ef5072 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 15 Apr 2025 12:13:32 -0300
Subject: [PATCH 096/264] Meteor version to 3.3-beta.0 :comet:

---
 packages/accounts-base/package.js             |  2 +-
 packages/accounts-password/package.js         |  2 +-
 packages/autoupdate/package.js                |  2 +-
 packages/babel-compiler/package.js            |  2 +-
 packages/boilerplate-generator/package.js     |  2 +-
 packages/ddp-client/package.js                |  2 +-
 packages/ecmascript/package.js                |  2 +-
 packages/ejson/package.js                     |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/meteor/package.js                    |  2 +-
 packages/mongo/package.js                     |  2 +-
 packages/server-render/package.js             |  2 +-
 packages/webapp/package.js                    |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 .../generators/changelog/versions/3.3.0.md    | 73 +++++++++++++++++++
 15 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.3.0.md

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 6af3172a4e..ecc46de7ad 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.0",
+  version: "3.1.1-beta330.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 31786541ba..2950560337 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.1.0",
+  version: "3.2.0-beta330.0",
 });
 
 Npm.depends({
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 4769c9e31b..459cba05a9 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Update the client when new client code is available',
-  version: '2.0.0',
+  version: '2.0.1-beta330.0',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 0e9c3c420d..4fdefa740f 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.3',
+  version: '7.12.0-beta330.0',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 032ed11c8d..df24da34cd 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '2.0.0',
+  version: '2.0.1-beta330.0',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 1b0e48c929..b5e9a2a938 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.0",
+  version: "3.1.1-beta330.0",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index e74159738d..087abbf932 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.10',
+  version: '0.16.11-beta330.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 3ff1a14262..e492be2e5b 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Extended and Extensible JSON library',
-  version: '1.1.4',
+  version: '1.1.5-beta330.0',
 });
 
 Package.onUse(function onUse(api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index fac4bece2d..bfbbde48e6 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.2.0",
+  version: "3.3.0-beta.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index a9ee2425dc..0d0b0b31ee 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.0',
+  version: '2.1.1-beta330.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 0013a658e3..e3b80827ee 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.1",
+  version: "2.1.2-beta330.0",
 });
 
 Npm.depends({
diff --git a/packages/server-render/package.js b/packages/server-render/package.js
index fabcf15208..21b7727831 100644
--- a/packages/server-render/package.js
+++ b/packages/server-render/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "server-render",
-  version: '0.4.2',
+  version: '0.4.3-beta330.0',
   summary: "Generic support for server-side rendering in Meteor apps",
   documentation: "README.md"
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index c57f709f3c..e54945bae0 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.6",
+  version: "2.0.7-beta330.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index da73ff6743..c0e35f1d70 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.2-beta.2",
+  "version": "3.3-beta.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
new file mode 100644
index 0000000000..0e63e671fd
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -0,0 +1,73 @@
+## v3.3.0, 2025-04-15
+
+### Highlights
+
+- Support SWC transpiler for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657)
+- Default to modern architecture in new apps [PR#13665](https://github.com/meteor/meteor/pull/13665)
+- Support CPU profiling in Meteor 3 bundler [PR#13650](https://github.com/meteor/meteor/pull/13650)
+- Improve `meteor profile`@show rebuild steps, support `--build` [PR#13694](https://github.com/meteor/meteor/pull/13694)
+- Improve `useFind` and `useSubscribe` React hooks
+- Add `replaceEmailAsync` helper to Accounts [PR#13677](https://github.com/meteor/meteor/pull/13677)
+- Fix user agent detection and oplog collection filtering
+- Refine type definitions for Meteor methods and SSR's ServerSink
+- Update Express to 5.1.0
+
+All merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
+
+React packages PRs@[PR#419](https://github.com/meteor/react-packages/pull/419), [PR#429](https://github.com/meteor/react-packages/pull/429) and [PR#430](https://github.com/meteor/react-packages/pull/430)
+
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.3-beta.0
+
+```
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.1
+- accounts-password@3.2.0
+- autoupdate@2.0.1
+- babel-compiler@7.12.0
+- boilerplate-generator@2.0.1
+- ddp-client@3.1.1
+- ecmascript@0.16.11
+- ejson@1.1.5
+- meteor@2.1.1
+- mongo@2.1.2
+- server-render@0.4.3
+- webapp@2.0.7
+- meteor-tool@3.3.0
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.17
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)  
+- [@italojs](https://github.com/italojs)
+- [@Grubba27](https://github.com/Grubba27)  
+- [@zodern](https://github.com/zodern)
+- [@9Morello](https://github.com/9Morello)
+- [@welkinwong](https://github.com/welkinwong)
+- [@Poyoman39](https://github.com/Poyoman39)
+- [@PedroMarianoAlmeida](https://github.com/PedroMarianoAlmeida)
+- [@harryadel](https://github.com/harryadel)
+- [@ericm546](https://github.com/ericm546)
+
+✨✨✨ 

From a244031b5b251bfe8087551f83e1716b87acb85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 15 Apr 2025 19:03:57 +0200
Subject: [PATCH 097/264] exclude legacy arch compilation in dev mode

---
 tools/cli/commands.js      | 3 +++
 tools/isobuild/compiler.js | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index c44a026cd7..ad46ad573d 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -545,6 +545,8 @@ async function doRunCommand(options) {
   }
 
   webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir, options);
+  global.webArchs = webArchs;
+
   const buildMode = options.production ? 'production' : 'development';
 
   let cordovaRunner;
@@ -2512,6 +2514,7 @@ var runTestAppForPackages = async function (projectContext, options) {
     webArchs.push("web.cordova");
   }
   buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory, options);
+  global.webArchs = buildOptions.webArchs;
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 66cb49e2b0..6fa2793186 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -150,6 +150,7 @@ compiler.compile = Profile(function (packageSource, options) {
   // Isopack#initFromPath).
   var isobuildFeatures = [];
   packageSource.architectures.forEach((sourceArch) => {
+    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(sourceArch.arch)) return;
     sourceArch.uses.forEach((use) => {
       if (!use.weak && isIsobuildFeaturePackage(use.package) &&
           isobuildFeatures.indexOf(use.package) === -1) {
@@ -181,6 +182,7 @@ compiler.compile = Profile(function (packageSource, options) {
     if (architecture.arch === 'web.cordova' && ! includeCordovaUnibuild) {
       continue;
     }
+    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
 
     // TODO -> Maybe this withCache will bring some problems in other commands.
     await files.withCache(async () => {
@@ -226,6 +228,7 @@ compiler.lint = Profile(function (packageSource, options) {
         && architecture.arch === 'web.cordova') {
       continue;
     }
+    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
 
     const unibuildWarnings = await lintUnibuild({
       isopack: options.isopack,
@@ -246,6 +249,8 @@ compiler.getMinifiers = async function (packageSource, options) {
 
   var minifiers = [];
   for (const architecture of packageSource.architectures) {
+    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
+
     var activePluginPackages = await getActivePluginPackages(options.isopack, {
       isopackCache: options.isopackCache,
       uses: architecture.uses

From a38bcaee9a377e5ad54b6642edd924029a544408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 16 Apr 2025 10:41:36 +0200
Subject: [PATCH 098/264] support @parcel/watcher as the watcher alternative
 cross-os perserving polling fallback

---
 scripts/dev-bundle-tool-package.js |   3 +-
 tools/fs/safe-watcher.ts           | 770 ++++++++++++-----------------
 2 files changed, 330 insertions(+), 443 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 2b92b9e5f6..8d9292efb0 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -57,8 +57,7 @@ var packageJson = {
     escope: "3.6.0",
     split2: "3.2.2",
     multipipe: "2.0.1",
-    pathwatcher: "8.1.2",
-    "vscode-nsfw": "2.1.8",
+    "@parcel/watcher": "2.5.1",
     // The @wry/context package version must be compatible with the
     // version constraint imposed by optimism/package.json.
     optimism: "0.16.1",
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index cea3d74d7b..5f521fb024 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,476 +1,364 @@
-import { FSWatcher, Stats, BigIntStats } from "fs";
+import { Stats } from 'fs';
+import { dirname } from "path";
+import ParcelWatcher from "@parcel/watcher";
+
 import { Profile } from "../tool-env/profile";
-import {
-  statOrNull,
-  convertToOSPath,
-  watchFile,
-  unwatchFile,
-  toPosixPath,
-  pathRelative
-} from "./files";
-import {
-  join as nativeJoin
-} from 'path';
-import nsfw from 'vscode-nsfw';
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
 
-const pathwatcher = require('pathwatcher');
+export type SafeWatcher = { close: () => void; };
+
+type ChangeCallback = (event: string) => void;
+
+interface Entry extends SafeWatcher {
+  callbacks: Set<ChangeCallback>;
+  _fire(event: string): void;
+}
+
+// Registry mapping normalized absolute paths to their watcher entry.
+const entries: Record<string, Entry | null> = Object.create(null);
+
+// Watch roots are directories for which we have an active ParcelWatcher subscription.
+const watchRoots = new Set<string>();
+// For each watch root, store its active subscription.
+const dirSubscriptions = new Map<string, ParcelWatcher.AsyncSubscription>();
+// A set of roots that are known to be unwatchable.
+const ignoredWatchRoots = new Set<string>();
+
+// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
+// force the use of files.watchFile instead of ParcelWatcher.
+let watcherEnabled = !JSON.parse(process.env.METEOR_WATCH_FORCE_POLLING || "false");
+
+/**
+ * Polling fallback globals.
+ * The legacy Meteor strategy used polling for cases where native watchers failed.
+ * We keep track of files that changed, so that we can poll them faster.
+ */
+var DEFAULT_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
+
+var NO_WATCHER_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
 
-// Default to prioritizing changed files, but disable that behavior (and
-// thus prioritize all files equally) if METEOR_WATCH_PRIORITIZE_CHANGED
-// is explicitly set to a string that parses to a falsy value.
 var PRIORITIZE_CHANGED = true;
 if (process.env.METEOR_WATCH_PRIORITIZE_CHANGED &&
     ! JSON.parse(process.env.METEOR_WATCH_PRIORITIZE_CHANGED)) {
   PRIORITIZE_CHANGED = false;
 }
 
-var DEFAULT_POLLING_INTERVAL =
-  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
-
-var NO_WATCHER_POLLING_INTERVAL =
-  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
-
-// This may seems like a long time to wait before actually closing the
-// file watchers, but it's to our advantage if they survive restarts.
-const WATCHER_CLEANUP_DELAY_MS = 30000;
-
-// Since linux doesn't have recursive file watching, nsfw has to walk the
-// watched folder and create a separate watcher for each subfolder. Until it has a
-// way for us to filter which folders it walks we will continue to use
-// pathwatcher to avoid having too many watchers.
-let watcherLibrary = process.env.METEOR_WATCHER_LIBRARY ||
-  (process.platform === 'linux' ? 'pathwatcher' : 'nsfw');
-
-// Pathwatcher complains (using console.error, ugh) if you try to watch
-// two files with the same stat.ino number but different paths on linux, so we have
-// to deduplicate files by ino.
-const DEDUPLICATE_BY_INO = watcherLibrary === 'pathwatcher';
-// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
-// force the use of files.watchFile instead of watchLibrary.watch.
-let watcherEnabled = ! JSON.parse(
-  process.env.METEOR_WATCH_FORCE_POLLING || "false"
-);
-
-const entriesByIno = new Map;
-
-export type SafeWatcher = {
-  close: () => void;
-}
-
-type EntryCallback = (event: string) => void;
-
-interface Entry extends SafeWatcher {
-  callbacks: Set<EntryCallback>;
-  rewatch: () => void;
-  release: (callback: EntryCallback) => void;
-  _fire: (event: string) => void;
-}
-
-const entries: Record<string, Entry | null> = Object.create(null);
-
-// Folders that are watched recursively
-let watchRoots = new Set<string>();
-
 // Set of paths for which a change event has been fired, watched with
 // watchLibrary.watch if available. This could be an LRU cache, but in
 // practice it should never grow large enough for that to matter.
 const changedPaths = new Set;
 
+function shouldIgnorePath(absPath: string): boolean {
+  const posixPath = toPosixPath(absPath);
+  const parts = posixPath.split('/');
+
+  // Check for .meteor: allow the .meteor directory itself,
+  // but ignore its "local" subdirectory (or any immediate child folder that indicates cache).
+  const meteorIndex = parts.indexOf(".meteor");
+  if (meteorIndex !== -1) {
+    const nextPart = parts[meteorIndex + 1];
+    if (nextPart && nextPart === "local") {
+      // Ignore anything inside .meteor/local
+      return true;
+    }
+    // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
+  }
+
+  // For node_modules: ignore contents unless the package directory is a symlink (which means it’s under active development).
+  const nmIndex = parts.indexOf("node_modules");
+  if (nmIndex !== -1) {
+    try {
+      const stat = lstat(absPath);
+      if (!stat?.isSymbolicLink()) {
+        return true;
+      }
+      // If the package folder is symlinked, we want to watch it.
+    } catch (e) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Ensure that the given directory is being watched by @parcel/watcher.
+ * If it is not a directory or is unwatchable, it is immediately added to an ignore set.
+ */
+async function ensureWatchRoot(dirPath: string): Promise<void> {
+  if (!watcherEnabled || watchRoots.has(dirPath) || ignoredWatchRoots.has(dirPath)) {
+    return;
+  }
+
+  // If an ancestor is already watched, skip this one.
+  for (const root of watchRoots) {
+    const rel = pathRelative(root, dirPath);
+    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
+      return;
+    }
+  }
+
+  // Remove any existing roots that are now encompassed by the new one.
+  for (const root of Array.from(watchRoots)) {
+    const rel = pathRelative(dirPath, root);
+    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
+      const sub = dirSubscriptions.get(root);
+      if (sub) {
+        try {
+          await sub.unsubscribe();
+        } catch (_) {
+          /* ignore errors */
+        }
+      }
+      dirSubscriptions.delete(root);
+      watchRoots.delete(root);
+    }
+  }
+
+  const osDirPath = convertToOSPath(dirPath);
+  // Check that osDirPath is indeed a directory.
+  try {
+    const stats = statOrNull(osDirPath);
+    if (!stats?.isDirectory()) {
+      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
+      ignoredWatchRoots.add(dirPath);
+      return;
+    }
+  } catch (e) {
+    console.error(`Failed to stat ${osDirPath}:`, e);
+    ignoredWatchRoots.add(dirPath);
+    return;
+  }
+
+  // Set up ignore patterns to skip deep node_modules and .meteor/local cache
+  const ignorePatterns = ["**/node_modules/**", "**/.meteor/local/**"];
+  try {
+    const subscription = await ParcelWatcher.subscribe(
+        osDirPath,
+        (err, events) => {
+          if (err) {
+            console.error(`Parcel watcher error on ${osDirPath}:`, err);
+            // Only disable native watching for critical errors (like ENOSPC).
+            // @ts-ignore
+            if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
+              fallbackToPolling();
+            }
+            return;
+          }
+          // Dispatch each event to any registered entries.
+          for (const event of events) {
+            const changedPath = toPosixPath(event.path);
+            const entry = entries[changedPath];
+            if (!entry) continue;
+            // In Meteor's safe-watcher API, both create/update trigger "change" events.
+            const evtType = event.type === "delete" ? "delete" : "change";
+            entry._fire(evtType);
+          }
+        },
+        { ignore: ignorePatterns }
+    );
+    watchRoots.add(dirPath);
+    dirSubscriptions.set(dirPath, subscription);
+  } catch (e: any) {
+    if (
+        e &&
+        (e.code === "ENOTDIR" ||
+            /Not a directory/.test(e.message) ||
+            e.code === "EBADF" ||
+            /Bad file descriptor/.test(e.message))
+    ) {
+      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
+      ignoredWatchRoots.add(dirPath);
+    } else {
+      console.error(`Failed to start watcher for ${osDirPath}:`, e);
+      if (e.code === "ENOSPC" || e.errno === require("constants").ENOSPC) {
+        fallbackToPolling();
+      }
+    }
+  }
+}
+
+/**
+ * Creates a new watch entry for a specific file (or directory) and
+ * holds its registered callbacks.
+ */
+function startNewEntry(absPath: string): Entry {
+  const callbacks = new Set<ChangeCallback>();
+  let closed = false;
+  const entry: Entry = {
+    callbacks,
+    close() {
+      if (closed) return;
+      closed = true;
+      delete entries[absPath];
+    },
+    _fire(event: string) {
+      callbacks.forEach(cb => {
+        try {
+          cb(event);
+        } catch (e) {
+          // Ignore callback errors.
+        }
+      });
+    }
+  };
+  return entry;
+}
+
+/**
+ * The primary API function to watch a file or directory.
+ * This registers the callback on the internally managed entry and
+ * ensures that a Parcel watcher is subscribed to a covering directory.
+ */
+export const watch = Profile(
+    "safeWatcher.watch",
+    (
+    absPath: string,
+    callback: ChangeCallback
+    ): SafeWatcher => {
+      absPath = toPosixPath(absPath);
+      // If the path should be ignored, immediately return a noop SafeWatcher.
+      if (shouldIgnorePath(absPath)) {
+        return { close() {} };
+      }
+      // If native watching is disabled, use the polling strategy.
+      if (!watcherEnabled) {
+        return startPolling(absPath, callback);
+      }
+      // Try to reuse an existing entry if one was created before.
+      let entry = entries[absPath];
+      if (!entry) {
+        entry = startNewEntry(absPath);
+        entries[absPath] = entry;
+        // Determine the directory that should be watched.
+        let watchTarget: string;
+        try {
+          const st = statOrNull(convertToOSPath(absPath));
+          watchTarget = st?.isDirectory() ? absPath : toPosixPath(dirname(convertToOSPath(absPath)));
+        } catch (e) {
+          watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+        }
+        // Set up a watcher on the parent directory (or the directory itself) if not already active.
+        ensureWatchRoot(watchTarget);
+      }
+      // Register the callback for this file.
+      entry.callbacks.add(callback);
+      return {
+        close() {
+          if (entries[absPath]) {
+            entries[absPath]!.callbacks.delete(callback);
+            if (entries[absPath]!.callbacks.size === 0) {
+              entries[absPath]!.close();
+            }
+          }
+        }
+      };
+});
+
+/**
+ * Externally force a directory to be watched.
+ * If the provided path is a file, its parent directory is used.
+ */
+export function addWatchRoot(absPath: string) {
+  absPath = toPosixPath(absPath);
+  let watchTarget = absPath;
+  try {
+    const st = statOrNull(convertToOSPath(absPath));
+    if (!st?.isDirectory()) {
+      watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+    }
+  } catch (e) {
+    watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+  }
+  ensureWatchRoot(watchTarget);
+}
+
+async function safeUnsubscribeSub(root: string) {
+  const sub = dirSubscriptions.get(root);
+  if (!sub) return;  // Already unsubscribed.
+  // Remove from our maps immediately to prevent further unsubscribe calls.
+  dirSubscriptions.delete(root);
+  watchRoots.delete(root);
+  try {
+    await sub.unsubscribe();
+  } catch (e) {
+    console.error(`Error during unsubscribe for ${root}:`, e);
+  }
+}
+
+export async function closeAllWatchers() {
+  for (const root of Array.from(watchRoots)) {
+    await safeUnsubscribeSub(root);
+  }
+}
+
 function hasPriority(absPath: string) {
   // If we're not prioritizing changed files, then all files have
   // priority, which means they should be watched with native file
   // watchers if the platform supports them. If we are prioritizing
   // changed files, then only changed files get priority.
   return PRIORITIZE_CHANGED
-    ? changedPaths.has(absPath)
-    : true;
+      ? changedPaths.has(absPath)
+      : true;
 }
 
-function acquireWatcher(absPath: string, callback: EntryCallback) {
-  const entry = entries[absPath] || (
-    entries[absPath] = startNewWatcher(absPath));
-
-  // Watches successfully established in the past may have become invalid
-  // because the watched file was deleted or renamed, so we need to make
-  // sure we're still watching every time we call safeWatcher.watch.
-  entry.rewatch();
-
-  // The size of the entry.callbacks Set also serves as a reference count
-  // for this watcher.
-  entry.callbacks.add(callback);
-
-  return entry;
-}
-
-function startNewWatcher(absPath: string): Entry {
-  let stat: Stats | BigIntStats | null | undefined = null;
-
-  if (DEDUPLICATE_BY_INO) {
-    stat = statOrNull(absPath);
-    if (stat && stat.ino > 0 && entriesByIno.has(stat.ino)) {
-      const entry = entriesByIno.get(stat.ino);
-      if (entries[absPath] === entry) {
-        return entry;
-      }
-    }
-  } else {
-    let entry = entries[absPath];
-    if (entry) {
-      return entry;
-    }
-  }
-
-  function safeUnwatch() {
-    if (watcher) {
-      watcher.close();
-      watcher = null;
-      if (stat && stat.ino > 0) {
-        entriesByIno.delete(stat.ino);
-      }
-    }
-  }
-
-  let lastWatcherEventTime = Date.now();
-  const callbacks = new Set<EntryCallback>();
-  let watcherCleanupTimer: ReturnType<typeof setTimeout> | null = null;
-  let watcher: FSWatcher | null = null;
-
-  // Determines the polling interval to be used for the fs.watchFile-based
-  // safety net that works on all platforms and file systems.
-  function getPollingInterval() {
-    if (hasPriority(absPath)) {
-      // Regardless of whether we have a native file watcher and it works
-      // correctly on this file system, poll prioritized files (that is,
-      // files that have been changed at least once) at a higher frequency
-      // (every 500ms by default).
-      return NO_WATCHER_POLLING_INTERVAL;
-    }
-
-    if (watcherEnabled || PRIORITIZE_CHANGED) {
-      // As long as native file watching is enabled (even if it doesn't
-      // work correctly) and the developer hasn't explicitly opted out of
-      // the file watching priority system, poll unchanged files at a
-      // lower frequency (every 5000ms by default).
-      return DEFAULT_POLLING_INTERVAL;
-    }
-
-    // If native file watching is disabled and the developer has
-    // explicitly opted out of the priority system, poll everything at the
-    // higher frequency (every 500ms by default). Note that this leads to
-    // higher idle CPU usage, so the developer may want to adjust the
-    // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
+// Determines the polling interval to be used for the fs.watchFile-based
+// safety net that works on all platforms and file systems.
+function getPollingInterval(absPath: string): number {
+  if (hasPriority(absPath)) {
+    // Regardless of whether we have a native file watcher and it works
+    // correctly on this file system, poll prioritized files (that is,
+    // files that have been changed at least once) at a higher frequency
+    // (every 500ms by default).
     return NO_WATCHER_POLLING_INTERVAL;
   }
 
-  function fire(event: string) {
-    if (event !== "change") {
-      // When we receive a "delete" or "rename" event, the watcher is
-      // probably not going to generate any more notifications for this
-      // file, so we close and nullify the watcher to ensure that
-      // entry.rewatch() will attempt to reestablish the watcher the next
-      // time we call safeWatcher.watch.
-      safeUnwatch();
+  if (watcherEnabled || PRIORITIZE_CHANGED) {
+    // As long as native file watching is enabled (even if it doesn't
+    // work correctly) and the developer hasn't explicitly opted out of
+    // the file watching priority system, poll unchanged files at a
+    // lower frequency (every 5000ms by default).
+    return DEFAULT_POLLING_INTERVAL;
+  }
 
-      // Make sure we don't throttle the watchFile callback after a
-      // "delete" or "rename" event, since it is now our only reliable
-      // source of file change notifications.
-      lastWatcherEventTime = 0;
+  // If native file watching is disabled and the developer has
+  // explicitly opted out of the priority system, poll everything at the
+  // higher frequency (every 500ms by default). Note that this leads to
+  // higher idle CPU usage, so the developer may want to adjust the
+  // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
+  return NO_WATCHER_POLLING_INTERVAL;
+}
 
-    } else {
+function startPolling(absPath: string, callback: ChangeCallback): SafeWatcher {
+  const osPath = convertToOSPath(absPath);
+  // Initial polling interval.
+  let interval = getPollingInterval(absPath);
+  const pollCallback = (curr: Stats, prev: Stats) => {
+    // Compare modification times to detect a change.
+    if (+curr.mtime !== +prev.mtime) {
       changedPaths.add(absPath);
-      rewatch();
+      callback("change");
     }
-
-    callbacks.forEach(cb => cb(event));
-  }
-
-  function watchWrapper(event: string) {
-    lastWatcherEventTime = Date.now();
-    fire(event);
-
-    // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
-    // but previous watcher success is no guarantee of future watcher
-    // reliability. For example, watchLibrary.watch works just fine when file
-    // changes originate from within a Vagrant VM, but changes to shared
-    // files made outside the VM are invisible to watcher, so our only
-    // hope of catching them is to continue polling.
-  }
-
-  function rewatch() {
-    if (hasPriority(absPath)) {
-      if (watcher) {
-        // Already watching; nothing to do.
-        return;
-      }
-      watcher = watchLibraryWatch(absPath, watchWrapper);
-    } else if (watcher) {
-      safeUnwatch();
-    }
-
-    // Since we're about to restart the stat-based file watcher, we don't
-    // want to miss any of its events because of the lastWatcherEventTime
-    // throttling that it attempts to do.
-    lastWatcherEventTime = 0;
-
-    // We use files.watchFile in addition to watcher.watch as a fail-safe
-    // to detect file changes even on network file systems.  However
-    // (unless the user disabled watcher or this watcher call failed), we
-    // use a relatively long default polling interval of 5000ms to save
-    // CPU cycles.
-    statWatch(absPath, getPollingInterval(), watchFileWrapper);
-  }
-
-  function watchFileWrapper(newStat: Stats, oldStat: Stats) {
-    if (newStat.ino === 0 &&
-        oldStat.ino === 0 &&
-        +newStat.mtime === +oldStat.mtime) {
-      // Node calls the watchFile listener once with bogus identical stat
-      // objects, which should not trigger a file change event.
-      return;
-    }
-
-    // If a watcher event fired in the last polling interval, ignore
-    // this event.
-    if (Date.now() - lastWatcherEventTime > getPollingInterval()) {
-      fire("change");
-    }
-  }
-
-  const entry = {
-    callbacks,
-    rewatch,
-
-    release(callback: EntryCallback) {
-      if (! entries[absPath]) {
-        return;
-      }
-
-      callbacks.delete(callback);
-      if (callbacks.size > 0) {
-        return;
-      }
-
-      // Once there are no more callbacks in the Set, close both watchers
-      // and nullify the shared data.
-      if (watcherCleanupTimer) {
-        clearTimeout(watcherCleanupTimer);
-      }
-
-      watcherCleanupTimer = setTimeout(() => {
-        if (callbacks.size > 0) {
-          // If another callback was added while the timer was pending, we
-          // can avoid tearing anything down.
-          return;
-        }
-        entry.close();
-      }, WATCHER_CLEANUP_DELAY_MS);
-    },
-
-    close() {
-      if (entries[absPath] !== entry) return;
-      entries[absPath] = null;
-
-      if (watcherCleanupTimer) {
-        clearTimeout(watcherCleanupTimer);
-        watcherCleanupTimer = null;
-      }
-
-      safeUnwatch();
-
-      unwatchFile(absPath, watchFileWrapper);
-    },
-    _fire: fire
   };
-
-  if (stat && stat.ino > 0) {
-    entriesByIno.set(stat.ino, entry);
-  }
-
-  return entry;
-}
-
-export function closeAllWatchers() {
-  Object.keys(entries).forEach(absPath => {
-    const entry = entries[absPath];
-    if (entry) {
-      entry.close();
+  watchFile(osPath, { interval }, pollCallback);
+  return {
+    close() {
+      unwatchFile(osPath, pollCallback);
+      changedPaths.delete(absPath);
     }
-  });
+  };
 }
 
-const statWatchers = Object.create(null);
-
-function statWatch(
-  absPath: string,
-  interval: number,
-  callback: (current: Stats, previous: Stats) => void,
-) {
-  let statWatcher = statWatchers[absPath];
-
-  if (!statWatcher) {
-    statWatcher = {
-      interval,
-      changeListeners: [],
-      stat: null
-    };
-    statWatchers[absPath] = statWatcher;
-  }
-
-  // If the interval needs to be changed, replace the watcher.
-  // Node will only recreate the watcher with the new interval if all old
-  // watchers are stopped (which unwatchFile does when not passed a
-  // specific listener)
-  if (statWatcher.interval !== interval && statWatcher.stat) {
-    // This stops all stat watchers for the file, not just those created by
-    // statWatch
-    unwatchFile(absPath);
-    statWatcher.stat = null;
-    statWatcher.interval = interval;
-  }
-
-  if (!statWatcher.changeListeners.includes(callback)) {
-    statWatcher.changeListeners.push(callback);
-  }
-
-  if (!statWatcher.stat) {
-    const newStat = watchFile(absPath, {
-      persistent: false, // never persistent
-      interval,
-    }, (newStat, oldStat) => {
-      statWatcher.changeListeners.forEach((
-        listener: (newStat: Stats, oldStat: Stats) => void
-      ) => {
-          listener(newStat, oldStat);
-      });
-    });
-
-    newStat.on("stop", () => {
-      if (statWatchers[absPath] === statWatch) {
-        delete statWatchers[absPath];
-      }
-    });
-
-    statWatcher.stat = newStat;
-  }
-
-  return statWatcher;
-}
-
-function watchLibraryWatch(absPath: string, callback: EntryCallback) {
-  if (watcherEnabled && watcherLibrary === 'pathwatcher') {
-    try {
-      return pathwatcher.watch(convertToOSPath(absPath), callback);
-    } catch (e: any) {
-      maybeSuggestRaisingWatchLimit(e);
-      // ... ignore the error.  We'll still have watchFile, which is good
-      // enough.
-    }
-  }
-
-  return null;
-}
-
-let suggestedRaisingWatchLimit = false;
-
-function maybeSuggestRaisingWatchLimit(error: Error & { errno: number }) {
-  var constants = require('constants');
-  var archinfo = require('../utils/archinfo');
-  if (! suggestedRaisingWatchLimit &&
-      // Note: the not-super-documented require('constants') maps from
-      // strings to SYSTEM errno values. System errno values aren't the same
-      // as the numbers used internally by libuv! Once we're upgraded
-      // to Node 0.12, we'll have the system errno as a string (on 'code'),
-      // but the support for that wasn't in Node 0.10's uv.
-      // See our PR https://github.com/atom/node-pathwatcher/pull/53
-      // (and make sure to read the final commit message, not the original
-      // proposed PR, which had a slightly different interface).
-      error.errno === constants.ENOSPC &&
-      // The only suggestion we currently have is for Linux.
-      archinfo.matches(archinfo.host(), 'os.linux')) {
-
-    // Check suggestedRaisingWatchLimit again because archinfo.host() may
-    // have yielded.
-    if (suggestedRaisingWatchLimit) return;
-    suggestedRaisingWatchLimit = true;
-
-    var Console = require('../console/console.js').Console;
-    if (! Console.isHeadless()) {
-      Console.arrowWarn(
-        "It looks like a simple tweak to your system's configuration will " +
-          "make many tools (including this Meteor command) more efficient. " +
-          "To learn more, see " +
-          Console.url("https://github.com/meteor/docs/blob/master/long-form/file-change-watcher-efficiency.md"));
-    }
+/**
+ * Fall back to polling. If a critical error occurs,
+ * we disable native watching and close all existing native watchers.
+ */
+function fallbackToPolling() {
+  if (watcherEnabled) {
+    console.error("Critical native watcher error encountered. Falling back to polling for all entries.");
+    watcherEnabled = false;
+    closeAllWatchers();
   }
 }
-
-export const watch = Profile(
-  "safeWatcher.watch",
-  (absPath: string, callback: EntryCallback) => {
-    const entry = acquireWatcher(absPath, callback);
-    return {
-      close() {
-        entry.release(callback);
-      }
-    } as SafeWatcher;
-  }
-);
-
-const fireNames = {
-  [nsfw.actions.CREATED]: 'change',
-  [nsfw.actions.MODIFIED]: 'change',
-  [nsfw.actions.DELETED]: 'delete'
-}
-
-export function addWatchRoot(absPath: string) {
-  if (watchRoots.has(absPath) || watcherLibrary !== 'nsfw' || !watcherEnabled) {
-    return;
-  }
-
-  watchRoots.add(absPath);
-
-  // If there already is a watcher for a parent directory, there is no need
-  // to create this watcher.
-  for (const path of watchRoots) {
-    let relativePath = pathRelative(path, absPath);
-    if (
-      path !== absPath &&
-      !relativePath.startsWith('..') &&
-      !relativePath.startsWith('/')
-    ) {
-      return;
-    }
-  }
-
-  // TODO: check if there are any existing watchers that are children of this
-  // watcher and stop them
-
-  nsfw(
-    convertToOSPath(absPath),
-    (events) => {
-      events.forEach(event => {
-        if(event.action === nsfw.actions.RENAMED) {
-          let oldPath = nativeJoin(event.directory, event.oldFile);
-          let oldEntry = entries[toPosixPath(oldPath)];
-          if (oldEntry) {
-            oldEntry._fire('rename');
-          }
-
-          let path = nativeJoin(event.newDirectory, event.newFile);
-          let newEntry = entries[toPosixPath(path)];
-          if (newEntry) {
-            newEntry._fire('change');
-          }
-        } else {
-            let path = nativeJoin(event.directory, event.file);
-            let entry = entries[toPosixPath(path)];
-            if (entry) {
-              entry._fire(fireNames[event.action]);
-            }
-        }
-      })
-    }
-  ).then(watcher => {
-    watcher.start()
-  });
-}

From 6de4d9dd14f589a393c398e279b65e20c0c30341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 16 Apr 2025 10:55:58 +0200
Subject: [PATCH 099/264] Revert "support @parcel/watcher as the watcher
 alternative cross-os perserving polling fallback"

This reverts commit a38bcaee9a377e5ad54b6642edd924029a544408.
---
 scripts/dev-bundle-tool-package.js |   3 +-
 tools/fs/safe-watcher.ts           | 770 +++++++++++++++++------------
 2 files changed, 443 insertions(+), 330 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8d9292efb0..2b92b9e5f6 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -57,7 +57,8 @@ var packageJson = {
     escope: "3.6.0",
     split2: "3.2.2",
     multipipe: "2.0.1",
-    "@parcel/watcher": "2.5.1",
+    pathwatcher: "8.1.2",
+    "vscode-nsfw": "2.1.8",
     // The @wry/context package version must be compatible with the
     // version constraint imposed by optimism/package.json.
     optimism: "0.16.1",
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 5f521fb024..cea3d74d7b 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,364 +1,476 @@
-import { Stats } from 'fs';
-import { dirname } from "path";
-import ParcelWatcher from "@parcel/watcher";
-
+import { FSWatcher, Stats, BigIntStats } from "fs";
 import { Profile } from "../tool-env/profile";
-import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
+import {
+  statOrNull,
+  convertToOSPath,
+  watchFile,
+  unwatchFile,
+  toPosixPath,
+  pathRelative
+} from "./files";
+import {
+  join as nativeJoin
+} from 'path';
+import nsfw from 'vscode-nsfw';
 
-export type SafeWatcher = { close: () => void; };
-
-type ChangeCallback = (event: string) => void;
-
-interface Entry extends SafeWatcher {
-  callbacks: Set<ChangeCallback>;
-  _fire(event: string): void;
-}
-
-// Registry mapping normalized absolute paths to their watcher entry.
-const entries: Record<string, Entry | null> = Object.create(null);
-
-// Watch roots are directories for which we have an active ParcelWatcher subscription.
-const watchRoots = new Set<string>();
-// For each watch root, store its active subscription.
-const dirSubscriptions = new Map<string, ParcelWatcher.AsyncSubscription>();
-// A set of roots that are known to be unwatchable.
-const ignoredWatchRoots = new Set<string>();
-
-// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
-// force the use of files.watchFile instead of ParcelWatcher.
-let watcherEnabled = !JSON.parse(process.env.METEOR_WATCH_FORCE_POLLING || "false");
-
-/**
- * Polling fallback globals.
- * The legacy Meteor strategy used polling for cases where native watchers failed.
- * We keep track of files that changed, so that we can poll them faster.
- */
-var DEFAULT_POLLING_INTERVAL =
-    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
-
-var NO_WATCHER_POLLING_INTERVAL =
-    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
+const pathwatcher = require('pathwatcher');
 
+// Default to prioritizing changed files, but disable that behavior (and
+// thus prioritize all files equally) if METEOR_WATCH_PRIORITIZE_CHANGED
+// is explicitly set to a string that parses to a falsy value.
 var PRIORITIZE_CHANGED = true;
 if (process.env.METEOR_WATCH_PRIORITIZE_CHANGED &&
     ! JSON.parse(process.env.METEOR_WATCH_PRIORITIZE_CHANGED)) {
   PRIORITIZE_CHANGED = false;
 }
 
+var DEFAULT_POLLING_INTERVAL =
+  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
+
+var NO_WATCHER_POLLING_INTERVAL =
+  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
+
+// This may seems like a long time to wait before actually closing the
+// file watchers, but it's to our advantage if they survive restarts.
+const WATCHER_CLEANUP_DELAY_MS = 30000;
+
+// Since linux doesn't have recursive file watching, nsfw has to walk the
+// watched folder and create a separate watcher for each subfolder. Until it has a
+// way for us to filter which folders it walks we will continue to use
+// pathwatcher to avoid having too many watchers.
+let watcherLibrary = process.env.METEOR_WATCHER_LIBRARY ||
+  (process.platform === 'linux' ? 'pathwatcher' : 'nsfw');
+
+// Pathwatcher complains (using console.error, ugh) if you try to watch
+// two files with the same stat.ino number but different paths on linux, so we have
+// to deduplicate files by ino.
+const DEDUPLICATE_BY_INO = watcherLibrary === 'pathwatcher';
+// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
+// force the use of files.watchFile instead of watchLibrary.watch.
+let watcherEnabled = ! JSON.parse(
+  process.env.METEOR_WATCH_FORCE_POLLING || "false"
+);
+
+const entriesByIno = new Map;
+
+export type SafeWatcher = {
+  close: () => void;
+}
+
+type EntryCallback = (event: string) => void;
+
+interface Entry extends SafeWatcher {
+  callbacks: Set<EntryCallback>;
+  rewatch: () => void;
+  release: (callback: EntryCallback) => void;
+  _fire: (event: string) => void;
+}
+
+const entries: Record<string, Entry | null> = Object.create(null);
+
+// Folders that are watched recursively
+let watchRoots = new Set<string>();
+
 // Set of paths for which a change event has been fired, watched with
 // watchLibrary.watch if available. This could be an LRU cache, but in
 // practice it should never grow large enough for that to matter.
 const changedPaths = new Set;
 
-function shouldIgnorePath(absPath: string): boolean {
-  const posixPath = toPosixPath(absPath);
-  const parts = posixPath.split('/');
-
-  // Check for .meteor: allow the .meteor directory itself,
-  // but ignore its "local" subdirectory (or any immediate child folder that indicates cache).
-  const meteorIndex = parts.indexOf(".meteor");
-  if (meteorIndex !== -1) {
-    const nextPart = parts[meteorIndex + 1];
-    if (nextPart && nextPart === "local") {
-      // Ignore anything inside .meteor/local
-      return true;
-    }
-    // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
-  }
-
-  // For node_modules: ignore contents unless the package directory is a symlink (which means it’s under active development).
-  const nmIndex = parts.indexOf("node_modules");
-  if (nmIndex !== -1) {
-    try {
-      const stat = lstat(absPath);
-      if (!stat?.isSymbolicLink()) {
-        return true;
-      }
-      // If the package folder is symlinked, we want to watch it.
-    } catch (e) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-/**
- * Ensure that the given directory is being watched by @parcel/watcher.
- * If it is not a directory or is unwatchable, it is immediately added to an ignore set.
- */
-async function ensureWatchRoot(dirPath: string): Promise<void> {
-  if (!watcherEnabled || watchRoots.has(dirPath) || ignoredWatchRoots.has(dirPath)) {
-    return;
-  }
-
-  // If an ancestor is already watched, skip this one.
-  for (const root of watchRoots) {
-    const rel = pathRelative(root, dirPath);
-    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
-      return;
-    }
-  }
-
-  // Remove any existing roots that are now encompassed by the new one.
-  for (const root of Array.from(watchRoots)) {
-    const rel = pathRelative(dirPath, root);
-    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
-      const sub = dirSubscriptions.get(root);
-      if (sub) {
-        try {
-          await sub.unsubscribe();
-        } catch (_) {
-          /* ignore errors */
-        }
-      }
-      dirSubscriptions.delete(root);
-      watchRoots.delete(root);
-    }
-  }
-
-  const osDirPath = convertToOSPath(dirPath);
-  // Check that osDirPath is indeed a directory.
-  try {
-    const stats = statOrNull(osDirPath);
-    if (!stats?.isDirectory()) {
-      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
-      ignoredWatchRoots.add(dirPath);
-      return;
-    }
-  } catch (e) {
-    console.error(`Failed to stat ${osDirPath}:`, e);
-    ignoredWatchRoots.add(dirPath);
-    return;
-  }
-
-  // Set up ignore patterns to skip deep node_modules and .meteor/local cache
-  const ignorePatterns = ["**/node_modules/**", "**/.meteor/local/**"];
-  try {
-    const subscription = await ParcelWatcher.subscribe(
-        osDirPath,
-        (err, events) => {
-          if (err) {
-            console.error(`Parcel watcher error on ${osDirPath}:`, err);
-            // Only disable native watching for critical errors (like ENOSPC).
-            // @ts-ignore
-            if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
-              fallbackToPolling();
-            }
-            return;
-          }
-          // Dispatch each event to any registered entries.
-          for (const event of events) {
-            const changedPath = toPosixPath(event.path);
-            const entry = entries[changedPath];
-            if (!entry) continue;
-            // In Meteor's safe-watcher API, both create/update trigger "change" events.
-            const evtType = event.type === "delete" ? "delete" : "change";
-            entry._fire(evtType);
-          }
-        },
-        { ignore: ignorePatterns }
-    );
-    watchRoots.add(dirPath);
-    dirSubscriptions.set(dirPath, subscription);
-  } catch (e: any) {
-    if (
-        e &&
-        (e.code === "ENOTDIR" ||
-            /Not a directory/.test(e.message) ||
-            e.code === "EBADF" ||
-            /Bad file descriptor/.test(e.message))
-    ) {
-      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
-      ignoredWatchRoots.add(dirPath);
-    } else {
-      console.error(`Failed to start watcher for ${osDirPath}:`, e);
-      if (e.code === "ENOSPC" || e.errno === require("constants").ENOSPC) {
-        fallbackToPolling();
-      }
-    }
-  }
-}
-
-/**
- * Creates a new watch entry for a specific file (or directory) and
- * holds its registered callbacks.
- */
-function startNewEntry(absPath: string): Entry {
-  const callbacks = new Set<ChangeCallback>();
-  let closed = false;
-  const entry: Entry = {
-    callbacks,
-    close() {
-      if (closed) return;
-      closed = true;
-      delete entries[absPath];
-    },
-    _fire(event: string) {
-      callbacks.forEach(cb => {
-        try {
-          cb(event);
-        } catch (e) {
-          // Ignore callback errors.
-        }
-      });
-    }
-  };
-  return entry;
-}
-
-/**
- * The primary API function to watch a file or directory.
- * This registers the callback on the internally managed entry and
- * ensures that a Parcel watcher is subscribed to a covering directory.
- */
-export const watch = Profile(
-    "safeWatcher.watch",
-    (
-    absPath: string,
-    callback: ChangeCallback
-    ): SafeWatcher => {
-      absPath = toPosixPath(absPath);
-      // If the path should be ignored, immediately return a noop SafeWatcher.
-      if (shouldIgnorePath(absPath)) {
-        return { close() {} };
-      }
-      // If native watching is disabled, use the polling strategy.
-      if (!watcherEnabled) {
-        return startPolling(absPath, callback);
-      }
-      // Try to reuse an existing entry if one was created before.
-      let entry = entries[absPath];
-      if (!entry) {
-        entry = startNewEntry(absPath);
-        entries[absPath] = entry;
-        // Determine the directory that should be watched.
-        let watchTarget: string;
-        try {
-          const st = statOrNull(convertToOSPath(absPath));
-          watchTarget = st?.isDirectory() ? absPath : toPosixPath(dirname(convertToOSPath(absPath)));
-        } catch (e) {
-          watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
-        }
-        // Set up a watcher on the parent directory (or the directory itself) if not already active.
-        ensureWatchRoot(watchTarget);
-      }
-      // Register the callback for this file.
-      entry.callbacks.add(callback);
-      return {
-        close() {
-          if (entries[absPath]) {
-            entries[absPath]!.callbacks.delete(callback);
-            if (entries[absPath]!.callbacks.size === 0) {
-              entries[absPath]!.close();
-            }
-          }
-        }
-      };
-});
-
-/**
- * Externally force a directory to be watched.
- * If the provided path is a file, its parent directory is used.
- */
-export function addWatchRoot(absPath: string) {
-  absPath = toPosixPath(absPath);
-  let watchTarget = absPath;
-  try {
-    const st = statOrNull(convertToOSPath(absPath));
-    if (!st?.isDirectory()) {
-      watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
-    }
-  } catch (e) {
-    watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
-  }
-  ensureWatchRoot(watchTarget);
-}
-
-async function safeUnsubscribeSub(root: string) {
-  const sub = dirSubscriptions.get(root);
-  if (!sub) return;  // Already unsubscribed.
-  // Remove from our maps immediately to prevent further unsubscribe calls.
-  dirSubscriptions.delete(root);
-  watchRoots.delete(root);
-  try {
-    await sub.unsubscribe();
-  } catch (e) {
-    console.error(`Error during unsubscribe for ${root}:`, e);
-  }
-}
-
-export async function closeAllWatchers() {
-  for (const root of Array.from(watchRoots)) {
-    await safeUnsubscribeSub(root);
-  }
-}
-
 function hasPriority(absPath: string) {
   // If we're not prioritizing changed files, then all files have
   // priority, which means they should be watched with native file
   // watchers if the platform supports them. If we are prioritizing
   // changed files, then only changed files get priority.
   return PRIORITIZE_CHANGED
-      ? changedPaths.has(absPath)
-      : true;
+    ? changedPaths.has(absPath)
+    : true;
 }
 
-// Determines the polling interval to be used for the fs.watchFile-based
-// safety net that works on all platforms and file systems.
-function getPollingInterval(absPath: string): number {
-  if (hasPriority(absPath)) {
-    // Regardless of whether we have a native file watcher and it works
-    // correctly on this file system, poll prioritized files (that is,
-    // files that have been changed at least once) at a higher frequency
-    // (every 500ms by default).
+function acquireWatcher(absPath: string, callback: EntryCallback) {
+  const entry = entries[absPath] || (
+    entries[absPath] = startNewWatcher(absPath));
+
+  // Watches successfully established in the past may have become invalid
+  // because the watched file was deleted or renamed, so we need to make
+  // sure we're still watching every time we call safeWatcher.watch.
+  entry.rewatch();
+
+  // The size of the entry.callbacks Set also serves as a reference count
+  // for this watcher.
+  entry.callbacks.add(callback);
+
+  return entry;
+}
+
+function startNewWatcher(absPath: string): Entry {
+  let stat: Stats | BigIntStats | null | undefined = null;
+
+  if (DEDUPLICATE_BY_INO) {
+    stat = statOrNull(absPath);
+    if (stat && stat.ino > 0 && entriesByIno.has(stat.ino)) {
+      const entry = entriesByIno.get(stat.ino);
+      if (entries[absPath] === entry) {
+        return entry;
+      }
+    }
+  } else {
+    let entry = entries[absPath];
+    if (entry) {
+      return entry;
+    }
+  }
+
+  function safeUnwatch() {
+    if (watcher) {
+      watcher.close();
+      watcher = null;
+      if (stat && stat.ino > 0) {
+        entriesByIno.delete(stat.ino);
+      }
+    }
+  }
+
+  let lastWatcherEventTime = Date.now();
+  const callbacks = new Set<EntryCallback>();
+  let watcherCleanupTimer: ReturnType<typeof setTimeout> | null = null;
+  let watcher: FSWatcher | null = null;
+
+  // Determines the polling interval to be used for the fs.watchFile-based
+  // safety net that works on all platforms and file systems.
+  function getPollingInterval() {
+    if (hasPriority(absPath)) {
+      // Regardless of whether we have a native file watcher and it works
+      // correctly on this file system, poll prioritized files (that is,
+      // files that have been changed at least once) at a higher frequency
+      // (every 500ms by default).
+      return NO_WATCHER_POLLING_INTERVAL;
+    }
+
+    if (watcherEnabled || PRIORITIZE_CHANGED) {
+      // As long as native file watching is enabled (even if it doesn't
+      // work correctly) and the developer hasn't explicitly opted out of
+      // the file watching priority system, poll unchanged files at a
+      // lower frequency (every 5000ms by default).
+      return DEFAULT_POLLING_INTERVAL;
+    }
+
+    // If native file watching is disabled and the developer has
+    // explicitly opted out of the priority system, poll everything at the
+    // higher frequency (every 500ms by default). Note that this leads to
+    // higher idle CPU usage, so the developer may want to adjust the
+    // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
     return NO_WATCHER_POLLING_INTERVAL;
   }
 
-  if (watcherEnabled || PRIORITIZE_CHANGED) {
-    // As long as native file watching is enabled (even if it doesn't
-    // work correctly) and the developer hasn't explicitly opted out of
-    // the file watching priority system, poll unchanged files at a
-    // lower frequency (every 5000ms by default).
-    return DEFAULT_POLLING_INTERVAL;
-  }
+  function fire(event: string) {
+    if (event !== "change") {
+      // When we receive a "delete" or "rename" event, the watcher is
+      // probably not going to generate any more notifications for this
+      // file, so we close and nullify the watcher to ensure that
+      // entry.rewatch() will attempt to reestablish the watcher the next
+      // time we call safeWatcher.watch.
+      safeUnwatch();
 
-  // If native file watching is disabled and the developer has
-  // explicitly opted out of the priority system, poll everything at the
-  // higher frequency (every 500ms by default). Note that this leads to
-  // higher idle CPU usage, so the developer may want to adjust the
-  // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
-  return NO_WATCHER_POLLING_INTERVAL;
-}
+      // Make sure we don't throttle the watchFile callback after a
+      // "delete" or "rename" event, since it is now our only reliable
+      // source of file change notifications.
+      lastWatcherEventTime = 0;
 
-function startPolling(absPath: string, callback: ChangeCallback): SafeWatcher {
-  const osPath = convertToOSPath(absPath);
-  // Initial polling interval.
-  let interval = getPollingInterval(absPath);
-  const pollCallback = (curr: Stats, prev: Stats) => {
-    // Compare modification times to detect a change.
-    if (+curr.mtime !== +prev.mtime) {
+    } else {
       changedPaths.add(absPath);
-      callback("change");
+      rewatch();
     }
-  };
-  watchFile(osPath, { interval }, pollCallback);
-  return {
+
+    callbacks.forEach(cb => cb(event));
+  }
+
+  function watchWrapper(event: string) {
+    lastWatcherEventTime = Date.now();
+    fire(event);
+
+    // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
+    // but previous watcher success is no guarantee of future watcher
+    // reliability. For example, watchLibrary.watch works just fine when file
+    // changes originate from within a Vagrant VM, but changes to shared
+    // files made outside the VM are invisible to watcher, so our only
+    // hope of catching them is to continue polling.
+  }
+
+  function rewatch() {
+    if (hasPriority(absPath)) {
+      if (watcher) {
+        // Already watching; nothing to do.
+        return;
+      }
+      watcher = watchLibraryWatch(absPath, watchWrapper);
+    } else if (watcher) {
+      safeUnwatch();
+    }
+
+    // Since we're about to restart the stat-based file watcher, we don't
+    // want to miss any of its events because of the lastWatcherEventTime
+    // throttling that it attempts to do.
+    lastWatcherEventTime = 0;
+
+    // We use files.watchFile in addition to watcher.watch as a fail-safe
+    // to detect file changes even on network file systems.  However
+    // (unless the user disabled watcher or this watcher call failed), we
+    // use a relatively long default polling interval of 5000ms to save
+    // CPU cycles.
+    statWatch(absPath, getPollingInterval(), watchFileWrapper);
+  }
+
+  function watchFileWrapper(newStat: Stats, oldStat: Stats) {
+    if (newStat.ino === 0 &&
+        oldStat.ino === 0 &&
+        +newStat.mtime === +oldStat.mtime) {
+      // Node calls the watchFile listener once with bogus identical stat
+      // objects, which should not trigger a file change event.
+      return;
+    }
+
+    // If a watcher event fired in the last polling interval, ignore
+    // this event.
+    if (Date.now() - lastWatcherEventTime > getPollingInterval()) {
+      fire("change");
+    }
+  }
+
+  const entry = {
+    callbacks,
+    rewatch,
+
+    release(callback: EntryCallback) {
+      if (! entries[absPath]) {
+        return;
+      }
+
+      callbacks.delete(callback);
+      if (callbacks.size > 0) {
+        return;
+      }
+
+      // Once there are no more callbacks in the Set, close both watchers
+      // and nullify the shared data.
+      if (watcherCleanupTimer) {
+        clearTimeout(watcherCleanupTimer);
+      }
+
+      watcherCleanupTimer = setTimeout(() => {
+        if (callbacks.size > 0) {
+          // If another callback was added while the timer was pending, we
+          // can avoid tearing anything down.
+          return;
+        }
+        entry.close();
+      }, WATCHER_CLEANUP_DELAY_MS);
+    },
+
     close() {
-      unwatchFile(osPath, pollCallback);
-      changedPaths.delete(absPath);
-    }
+      if (entries[absPath] !== entry) return;
+      entries[absPath] = null;
+
+      if (watcherCleanupTimer) {
+        clearTimeout(watcherCleanupTimer);
+        watcherCleanupTimer = null;
+      }
+
+      safeUnwatch();
+
+      unwatchFile(absPath, watchFileWrapper);
+    },
+    _fire: fire
   };
+
+  if (stat && stat.ino > 0) {
+    entriesByIno.set(stat.ino, entry);
+  }
+
+  return entry;
 }
 
-/**
- * Fall back to polling. If a critical error occurs,
- * we disable native watching and close all existing native watchers.
- */
-function fallbackToPolling() {
-  if (watcherEnabled) {
-    console.error("Critical native watcher error encountered. Falling back to polling for all entries.");
-    watcherEnabled = false;
-    closeAllWatchers();
+export function closeAllWatchers() {
+  Object.keys(entries).forEach(absPath => {
+    const entry = entries[absPath];
+    if (entry) {
+      entry.close();
+    }
+  });
+}
+
+const statWatchers = Object.create(null);
+
+function statWatch(
+  absPath: string,
+  interval: number,
+  callback: (current: Stats, previous: Stats) => void,
+) {
+  let statWatcher = statWatchers[absPath];
+
+  if (!statWatcher) {
+    statWatcher = {
+      interval,
+      changeListeners: [],
+      stat: null
+    };
+    statWatchers[absPath] = statWatcher;
+  }
+
+  // If the interval needs to be changed, replace the watcher.
+  // Node will only recreate the watcher with the new interval if all old
+  // watchers are stopped (which unwatchFile does when not passed a
+  // specific listener)
+  if (statWatcher.interval !== interval && statWatcher.stat) {
+    // This stops all stat watchers for the file, not just those created by
+    // statWatch
+    unwatchFile(absPath);
+    statWatcher.stat = null;
+    statWatcher.interval = interval;
+  }
+
+  if (!statWatcher.changeListeners.includes(callback)) {
+    statWatcher.changeListeners.push(callback);
+  }
+
+  if (!statWatcher.stat) {
+    const newStat = watchFile(absPath, {
+      persistent: false, // never persistent
+      interval,
+    }, (newStat, oldStat) => {
+      statWatcher.changeListeners.forEach((
+        listener: (newStat: Stats, oldStat: Stats) => void
+      ) => {
+          listener(newStat, oldStat);
+      });
+    });
+
+    newStat.on("stop", () => {
+      if (statWatchers[absPath] === statWatch) {
+        delete statWatchers[absPath];
+      }
+    });
+
+    statWatcher.stat = newStat;
+  }
+
+  return statWatcher;
+}
+
+function watchLibraryWatch(absPath: string, callback: EntryCallback) {
+  if (watcherEnabled && watcherLibrary === 'pathwatcher') {
+    try {
+      return pathwatcher.watch(convertToOSPath(absPath), callback);
+    } catch (e: any) {
+      maybeSuggestRaisingWatchLimit(e);
+      // ... ignore the error.  We'll still have watchFile, which is good
+      // enough.
+    }
+  }
+
+  return null;
+}
+
+let suggestedRaisingWatchLimit = false;
+
+function maybeSuggestRaisingWatchLimit(error: Error & { errno: number }) {
+  var constants = require('constants');
+  var archinfo = require('../utils/archinfo');
+  if (! suggestedRaisingWatchLimit &&
+      // Note: the not-super-documented require('constants') maps from
+      // strings to SYSTEM errno values. System errno values aren't the same
+      // as the numbers used internally by libuv! Once we're upgraded
+      // to Node 0.12, we'll have the system errno as a string (on 'code'),
+      // but the support for that wasn't in Node 0.10's uv.
+      // See our PR https://github.com/atom/node-pathwatcher/pull/53
+      // (and make sure to read the final commit message, not the original
+      // proposed PR, which had a slightly different interface).
+      error.errno === constants.ENOSPC &&
+      // The only suggestion we currently have is for Linux.
+      archinfo.matches(archinfo.host(), 'os.linux')) {
+
+    // Check suggestedRaisingWatchLimit again because archinfo.host() may
+    // have yielded.
+    if (suggestedRaisingWatchLimit) return;
+    suggestedRaisingWatchLimit = true;
+
+    var Console = require('../console/console.js').Console;
+    if (! Console.isHeadless()) {
+      Console.arrowWarn(
+        "It looks like a simple tweak to your system's configuration will " +
+          "make many tools (including this Meteor command) more efficient. " +
+          "To learn more, see " +
+          Console.url("https://github.com/meteor/docs/blob/master/long-form/file-change-watcher-efficiency.md"));
+    }
   }
 }
+
+export const watch = Profile(
+  "safeWatcher.watch",
+  (absPath: string, callback: EntryCallback) => {
+    const entry = acquireWatcher(absPath, callback);
+    return {
+      close() {
+        entry.release(callback);
+      }
+    } as SafeWatcher;
+  }
+);
+
+const fireNames = {
+  [nsfw.actions.CREATED]: 'change',
+  [nsfw.actions.MODIFIED]: 'change',
+  [nsfw.actions.DELETED]: 'delete'
+}
+
+export function addWatchRoot(absPath: string) {
+  if (watchRoots.has(absPath) || watcherLibrary !== 'nsfw' || !watcherEnabled) {
+    return;
+  }
+
+  watchRoots.add(absPath);
+
+  // If there already is a watcher for a parent directory, there is no need
+  // to create this watcher.
+  for (const path of watchRoots) {
+    let relativePath = pathRelative(path, absPath);
+    if (
+      path !== absPath &&
+      !relativePath.startsWith('..') &&
+      !relativePath.startsWith('/')
+    ) {
+      return;
+    }
+  }
+
+  // TODO: check if there are any existing watchers that are children of this
+  // watcher and stop them
+
+  nsfw(
+    convertToOSPath(absPath),
+    (events) => {
+      events.forEach(event => {
+        if(event.action === nsfw.actions.RENAMED) {
+          let oldPath = nativeJoin(event.directory, event.oldFile);
+          let oldEntry = entries[toPosixPath(oldPath)];
+          if (oldEntry) {
+            oldEntry._fire('rename');
+          }
+
+          let path = nativeJoin(event.newDirectory, event.newFile);
+          let newEntry = entries[toPosixPath(path)];
+          if (newEntry) {
+            newEntry._fire('change');
+          }
+        } else {
+            let path = nativeJoin(event.directory, event.file);
+            let entry = entries[toPosixPath(path)];
+            if (entry) {
+              entry._fire(fireNames[event.action]);
+            }
+        }
+      })
+    }
+  ).then(watcher => {
+    watcher.start()
+  });
+}

From 31d2b7337857fd47cb6bfe14295038997d1855d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 16 Apr 2025 10:56:27 +0200
Subject: [PATCH 100/264] Revert "Revert "support @parcel/watcher as the
 watcher alternative cross-os perserving polling fallback""

This reverts commit 6de4d9dd14f589a393c398e279b65e20c0c30341.
---
 scripts/dev-bundle-tool-package.js |   3 +-
 tools/fs/safe-watcher.ts           | 770 ++++++++++++-----------------
 2 files changed, 330 insertions(+), 443 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 2b92b9e5f6..8d9292efb0 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -57,8 +57,7 @@ var packageJson = {
     escope: "3.6.0",
     split2: "3.2.2",
     multipipe: "2.0.1",
-    pathwatcher: "8.1.2",
-    "vscode-nsfw": "2.1.8",
+    "@parcel/watcher": "2.5.1",
     // The @wry/context package version must be compatible with the
     // version constraint imposed by optimism/package.json.
     optimism: "0.16.1",
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index cea3d74d7b..5f521fb024 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,476 +1,364 @@
-import { FSWatcher, Stats, BigIntStats } from "fs";
+import { Stats } from 'fs';
+import { dirname } from "path";
+import ParcelWatcher from "@parcel/watcher";
+
 import { Profile } from "../tool-env/profile";
-import {
-  statOrNull,
-  convertToOSPath,
-  watchFile,
-  unwatchFile,
-  toPosixPath,
-  pathRelative
-} from "./files";
-import {
-  join as nativeJoin
-} from 'path';
-import nsfw from 'vscode-nsfw';
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
 
-const pathwatcher = require('pathwatcher');
+export type SafeWatcher = { close: () => void; };
+
+type ChangeCallback = (event: string) => void;
+
+interface Entry extends SafeWatcher {
+  callbacks: Set<ChangeCallback>;
+  _fire(event: string): void;
+}
+
+// Registry mapping normalized absolute paths to their watcher entry.
+const entries: Record<string, Entry | null> = Object.create(null);
+
+// Watch roots are directories for which we have an active ParcelWatcher subscription.
+const watchRoots = new Set<string>();
+// For each watch root, store its active subscription.
+const dirSubscriptions = new Map<string, ParcelWatcher.AsyncSubscription>();
+// A set of roots that are known to be unwatchable.
+const ignoredWatchRoots = new Set<string>();
+
+// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
+// force the use of files.watchFile instead of ParcelWatcher.
+let watcherEnabled = !JSON.parse(process.env.METEOR_WATCH_FORCE_POLLING || "false");
+
+/**
+ * Polling fallback globals.
+ * The legacy Meteor strategy used polling for cases where native watchers failed.
+ * We keep track of files that changed, so that we can poll them faster.
+ */
+var DEFAULT_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
+
+var NO_WATCHER_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
 
-// Default to prioritizing changed files, but disable that behavior (and
-// thus prioritize all files equally) if METEOR_WATCH_PRIORITIZE_CHANGED
-// is explicitly set to a string that parses to a falsy value.
 var PRIORITIZE_CHANGED = true;
 if (process.env.METEOR_WATCH_PRIORITIZE_CHANGED &&
     ! JSON.parse(process.env.METEOR_WATCH_PRIORITIZE_CHANGED)) {
   PRIORITIZE_CHANGED = false;
 }
 
-var DEFAULT_POLLING_INTERVAL =
-  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
-
-var NO_WATCHER_POLLING_INTERVAL =
-  +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
-
-// This may seems like a long time to wait before actually closing the
-// file watchers, but it's to our advantage if they survive restarts.
-const WATCHER_CLEANUP_DELAY_MS = 30000;
-
-// Since linux doesn't have recursive file watching, nsfw has to walk the
-// watched folder and create a separate watcher for each subfolder. Until it has a
-// way for us to filter which folders it walks we will continue to use
-// pathwatcher to avoid having too many watchers.
-let watcherLibrary = process.env.METEOR_WATCHER_LIBRARY ||
-  (process.platform === 'linux' ? 'pathwatcher' : 'nsfw');
-
-// Pathwatcher complains (using console.error, ugh) if you try to watch
-// two files with the same stat.ino number but different paths on linux, so we have
-// to deduplicate files by ino.
-const DEDUPLICATE_BY_INO = watcherLibrary === 'pathwatcher';
-// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
-// force the use of files.watchFile instead of watchLibrary.watch.
-let watcherEnabled = ! JSON.parse(
-  process.env.METEOR_WATCH_FORCE_POLLING || "false"
-);
-
-const entriesByIno = new Map;
-
-export type SafeWatcher = {
-  close: () => void;
-}
-
-type EntryCallback = (event: string) => void;
-
-interface Entry extends SafeWatcher {
-  callbacks: Set<EntryCallback>;
-  rewatch: () => void;
-  release: (callback: EntryCallback) => void;
-  _fire: (event: string) => void;
-}
-
-const entries: Record<string, Entry | null> = Object.create(null);
-
-// Folders that are watched recursively
-let watchRoots = new Set<string>();
-
 // Set of paths for which a change event has been fired, watched with
 // watchLibrary.watch if available. This could be an LRU cache, but in
 // practice it should never grow large enough for that to matter.
 const changedPaths = new Set;
 
+function shouldIgnorePath(absPath: string): boolean {
+  const posixPath = toPosixPath(absPath);
+  const parts = posixPath.split('/');
+
+  // Check for .meteor: allow the .meteor directory itself,
+  // but ignore its "local" subdirectory (or any immediate child folder that indicates cache).
+  const meteorIndex = parts.indexOf(".meteor");
+  if (meteorIndex !== -1) {
+    const nextPart = parts[meteorIndex + 1];
+    if (nextPart && nextPart === "local") {
+      // Ignore anything inside .meteor/local
+      return true;
+    }
+    // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
+  }
+
+  // For node_modules: ignore contents unless the package directory is a symlink (which means it’s under active development).
+  const nmIndex = parts.indexOf("node_modules");
+  if (nmIndex !== -1) {
+    try {
+      const stat = lstat(absPath);
+      if (!stat?.isSymbolicLink()) {
+        return true;
+      }
+      // If the package folder is symlinked, we want to watch it.
+    } catch (e) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Ensure that the given directory is being watched by @parcel/watcher.
+ * If it is not a directory or is unwatchable, it is immediately added to an ignore set.
+ */
+async function ensureWatchRoot(dirPath: string): Promise<void> {
+  if (!watcherEnabled || watchRoots.has(dirPath) || ignoredWatchRoots.has(dirPath)) {
+    return;
+  }
+
+  // If an ancestor is already watched, skip this one.
+  for (const root of watchRoots) {
+    const rel = pathRelative(root, dirPath);
+    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
+      return;
+    }
+  }
+
+  // Remove any existing roots that are now encompassed by the new one.
+  for (const root of Array.from(watchRoots)) {
+    const rel = pathRelative(dirPath, root);
+    if (root !== dirPath && !rel.startsWith("..") && !rel.startsWith("/")) {
+      const sub = dirSubscriptions.get(root);
+      if (sub) {
+        try {
+          await sub.unsubscribe();
+        } catch (_) {
+          /* ignore errors */
+        }
+      }
+      dirSubscriptions.delete(root);
+      watchRoots.delete(root);
+    }
+  }
+
+  const osDirPath = convertToOSPath(dirPath);
+  // Check that osDirPath is indeed a directory.
+  try {
+    const stats = statOrNull(osDirPath);
+    if (!stats?.isDirectory()) {
+      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
+      ignoredWatchRoots.add(dirPath);
+      return;
+    }
+  } catch (e) {
+    console.error(`Failed to stat ${osDirPath}:`, e);
+    ignoredWatchRoots.add(dirPath);
+    return;
+  }
+
+  // Set up ignore patterns to skip deep node_modules and .meteor/local cache
+  const ignorePatterns = ["**/node_modules/**", "**/.meteor/local/**"];
+  try {
+    const subscription = await ParcelWatcher.subscribe(
+        osDirPath,
+        (err, events) => {
+          if (err) {
+            console.error(`Parcel watcher error on ${osDirPath}:`, err);
+            // Only disable native watching for critical errors (like ENOSPC).
+            // @ts-ignore
+            if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
+              fallbackToPolling();
+            }
+            return;
+          }
+          // Dispatch each event to any registered entries.
+          for (const event of events) {
+            const changedPath = toPosixPath(event.path);
+            const entry = entries[changedPath];
+            if (!entry) continue;
+            // In Meteor's safe-watcher API, both create/update trigger "change" events.
+            const evtType = event.type === "delete" ? "delete" : "change";
+            entry._fire(evtType);
+          }
+        },
+        { ignore: ignorePatterns }
+    );
+    watchRoots.add(dirPath);
+    dirSubscriptions.set(dirPath, subscription);
+  } catch (e: any) {
+    if (
+        e &&
+        (e.code === "ENOTDIR" ||
+            /Not a directory/.test(e.message) ||
+            e.code === "EBADF" ||
+            /Bad file descriptor/.test(e.message))
+    ) {
+      console.warn(`Skipping watcher for ${osDirPath}: not a directory`);
+      ignoredWatchRoots.add(dirPath);
+    } else {
+      console.error(`Failed to start watcher for ${osDirPath}:`, e);
+      if (e.code === "ENOSPC" || e.errno === require("constants").ENOSPC) {
+        fallbackToPolling();
+      }
+    }
+  }
+}
+
+/**
+ * Creates a new watch entry for a specific file (or directory) and
+ * holds its registered callbacks.
+ */
+function startNewEntry(absPath: string): Entry {
+  const callbacks = new Set<ChangeCallback>();
+  let closed = false;
+  const entry: Entry = {
+    callbacks,
+    close() {
+      if (closed) return;
+      closed = true;
+      delete entries[absPath];
+    },
+    _fire(event: string) {
+      callbacks.forEach(cb => {
+        try {
+          cb(event);
+        } catch (e) {
+          // Ignore callback errors.
+        }
+      });
+    }
+  };
+  return entry;
+}
+
+/**
+ * The primary API function to watch a file or directory.
+ * This registers the callback on the internally managed entry and
+ * ensures that a Parcel watcher is subscribed to a covering directory.
+ */
+export const watch = Profile(
+    "safeWatcher.watch",
+    (
+    absPath: string,
+    callback: ChangeCallback
+    ): SafeWatcher => {
+      absPath = toPosixPath(absPath);
+      // If the path should be ignored, immediately return a noop SafeWatcher.
+      if (shouldIgnorePath(absPath)) {
+        return { close() {} };
+      }
+      // If native watching is disabled, use the polling strategy.
+      if (!watcherEnabled) {
+        return startPolling(absPath, callback);
+      }
+      // Try to reuse an existing entry if one was created before.
+      let entry = entries[absPath];
+      if (!entry) {
+        entry = startNewEntry(absPath);
+        entries[absPath] = entry;
+        // Determine the directory that should be watched.
+        let watchTarget: string;
+        try {
+          const st = statOrNull(convertToOSPath(absPath));
+          watchTarget = st?.isDirectory() ? absPath : toPosixPath(dirname(convertToOSPath(absPath)));
+        } catch (e) {
+          watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+        }
+        // Set up a watcher on the parent directory (or the directory itself) if not already active.
+        ensureWatchRoot(watchTarget);
+      }
+      // Register the callback for this file.
+      entry.callbacks.add(callback);
+      return {
+        close() {
+          if (entries[absPath]) {
+            entries[absPath]!.callbacks.delete(callback);
+            if (entries[absPath]!.callbacks.size === 0) {
+              entries[absPath]!.close();
+            }
+          }
+        }
+      };
+});
+
+/**
+ * Externally force a directory to be watched.
+ * If the provided path is a file, its parent directory is used.
+ */
+export function addWatchRoot(absPath: string) {
+  absPath = toPosixPath(absPath);
+  let watchTarget = absPath;
+  try {
+    const st = statOrNull(convertToOSPath(absPath));
+    if (!st?.isDirectory()) {
+      watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+    }
+  } catch (e) {
+    watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+  }
+  ensureWatchRoot(watchTarget);
+}
+
+async function safeUnsubscribeSub(root: string) {
+  const sub = dirSubscriptions.get(root);
+  if (!sub) return;  // Already unsubscribed.
+  // Remove from our maps immediately to prevent further unsubscribe calls.
+  dirSubscriptions.delete(root);
+  watchRoots.delete(root);
+  try {
+    await sub.unsubscribe();
+  } catch (e) {
+    console.error(`Error during unsubscribe for ${root}:`, e);
+  }
+}
+
+export async function closeAllWatchers() {
+  for (const root of Array.from(watchRoots)) {
+    await safeUnsubscribeSub(root);
+  }
+}
+
 function hasPriority(absPath: string) {
   // If we're not prioritizing changed files, then all files have
   // priority, which means they should be watched with native file
   // watchers if the platform supports them. If we are prioritizing
   // changed files, then only changed files get priority.
   return PRIORITIZE_CHANGED
-    ? changedPaths.has(absPath)
-    : true;
+      ? changedPaths.has(absPath)
+      : true;
 }
 
-function acquireWatcher(absPath: string, callback: EntryCallback) {
-  const entry = entries[absPath] || (
-    entries[absPath] = startNewWatcher(absPath));
-
-  // Watches successfully established in the past may have become invalid
-  // because the watched file was deleted or renamed, so we need to make
-  // sure we're still watching every time we call safeWatcher.watch.
-  entry.rewatch();
-
-  // The size of the entry.callbacks Set also serves as a reference count
-  // for this watcher.
-  entry.callbacks.add(callback);
-
-  return entry;
-}
-
-function startNewWatcher(absPath: string): Entry {
-  let stat: Stats | BigIntStats | null | undefined = null;
-
-  if (DEDUPLICATE_BY_INO) {
-    stat = statOrNull(absPath);
-    if (stat && stat.ino > 0 && entriesByIno.has(stat.ino)) {
-      const entry = entriesByIno.get(stat.ino);
-      if (entries[absPath] === entry) {
-        return entry;
-      }
-    }
-  } else {
-    let entry = entries[absPath];
-    if (entry) {
-      return entry;
-    }
-  }
-
-  function safeUnwatch() {
-    if (watcher) {
-      watcher.close();
-      watcher = null;
-      if (stat && stat.ino > 0) {
-        entriesByIno.delete(stat.ino);
-      }
-    }
-  }
-
-  let lastWatcherEventTime = Date.now();
-  const callbacks = new Set<EntryCallback>();
-  let watcherCleanupTimer: ReturnType<typeof setTimeout> | null = null;
-  let watcher: FSWatcher | null = null;
-
-  // Determines the polling interval to be used for the fs.watchFile-based
-  // safety net that works on all platforms and file systems.
-  function getPollingInterval() {
-    if (hasPriority(absPath)) {
-      // Regardless of whether we have a native file watcher and it works
-      // correctly on this file system, poll prioritized files (that is,
-      // files that have been changed at least once) at a higher frequency
-      // (every 500ms by default).
-      return NO_WATCHER_POLLING_INTERVAL;
-    }
-
-    if (watcherEnabled || PRIORITIZE_CHANGED) {
-      // As long as native file watching is enabled (even if it doesn't
-      // work correctly) and the developer hasn't explicitly opted out of
-      // the file watching priority system, poll unchanged files at a
-      // lower frequency (every 5000ms by default).
-      return DEFAULT_POLLING_INTERVAL;
-    }
-
-    // If native file watching is disabled and the developer has
-    // explicitly opted out of the priority system, poll everything at the
-    // higher frequency (every 500ms by default). Note that this leads to
-    // higher idle CPU usage, so the developer may want to adjust the
-    // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
+// Determines the polling interval to be used for the fs.watchFile-based
+// safety net that works on all platforms and file systems.
+function getPollingInterval(absPath: string): number {
+  if (hasPriority(absPath)) {
+    // Regardless of whether we have a native file watcher and it works
+    // correctly on this file system, poll prioritized files (that is,
+    // files that have been changed at least once) at a higher frequency
+    // (every 500ms by default).
     return NO_WATCHER_POLLING_INTERVAL;
   }
 
-  function fire(event: string) {
-    if (event !== "change") {
-      // When we receive a "delete" or "rename" event, the watcher is
-      // probably not going to generate any more notifications for this
-      // file, so we close and nullify the watcher to ensure that
-      // entry.rewatch() will attempt to reestablish the watcher the next
-      // time we call safeWatcher.watch.
-      safeUnwatch();
+  if (watcherEnabled || PRIORITIZE_CHANGED) {
+    // As long as native file watching is enabled (even if it doesn't
+    // work correctly) and the developer hasn't explicitly opted out of
+    // the file watching priority system, poll unchanged files at a
+    // lower frequency (every 5000ms by default).
+    return DEFAULT_POLLING_INTERVAL;
+  }
 
-      // Make sure we don't throttle the watchFile callback after a
-      // "delete" or "rename" event, since it is now our only reliable
-      // source of file change notifications.
-      lastWatcherEventTime = 0;
+  // If native file watching is disabled and the developer has
+  // explicitly opted out of the priority system, poll everything at the
+  // higher frequency (every 500ms by default). Note that this leads to
+  // higher idle CPU usage, so the developer may want to adjust the
+  // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
+  return NO_WATCHER_POLLING_INTERVAL;
+}
 
-    } else {
+function startPolling(absPath: string, callback: ChangeCallback): SafeWatcher {
+  const osPath = convertToOSPath(absPath);
+  // Initial polling interval.
+  let interval = getPollingInterval(absPath);
+  const pollCallback = (curr: Stats, prev: Stats) => {
+    // Compare modification times to detect a change.
+    if (+curr.mtime !== +prev.mtime) {
       changedPaths.add(absPath);
-      rewatch();
+      callback("change");
     }
-
-    callbacks.forEach(cb => cb(event));
-  }
-
-  function watchWrapper(event: string) {
-    lastWatcherEventTime = Date.now();
-    fire(event);
-
-    // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
-    // but previous watcher success is no guarantee of future watcher
-    // reliability. For example, watchLibrary.watch works just fine when file
-    // changes originate from within a Vagrant VM, but changes to shared
-    // files made outside the VM are invisible to watcher, so our only
-    // hope of catching them is to continue polling.
-  }
-
-  function rewatch() {
-    if (hasPriority(absPath)) {
-      if (watcher) {
-        // Already watching; nothing to do.
-        return;
-      }
-      watcher = watchLibraryWatch(absPath, watchWrapper);
-    } else if (watcher) {
-      safeUnwatch();
-    }
-
-    // Since we're about to restart the stat-based file watcher, we don't
-    // want to miss any of its events because of the lastWatcherEventTime
-    // throttling that it attempts to do.
-    lastWatcherEventTime = 0;
-
-    // We use files.watchFile in addition to watcher.watch as a fail-safe
-    // to detect file changes even on network file systems.  However
-    // (unless the user disabled watcher or this watcher call failed), we
-    // use a relatively long default polling interval of 5000ms to save
-    // CPU cycles.
-    statWatch(absPath, getPollingInterval(), watchFileWrapper);
-  }
-
-  function watchFileWrapper(newStat: Stats, oldStat: Stats) {
-    if (newStat.ino === 0 &&
-        oldStat.ino === 0 &&
-        +newStat.mtime === +oldStat.mtime) {
-      // Node calls the watchFile listener once with bogus identical stat
-      // objects, which should not trigger a file change event.
-      return;
-    }
-
-    // If a watcher event fired in the last polling interval, ignore
-    // this event.
-    if (Date.now() - lastWatcherEventTime > getPollingInterval()) {
-      fire("change");
-    }
-  }
-
-  const entry = {
-    callbacks,
-    rewatch,
-
-    release(callback: EntryCallback) {
-      if (! entries[absPath]) {
-        return;
-      }
-
-      callbacks.delete(callback);
-      if (callbacks.size > 0) {
-        return;
-      }
-
-      // Once there are no more callbacks in the Set, close both watchers
-      // and nullify the shared data.
-      if (watcherCleanupTimer) {
-        clearTimeout(watcherCleanupTimer);
-      }
-
-      watcherCleanupTimer = setTimeout(() => {
-        if (callbacks.size > 0) {
-          // If another callback was added while the timer was pending, we
-          // can avoid tearing anything down.
-          return;
-        }
-        entry.close();
-      }, WATCHER_CLEANUP_DELAY_MS);
-    },
-
-    close() {
-      if (entries[absPath] !== entry) return;
-      entries[absPath] = null;
-
-      if (watcherCleanupTimer) {
-        clearTimeout(watcherCleanupTimer);
-        watcherCleanupTimer = null;
-      }
-
-      safeUnwatch();
-
-      unwatchFile(absPath, watchFileWrapper);
-    },
-    _fire: fire
   };
-
-  if (stat && stat.ino > 0) {
-    entriesByIno.set(stat.ino, entry);
-  }
-
-  return entry;
-}
-
-export function closeAllWatchers() {
-  Object.keys(entries).forEach(absPath => {
-    const entry = entries[absPath];
-    if (entry) {
-      entry.close();
+  watchFile(osPath, { interval }, pollCallback);
+  return {
+    close() {
+      unwatchFile(osPath, pollCallback);
+      changedPaths.delete(absPath);
     }
-  });
+  };
 }
 
-const statWatchers = Object.create(null);
-
-function statWatch(
-  absPath: string,
-  interval: number,
-  callback: (current: Stats, previous: Stats) => void,
-) {
-  let statWatcher = statWatchers[absPath];
-
-  if (!statWatcher) {
-    statWatcher = {
-      interval,
-      changeListeners: [],
-      stat: null
-    };
-    statWatchers[absPath] = statWatcher;
-  }
-
-  // If the interval needs to be changed, replace the watcher.
-  // Node will only recreate the watcher with the new interval if all old
-  // watchers are stopped (which unwatchFile does when not passed a
-  // specific listener)
-  if (statWatcher.interval !== interval && statWatcher.stat) {
-    // This stops all stat watchers for the file, not just those created by
-    // statWatch
-    unwatchFile(absPath);
-    statWatcher.stat = null;
-    statWatcher.interval = interval;
-  }
-
-  if (!statWatcher.changeListeners.includes(callback)) {
-    statWatcher.changeListeners.push(callback);
-  }
-
-  if (!statWatcher.stat) {
-    const newStat = watchFile(absPath, {
-      persistent: false, // never persistent
-      interval,
-    }, (newStat, oldStat) => {
-      statWatcher.changeListeners.forEach((
-        listener: (newStat: Stats, oldStat: Stats) => void
-      ) => {
-          listener(newStat, oldStat);
-      });
-    });
-
-    newStat.on("stop", () => {
-      if (statWatchers[absPath] === statWatch) {
-        delete statWatchers[absPath];
-      }
-    });
-
-    statWatcher.stat = newStat;
-  }
-
-  return statWatcher;
-}
-
-function watchLibraryWatch(absPath: string, callback: EntryCallback) {
-  if (watcherEnabled && watcherLibrary === 'pathwatcher') {
-    try {
-      return pathwatcher.watch(convertToOSPath(absPath), callback);
-    } catch (e: any) {
-      maybeSuggestRaisingWatchLimit(e);
-      // ... ignore the error.  We'll still have watchFile, which is good
-      // enough.
-    }
-  }
-
-  return null;
-}
-
-let suggestedRaisingWatchLimit = false;
-
-function maybeSuggestRaisingWatchLimit(error: Error & { errno: number }) {
-  var constants = require('constants');
-  var archinfo = require('../utils/archinfo');
-  if (! suggestedRaisingWatchLimit &&
-      // Note: the not-super-documented require('constants') maps from
-      // strings to SYSTEM errno values. System errno values aren't the same
-      // as the numbers used internally by libuv! Once we're upgraded
-      // to Node 0.12, we'll have the system errno as a string (on 'code'),
-      // but the support for that wasn't in Node 0.10's uv.
-      // See our PR https://github.com/atom/node-pathwatcher/pull/53
-      // (and make sure to read the final commit message, not the original
-      // proposed PR, which had a slightly different interface).
-      error.errno === constants.ENOSPC &&
-      // The only suggestion we currently have is for Linux.
-      archinfo.matches(archinfo.host(), 'os.linux')) {
-
-    // Check suggestedRaisingWatchLimit again because archinfo.host() may
-    // have yielded.
-    if (suggestedRaisingWatchLimit) return;
-    suggestedRaisingWatchLimit = true;
-
-    var Console = require('../console/console.js').Console;
-    if (! Console.isHeadless()) {
-      Console.arrowWarn(
-        "It looks like a simple tweak to your system's configuration will " +
-          "make many tools (including this Meteor command) more efficient. " +
-          "To learn more, see " +
-          Console.url("https://github.com/meteor/docs/blob/master/long-form/file-change-watcher-efficiency.md"));
-    }
+/**
+ * Fall back to polling. If a critical error occurs,
+ * we disable native watching and close all existing native watchers.
+ */
+function fallbackToPolling() {
+  if (watcherEnabled) {
+    console.error("Critical native watcher error encountered. Falling back to polling for all entries.");
+    watcherEnabled = false;
+    closeAllWatchers();
   }
 }
-
-export const watch = Profile(
-  "safeWatcher.watch",
-  (absPath: string, callback: EntryCallback) => {
-    const entry = acquireWatcher(absPath, callback);
-    return {
-      close() {
-        entry.release(callback);
-      }
-    } as SafeWatcher;
-  }
-);
-
-const fireNames = {
-  [nsfw.actions.CREATED]: 'change',
-  [nsfw.actions.MODIFIED]: 'change',
-  [nsfw.actions.DELETED]: 'delete'
-}
-
-export function addWatchRoot(absPath: string) {
-  if (watchRoots.has(absPath) || watcherLibrary !== 'nsfw' || !watcherEnabled) {
-    return;
-  }
-
-  watchRoots.add(absPath);
-
-  // If there already is a watcher for a parent directory, there is no need
-  // to create this watcher.
-  for (const path of watchRoots) {
-    let relativePath = pathRelative(path, absPath);
-    if (
-      path !== absPath &&
-      !relativePath.startsWith('..') &&
-      !relativePath.startsWith('/')
-    ) {
-      return;
-    }
-  }
-
-  // TODO: check if there are any existing watchers that are children of this
-  // watcher and stop them
-
-  nsfw(
-    convertToOSPath(absPath),
-    (events) => {
-      events.forEach(event => {
-        if(event.action === nsfw.actions.RENAMED) {
-          let oldPath = nativeJoin(event.directory, event.oldFile);
-          let oldEntry = entries[toPosixPath(oldPath)];
-          if (oldEntry) {
-            oldEntry._fire('rename');
-          }
-
-          let path = nativeJoin(event.newDirectory, event.newFile);
-          let newEntry = entries[toPosixPath(path)];
-          if (newEntry) {
-            newEntry._fire('change');
-          }
-        } else {
-            let path = nativeJoin(event.directory, event.file);
-            let entry = entries[toPosixPath(path)];
-            if (entry) {
-              entry._fire(fireNames[event.action]);
-            }
-        }
-      })
-    }
-  ).then(watcher => {
-    watcher.start()
-  });
-}

From 95c59bed286caafe98d147bf76e8cf614bfaa3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 16 Apr 2025 11:54:47 +0200
Subject: [PATCH 101/264] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index b743dccaa9..b86a040689 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.10
+BUNDLE_VERSION=22.14.0.11
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 04477d52dc742bc1c54d564bf8107174401742b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 16 Apr 2025 12:04:12 +0200
Subject: [PATCH 102/264] re-run checks


From 3763bea0e99130fcb7e3e1f7e28487515921f3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 14:00:35 +0200
Subject: [PATCH 103/264] don't use transactions for sqlite read queries

---
 tools/cli/commands.js                     |  1 -
 tools/packaging/catalog/catalog-remote.js | 70 ++++++++++++++---------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index c44a026cd7..130b51df25 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -473,7 +473,6 @@ main.registerCommand(Object.assign(
 
 async function doRunCommand(options) {
   Console.setVerbose(!!options.verbose);
-
   // Additional args are interpreted as run targets
   const runTargets = parseRunTargets(options.args);
 
diff --git a/tools/packaging/catalog/catalog-remote.js b/tools/packaging/catalog/catalog-remote.js
index e40be5086c..643dedc7f5 100644
--- a/tools/packaging/catalog/catalog-remote.js
+++ b/tools/packaging/catalog/catalog-remote.js
@@ -441,9 +441,9 @@ Object.assign(Table.prototype, {
     return "(" + _.times(n, function () { return "?" }).join(",") + ")";
   },
 
-  find: async function (txn, id) {
+  find: async function (id) {
     var self = this;
-    var rows = await txn.query(self._selectQuery, [ id ]);
+    var rows = await self.db._query(self._selectQuery, [ id ]);
     if (rows.length !== 0) {
       if (rows.length !== 1) {
         throw new Error("Corrupt database (PK violation)");
@@ -812,24 +812,44 @@ Object.assign(RemoteCatalog.prototype, {
   // Given a release track, returns all recommended version *records* for this
   // track, sorted by their orderKey. Returns the empty array if the release
   // track does not exist or does not have any recommended versions.
+  // getSortedRecommendedReleaseRecords: async function (track, laterThanOrderKey) {
+  //   var self = this;
+  //   // XXX releaseVersions content objects are kinda big; if we put
+  //   // 'recommended' and 'orderKey' in their own columns this could be faster
+  //   var result = await self._contentQuery(
+  //     "SELECT content FROM releaseVersions WHERE track=?", track);
+  //
+  //   var recommended = _.filter(result, function (v) {
+  //     if (!v.recommended)
+  //       return false;
+  //     return !laterThanOrderKey || v.orderKey > laterThanOrderKey;
+  //   });
+  //
+  //   var recSort = _.sortBy(recommended, function (rec) {
+  //     return rec.orderKey;
+  //   });
+  //   recSort.reverse();
+  //   return recSort;
+  // },
+
   getSortedRecommendedReleaseRecords: async function (track, laterThanOrderKey) {
-    var self = this;
-    // XXX releaseVersions content objects are kinda big; if we put
-    // 'recommended' and 'orderKey' in their own columns this could be faster
-    var result = await self._contentQuery(
-      "SELECT content FROM releaseVersions WHERE track=?", track);
+    const hasMinKey = laterThanOrderKey != null;
 
-    var recommended = _.filter(result, function (v) {
-      if (!v.recommended)
-        return false;
-      return !laterThanOrderKey || v.orderKey > laterThanOrderKey;
-    });
+    // Always use JSON1 to filter & sort directly in SQL
+    const sql = `
+    SELECT content
+    FROM releaseVersions
+    WHERE track = ?
+      AND json_extract(content, '$.recommended') = 1
+      ${hasMinKey ? "AND json_extract(content, '$.orderKey') > ?" : ""}
+    ORDER BY json_extract(content, '$.orderKey') DESC
+  `;
+    const params = hasMinKey
+        ? [track, laterThanOrderKey]
+        : [track];
 
-    var recSort = _.sortBy(recommended, function (rec) {
-      return rec.orderKey;
-    });
-    recSort.reverse();
-    return recSort;
+    // _contentQuery will JSON.parse(content) for you
+    return this._contentQuery(sql, params);
   },
 
   // Given a release track, returns all version records for this track.
@@ -881,9 +901,9 @@ Object.assign(RemoteCatalog.prototype, {
   },
 
   // Executes a query, returning an array of each content column parsed as JSON
-  _contentQuery: async function (query, params) {
+  _contentQuery: async function (query, params, transaction = false) {
     var self = this;
-    var rows = await self._columnsQuery(query, params);
+    var rows = await self._columnsQuery(query, params, transaction);
     return _.map(rows, function(entity) {
       return JSON.parse(entity.content);
     });
@@ -893,9 +913,7 @@ Object.assign(RemoteCatalog.prototype, {
   // No JSON parsing is performed.
   _columnsQuery: async function (query, params) {
     var self = this;
-    var rows = await self.db.runInTransaction(function (txn) {
-      return txn.query(query, params);
-    });
+    var rows = await self.db._query(query, params);
     return rows;
   },
 
@@ -946,9 +964,7 @@ Object.assign(RemoteCatalog.prototype, {
 
   getMetadata: async function(key) {
     var self = this;
-    var row = await self.db.runInTransaction(function (txn) {
-      return self.tableMetadata.find(txn, key);
-    });
+    var row = await self.tableMetadata.find(key);
     if (row) {
       return JSON.parse(row['content']);
     }
@@ -970,9 +986,7 @@ Object.assign(RemoteCatalog.prototype, {
 
   shouldShowBanner: async function (releaseName, bannerDate) {
     var self = this;
-    var row = await self.db.runInTransaction(function (txn) {
-      return self.tableBannersShown.find(txn, releaseName);
-    });
+    var row = await self.tableBannersShown.find(releaseName);
     // We've never printed a banner for this release.
     if (! row)
       return true;

From 2ca305cd63a6cb20d3d7054b9dda89e52c7b7ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 14:03:17 +0200
Subject: [PATCH 104/264] clean

---
 tools/packaging/catalog/catalog-remote.js | 24 ++---------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/tools/packaging/catalog/catalog-remote.js b/tools/packaging/catalog/catalog-remote.js
index 643dedc7f5..ca78109f1a 100644
--- a/tools/packaging/catalog/catalog-remote.js
+++ b/tools/packaging/catalog/catalog-remote.js
@@ -812,26 +812,6 @@ Object.assign(RemoteCatalog.prototype, {
   // Given a release track, returns all recommended version *records* for this
   // track, sorted by their orderKey. Returns the empty array if the release
   // track does not exist or does not have any recommended versions.
-  // getSortedRecommendedReleaseRecords: async function (track, laterThanOrderKey) {
-  //   var self = this;
-  //   // XXX releaseVersions content objects are kinda big; if we put
-  //   // 'recommended' and 'orderKey' in their own columns this could be faster
-  //   var result = await self._contentQuery(
-  //     "SELECT content FROM releaseVersions WHERE track=?", track);
-  //
-  //   var recommended = _.filter(result, function (v) {
-  //     if (!v.recommended)
-  //       return false;
-  //     return !laterThanOrderKey || v.orderKey > laterThanOrderKey;
-  //   });
-  //
-  //   var recSort = _.sortBy(recommended, function (rec) {
-  //     return rec.orderKey;
-  //   });
-  //   recSort.reverse();
-  //   return recSort;
-  // },
-
   getSortedRecommendedReleaseRecords: async function (track, laterThanOrderKey) {
     const hasMinKey = laterThanOrderKey != null;
 
@@ -901,9 +881,9 @@ Object.assign(RemoteCatalog.prototype, {
   },
 
   // Executes a query, returning an array of each content column parsed as JSON
-  _contentQuery: async function (query, params, transaction = false) {
+  _contentQuery: async function (query, params) {
     var self = this;
-    var rows = await self._columnsQuery(query, params, transaction);
+    var rows = await self._columnsQuery(query, params);
     return _.map(rows, function(entity) {
       return JSON.parse(entity.content);
     });

From 3df0e26258ee10b11fbf96db142b50cbaa4efe1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 15:05:05 +0200
Subject: [PATCH 105/264] clean

---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 130b51df25..c44a026cd7 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -473,6 +473,7 @@ main.registerCommand(Object.assign(
 
 async function doRunCommand(options) {
   Console.setVerbose(!!options.verbose);
+
   // Additional args are interpreted as run targets
   const runTargets = parseRunTargets(options.args);
 

From a18fadef80e42d7af848259bbf67011ed7fad66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 16:28:13 +0200
Subject: [PATCH 106/264] fix issue with find operation on table, make sure to
 pass the db

---
 tools/packaging/catalog/catalog-remote.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/packaging/catalog/catalog-remote.js b/tools/packaging/catalog/catalog-remote.js
index ca78109f1a..85b0fefc12 100644
--- a/tools/packaging/catalog/catalog-remote.js
+++ b/tools/packaging/catalog/catalog-remote.js
@@ -441,9 +441,9 @@ Object.assign(Table.prototype, {
     return "(" + _.times(n, function () { return "?" }).join(",") + ")";
   },
 
-  find: async function (id) {
+  find: async function (db, id) {
     var self = this;
-    var rows = await self.db._query(self._selectQuery, [ id ]);
+    var rows = await db._query(self._selectQuery, [ id ]);
     if (rows.length !== 0) {
       if (rows.length !== 1) {
         throw new Error("Corrupt database (PK violation)");
@@ -944,7 +944,7 @@ Object.assign(RemoteCatalog.prototype, {
 
   getMetadata: async function(key) {
     var self = this;
-    var row = await self.tableMetadata.find(key);
+    var row = await self.tableMetadata.find(self.db, key);
     if (row) {
       return JSON.parse(row['content']);
     }
@@ -966,7 +966,7 @@ Object.assign(RemoteCatalog.prototype, {
 
   shouldShowBanner: async function (releaseName, bannerDate) {
     var self = this;
-    var row = await self.tableBannersShown.find(releaseName);
+    var row = await self.tableBannersShown.find(self.db, releaseName);
     // We've never printed a banner for this release.
     if (! row)
       return true;

From 2b2300639c7ae884f5c00bdb4a52659ff72ffbcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 17:52:41 +0200
Subject: [PATCH 107/264] adapt code to support lru and intent to solve tests
 breaking

---
 tools/fs/safe-watcher.ts | 51 +++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 5f521fb024..b0e4165bef 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,6 +1,7 @@
 import { Stats } from 'fs';
 import { dirname } from "path";
 import ParcelWatcher from "@parcel/watcher";
+import LRUCache from 'lru-cache';
 
 import { Profile } from "../tool-env/profile";
 import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
@@ -14,8 +15,39 @@ interface Entry extends SafeWatcher {
   _fire(event: string): void;
 }
 
+// Set METEOR_WATCH_USE_LRU environment variable to a truthy value to
+// enable LRU caching for watcher entries to reduce memory usage.
+const useLRU = Boolean(JSON.parse(process.env.METEOR_WATCH_USE_LRU || "true"));
+
 // Registry mapping normalized absolute paths to their watcher entry.
-const entries: Record<string, Entry | null> = Object.create(null);
+// If LRU caching is enabled, this will be an LRUCache instance.
+// Otherwise, we use a Map object for entries.
+const entries = useLRU
+  ? new LRUCache<string, Entry | null>({
+      max: Math.pow(2, 20), // 1MB max size
+      length: (entry, key) => {
+        return key.length + (entry ? 100 : 10);
+      },
+      dispose: (key, entry) => {
+        return entry.close()
+      },
+    })
+  : new Map<string, Entry | null>();
+
+function getEntry(path: string): Entry | null | undefined {
+  return entries.get(path);
+}
+
+function setEntry(path: string, entry: Entry | null): void {
+  entries.set(path, entry);
+}
+
+function deleteEntry(path: string): void {
+  if (useLRU) {
+    return entries.del(path);
+  }
+  return entries.delete(path);
+}
 
 // Watch roots are directories for which we have an active ParcelWatcher subscription.
 const watchRoots = new Set<string>();
@@ -150,7 +182,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
           // Dispatch each event to any registered entries.
           for (const event of events) {
             const changedPath = toPosixPath(event.path);
-            const entry = entries[changedPath];
+            const entry = getEntry(changedPath);
             if (!entry) continue;
             // In Meteor's safe-watcher API, both create/update trigger "change" events.
             const evtType = event.type === "delete" ? "delete" : "change";
@@ -192,7 +224,7 @@ function startNewEntry(absPath: string): Entry {
     close() {
       if (closed) return;
       closed = true;
-      delete entries[absPath];
+      deleteEntry(absPath);
     },
     _fire(event: string) {
       callbacks.forEach(cb => {
@@ -228,10 +260,10 @@ export const watch = Profile(
         return startPolling(absPath, callback);
       }
       // Try to reuse an existing entry if one was created before.
-      let entry = entries[absPath];
+      let entry = getEntry(absPath);
       if (!entry) {
         entry = startNewEntry(absPath);
-        entries[absPath] = entry;
+        setEntry(absPath, entry);
         // Determine the directory that should be watched.
         let watchTarget: string;
         try {
@@ -247,10 +279,11 @@ export const watch = Profile(
       entry.callbacks.add(callback);
       return {
         close() {
-          if (entries[absPath]) {
-            entries[absPath]!.callbacks.delete(callback);
-            if (entries[absPath]!.callbacks.size === 0) {
-              entries[absPath]!.close();
+          const entry = getEntry(absPath);
+          if (entry) {
+            entry.callbacks.delete(callback);
+            if (entry.callbacks.size === 0) {
+              entry.close();
             }
           }
         }

From d6c1ecacb7dd2c641efb1089ebdf5a3e27535381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 18:21:08 +0200
Subject: [PATCH 108/264] dont activate lru by default

---
 tools/fs/safe-watcher.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index b0e4165bef..659e3fc54c 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -17,19 +17,22 @@ interface Entry extends SafeWatcher {
 
 // Set METEOR_WATCH_USE_LRU environment variable to a truthy value to
 // enable LRU caching for watcher entries to reduce memory usage.
-const useLRU = Boolean(JSON.parse(process.env.METEOR_WATCH_USE_LRU || "true"));
+const useLRU = Boolean(JSON.parse(process.env.METEOR_WATCH_USE_LRU || "false"));
+
+// enable to tweak maximum entries size (default 500MB).
+const sizeMaxLRU = JSON.parse(process.env.METEOR_WATCH_USE_LRU_SIZE || Math.pow(2, 20) * 500);
 
 // Registry mapping normalized absolute paths to their watcher entry.
 // If LRU caching is enabled, this will be an LRUCache instance.
 // Otherwise, we use a Map object for entries.
 const entries = useLRU
   ? new LRUCache<string, Entry | null>({
-      max: Math.pow(2, 20), // 1MB max size
+      max: sizeMaxLRU, // 1MB max size
       length: (entry, key) => {
         return key.length + (entry ? 100 : 10);
       },
       dispose: (key, entry) => {
-        return entry.close()
+        return entry.close();
       },
     })
   : new Map<string, Entry | null>();

From cca65e3751f77e17c73719aeacd1e0b2b99f3a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 18:29:20 +0200
Subject: [PATCH 109/264] fix precheck

---
 tools/fs/safe-watcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 659e3fc54c..f7a2c86296 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -32,7 +32,7 @@ const entries = useLRU
         return key.length + (entry ? 100 : 10);
       },
       dispose: (key, entry) => {
-        return entry.close();
+        return entry?.close();
       },
     })
   : new Map<string, Entry | null>();

From d6f52c3e77df065cb924970cd7c8a8688f6f2095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 19:16:28 +0200
Subject: [PATCH 110/264] use polling on CI as using a linux env with inotify
 backend

---
 .circleci/config.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be2fe2cae4..65b5920634 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,6 +115,16 @@ build_machine_environment:
     NUM_GROUPS: 12
     RUNNING_AVG_LENGTH: 6
 
+    # Force Meteor to use polling to avoid errors like:
+    # "double free or corruption (out) IOT instruction"
+    # Happens on Linux when using the inotify backend.
+    # Doesn't affect watching files with @parcel/watch,
+    # but causes Meteor commands to exit errored.
+    # This impacts CI pipelines.
+    # Using Watchman can fix the issue as well.
+    METEOR_WATCH_FORCE_POLLING: true
+    METEOR_WATCH_POLLING_INTERVAL_MS: 1000
+
 jobs:
   Get Ready:
     <<: *build_machine_environment

From fe36f5ed7088d07eaf19e78ac3a1767830557eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 21 Apr 2025 19:21:48 +0200
Subject: [PATCH 111/264] fix

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65b5920634..7dace8fe26 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,7 @@ build_machine_environment:
 
     # Force Meteor to use polling to avoid errors like:
     # "double free or corruption (out) IOT instruction"
-    # Happens on Linux when using the inotify backend.
+    # Happens on Linux when using the fts (brute force) backend.
     # Doesn't affect watching files with @parcel/watch,
     # but causes Meteor commands to exit errored.
     # This impacts CI pipelines.

From ab067c7e7800a634b687857783426c0e1cdc8825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 22 Apr 2025 16:39:53 +0200
Subject: [PATCH 112/264] fix issue with memory by ensure unsubscribing all
 watchers

---
 .circleci/config.yml     | 10 ----------
 tools/fs/safe-watcher.ts | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7dace8fe26..be2fe2cae4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,16 +115,6 @@ build_machine_environment:
     NUM_GROUPS: 12
     RUNNING_AVG_LENGTH: 6
 
-    # Force Meteor to use polling to avoid errors like:
-    # "double free or corruption (out) IOT instruction"
-    # Happens on Linux when using the fts (brute force) backend.
-    # Doesn't affect watching files with @parcel/watch,
-    # but causes Meteor commands to exit errored.
-    # This impacts CI pipelines.
-    # Using Watchman can fix the issue as well.
-    METEOR_WATCH_FORCE_POLLING: true
-    METEOR_WATCH_POLLING_INTERVAL_MS: 1000
-
 jobs:
   Get Ready:
     <<: *build_machine_environment
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index f7a2c86296..6834975f03 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -6,6 +6,43 @@ import LRUCache from 'lru-cache';
 import { Profile } from "../tool-env/profile";
 import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
 
+// Register process exit handlers to ensure subscriptions are properly cleaned up
+const registerExitHandlers = () => {
+
+  // For SIGINT and SIGTERM, we need to handle the async cleanup before the process exits
+  const cleanupAndExit = (signal: string) => {
+    // Clear the timeout if cleanup completes successfully
+    closeAllWatchers().then(() => {
+      process.exit(0);
+    }).catch(err => {
+      console.error(`Error closing watchers on ${signal}:`, err);
+      process.exit(1);
+    });
+  };
+
+  // Handle SIGINT (Ctrl+C)
+  process.on('SIGINT', () => cleanupAndExit('SIGINT'));
+
+  // Handle SIGTERM
+  process.on('SIGTERM', () => cleanupAndExit('SIGTERM'));
+
+  // Handle 'exit' event
+  process.on('exit', () => {
+    try {
+      for (const root of Array.from(watchRoots)) {
+        const sub = dirSubscriptions.get(root);
+        if (sub) {
+          sub.unsubscribe();
+          dirSubscriptions.delete(root);
+          watchRoots.delete(root);
+        }
+      }
+    } catch (err) {
+      console.error('Error during synchronous cleanup on exit:', err);
+    }
+  });
+};
+
 export type SafeWatcher = { close: () => void; };
 
 type ChangeCallback = (event: string) => void;
@@ -398,3 +435,6 @@ function fallbackToPolling() {
     closeAllWatchers();
   }
 }
+
+// Register exit handlers to ensure proper cleanup of subscriptions
+registerExitHandlers();

From efe346f3fa869fd3df6e69286eb002fd790ac0a8 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Sat, 29 Mar 2025 07:36:37 -0300
Subject: [PATCH 113/264] builder: removing files async

---
 tools/isobuild/builder.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 563d47bf01..997872d60b 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -126,7 +126,21 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
   async init() {
     // Build the output from scratch
     if (this.resetBuildPath) {
-      await files.rm_recursive(this.buildPath);
+      // Generate a temp path name for the old build directory
+      const oldBuildPath = this.buildPath + '.old-' + Math.floor(Math.random() * 999999);
+      
+      // If the original buildPath exists, rename it first
+      if (files.exists(this.buildPath)) {
+        await files.rename(this.buildPath, oldBuildPath);
+        
+        // Start deletion of old directory asynchronously without awaiting
+        files.rm_recursive(oldBuildPath).catch(e => {
+          // Log error but don't fail the build
+          console.error(`Error removing old build directory ${oldBuildPath}:`, e);
+        });
+      }
+      
+      // Create the new build directory immediately without waiting for deletion
       await files.mkdir_p(this.buildPath, 0o755);
     }
     this.watchSet = new WatchSet();

From a53781d8526ba65d010be9f75647313a514f765d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 22 Apr 2025 17:32:59 +0200
Subject: [PATCH 114/264] apply broadly the rm_recursive_deferred strategy

---
 tools/cli/commands.js             |  2 +-
 tools/fs/files.ts                 | 14 ++++++++++++++
 tools/isobuild/builder.js         | 25 +++++++------------------
 tools/isobuild/compiler-plugin.js |  2 +-
 tools/isobuild/isopack-cache.js   | 10 +++++-----
 tools/isobuild/meteor-npm.js      | 14 +++++++-------
 tools/project-context.js          |  2 +-
 tools/runners/run-mongo.js        |  2 +-
 8 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index c44a026cd7..9436a44c97 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1601,7 +1601,7 @@ https://guide.meteor.com/cordova.html#submitting-android
     });
   }
 
-  await files.rm_recursive(buildDir);
+  await files.rm_recursive_deferred(buildDir);
 
   const npmShrinkwrapFilePath = files.pathJoin(bundlePath, 'programs/server/npm-shrinkwrap.json');
   if (files.exists(npmShrinkwrapFilePath)) {
diff --git a/tools/fs/files.ts b/tools/fs/files.ts
index cc9e0c8ee7..1babe78416 100644
--- a/tools/fs/files.ts
+++ b/tools/fs/files.ts
@@ -358,6 +358,20 @@ export const rm_recursive = Profile("files.rm_recursive", async (path: string) =
   }
 });
 
+export const rm_recursive_deferred = Profile("files.rm_recursive_deferred", async (path: string) => {
+  // Generate a temp path name for the old build directory
+  const oldBuildPath = path + '.old-' + Math.floor(Math.random() * 999999);
+  // If the original buildPath exists, rename it first
+  if (exists(path)) {
+    await rename(path, oldBuildPath);
+    // Start deletion of old directory asynchronously without awaiting
+    rm_recursive(oldBuildPath).catch(e => {
+      // Log error but don't fail the build
+      console.error(`Error removing old build directory ${oldBuildPath}:`, e);
+    });
+  }
+});
+
 // Returns the base64 SHA256 of the given file.
 export function fileHash(filename: string) {
   const crypto = require('crypto');
diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 997872d60b..edf1174049 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -1,7 +1,7 @@
 import assert from "assert";
 import {WatchSet, readAndWatchFile, sha1} from '../fs/watch';
 import files, {
-  symlinkWithOverwrite, realpath,
+  symlinkWithOverwrite, realpath, rm_recursive_deferred,
 } from '../fs/files';
 import NpmDiscards from './npm-discards';
 import {Profile} from '../tool-env/profile';
@@ -126,20 +126,9 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
   async init() {
     // Build the output from scratch
     if (this.resetBuildPath) {
-      // Generate a temp path name for the old build directory
-      const oldBuildPath = this.buildPath + '.old-' + Math.floor(Math.random() * 999999);
-      
-      // If the original buildPath exists, rename it first
-      if (files.exists(this.buildPath)) {
-        await files.rename(this.buildPath, oldBuildPath);
-        
-        // Start deletion of old directory asynchronously without awaiting
-        files.rm_recursive(oldBuildPath).catch(e => {
-          // Log error but don't fail the build
-          console.error(`Error removing old build directory ${oldBuildPath}:`, e);
-        });
-      }
-      
+      console.time("--> (builder.js-Line: 130)\n await files.rm_recursive_deferred: ");
+      await files.rm_recursive_deferred(this.buildPath);
+      console.timeEnd("--> (builder.js-Line: 130)\n await files.rm_recursive_deferred: ");
       // Create the new build directory immediately without waiting for deletion
       await files.mkdir_p(this.buildPath, 0o755);
     }
@@ -895,7 +884,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           removed[path] = true;
         } else {
           // directory
-          await files.rm_recursive(absPath);
+          await files.rm_recursive_deferred(absPath);
 
           // mark all sub-paths as removed, too
           paths.forEach((anotherPath) => {
@@ -918,7 +907,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
 
   // Delete the partially-completed bundle. Do not disturb outputPath.
   abort() {
-    return files.rm_recursive(this.buildPath);
+    return files.rm_recursive_deferred(this.buildPath);
   }
 
   // Returns a WatchSet representing all files that were read from disk by the
@@ -950,7 +939,7 @@ async function atomicallyRewriteFile(path, data, options) {
       // replacing a directory with a file; this is rare (so it can
       // be a slow path) but can legitimately happen if e.g. a developer
       // puts a file where there used to be a directory in their app.
-      await files.rm_recursive(path);
+      await files.rm_recursive_deferred(path);
       files.rename(rpath, path);
     } else {
       throw e;
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index f2a52e6373..6eaa2f332c 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1832,7 +1832,7 @@ export class PackageSourceBatch {
       if (cacheFilename) {
         // Write asynchronously.
         try {
-          await files.rm_recursive(wildcardCacheFilename);
+          await files.rm_recursive_deferred(wildcardCacheFilename);
         } finally {
           await files.writeFileAtomically(cacheFilename, retAsJSON);
         }
diff --git a/tools/isobuild/isopack-cache.js b/tools/isobuild/isopack-cache.js
index 3ae3104dab..850db04166 100644
--- a/tools/isobuild/isopack-cache.js
+++ b/tools/isobuild/isopack-cache.js
@@ -83,19 +83,19 @@ export class IsopackCache {
       // Wipe specific packages.
       for (const packageName of packages) {
         if (self.cacheDir) {
-          await files.rm_recursive(self._isopackDir(packageName));
+          await files.rm_recursive_deferred(self._isopackDir(packageName));
         }
         if (self._pluginCacheDirRoot) {
-          await files.rm_recursive(self._pluginCacheDirForPackage(packageName));
+          await files.rm_recursive_deferred(self._pluginCacheDirForPackage(packageName));
         }
       }
     } else {
       // Wipe all packages.
       if (self.cacheDir) {
-        await files.rm_recursive(self.cacheDir);
+        await files.rm_recursive_deferred(self.cacheDir);
       }
       if (self._pluginCacheDirRoot) {
-        await files.rm_recursive(self._pluginCacheDirRoot);
+        await files.rm_recursive_deferred(self._pluginCacheDirRoot);
       }
     }
   }
@@ -351,7 +351,7 @@ export class IsopackCache {
         } else {
           // Nope! Compile it again. Give it a fresh plugin cache.
           if (pluginCacheDir) {
-            await files.rm_recursive(pluginCacheDir);
+            await files.rm_recursive_deferred(pluginCacheDir);
             files.mkdir_p(pluginCacheDir);
           }
 
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index f051abc634..d1ebe42341 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -87,7 +87,7 @@ meteorNpm.updateDependencies = async function (packageName,
       // It didn't exist, which is exactly what we wanted.
       return false;
     }
-    await files.rm_recursive(newPackageNpmDir);
+    await files.rm_recursive_deferred(newPackageNpmDir);
     return false;
   }
 
@@ -102,7 +102,7 @@ meteorNpm.updateDependencies = async function (packageName,
     // proceed.
     if (files.exists(packageNpmDir) &&
         ! files.exists(files.pathJoin(packageNpmDir, 'npm-shrinkwrap.json'))) {
-      await files.rm_recursive(packageNpmDir);
+      await files.rm_recursive_deferred(packageNpmDir);
     }
 
     // with the changes on npm 8, where there were changes to how the packages metadata is given
@@ -114,7 +114,7 @@ meteorNpm.updateDependencies = async function (packageName,
           files.pathJoin(packageNpmDir, 'npm-shrinkwrap.json')
         ));
         if (shrinkwrap.lockfileVersion !== LOCK_FILE_VERSION) {
-          await files.rm_recursive(packageNpmDir);
+          await files.rm_recursive_deferred(packageNpmDir);
         }
       } catch (e) {}
     }
@@ -143,7 +143,7 @@ meteorNpm.updateDependencies = async function (packageName,
     throw e;
   } finally {
     if (files.exists(newPackageNpmDir)) {
-      await files.rm_recursive(newPackageNpmDir);
+      await files.rm_recursive_deferred(newPackageNpmDir);
     }
     tmpDirs = _.without(tmpDirs, newPackageNpmDir);
   }
@@ -384,7 +384,7 @@ Profile("meteorNpm.rebuildIfNonPortable", async function (nodeModulesDir) {
   const rebuildResult = await runNpmCommand(getRebuildArgs(), tempDir);
   if (! rebuildResult.success) {
     buildmessage.error(rebuildResult.error);
-    await files.rm_recursive(tempDir);
+    await files.rm_recursive_deferred(tempDir);
     return false;
   }
 
@@ -420,7 +420,7 @@ Profile("meteorNpm.rebuildIfNonPortable", async function (nodeModulesDir) {
     await files.renameDirAlmostAtomically(tempPkgDirs[pkgPath], pkgPath);
   }
 
-  await files.rm_recursive(tempDir);
+  await files.rm_recursive_deferred(tempDir);
 
   return true;
 });
@@ -644,7 +644,7 @@ var updateExistingNpmDirectory = async function (packageName, newPackageNpmDir,
     }
 
     if (oldNodeVersion !== currentNodeCompatibilityVersion()) {
-      await files.rm_recursive(nodeModulesDir);
+      await files.rm_recursive_deferred(nodeModulesDir);
     }
   }
 
diff --git a/tools/project-context.js b/tools/project-context.js
index 192b3558db..0dce0164eb 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1664,7 +1664,7 @@ Object.assign(exports.ReleaseFile.prototype, {
     if (this.isCheckout()) {
       // Only create .meteor/local/dev_bundle if .meteor/release refers to
       // an actual release, and remove it otherwise.
-      await files.rm_recursive(devBundleLink);
+      await files.rm_recursive_deferred(devBundleLink);
       return;
     }
 
diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 3b8b8bf603..c9a7de7334 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -474,7 +474,7 @@ var launchMongo = async function(options) {
     if (options.multiple) {
       // This is only for testing, so we're OK with incurring the replset
       // setup on each startup.
-      await files.rm_recursive(dbPath);
+      await files.rm_recursive_deferred(dbPath);
       files.mkdir_p(dbPath, 0o755);
     } else if (portFile) {
       var portFileExists = false;

From 79a91702e24d963b582cb4868355a68dcc7903df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 22 Apr 2025 17:34:02 +0200
Subject: [PATCH 115/264] clean logs

---
 tools/isobuild/builder.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index edf1174049..8472f15f16 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -126,9 +126,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
   async init() {
     // Build the output from scratch
     if (this.resetBuildPath) {
-      console.time("--> (builder.js-Line: 130)\n await files.rm_recursive_deferred: ");
       await files.rm_recursive_deferred(this.buildPath);
-      console.timeEnd("--> (builder.js-Line: 130)\n await files.rm_recursive_deferred: ");
       // Create the new build directory immediately without waiting for deletion
       await files.mkdir_p(this.buildPath, 0o755);
     }

From 90cf947d524cf839ff79688e194371195cba4089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 22 Apr 2025 18:04:39 +0200
Subject: [PATCH 116/264] improve global includedWebArchs for later compilation

---
 tools/cli/commands.js      | 6 ++++--
 tools/isobuild/compiler.js | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index ad46ad573d..78d90cc834 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -545,7 +545,8 @@ async function doRunCommand(options) {
   }
 
   webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir, options);
-  global.webArchs = webArchs;
+  // Set the webArchs to include for compilation later
+  global.includedWebArchs = webArchs;
 
   const buildMode = options.production ? 'production' : 'development';
 
@@ -2514,7 +2515,8 @@ var runTestAppForPackages = async function (projectContext, options) {
     webArchs.push("web.cordova");
   }
   buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory, options);
-  global.webArchs = buildOptions.webArchs;
+  // Set the webArchs to include for compilation later
+  global.includedWebArchs = buildOptions.webArchs;
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 6fa2793186..1f3f2b15bd 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -150,7 +150,7 @@ compiler.compile = Profile(function (packageSource, options) {
   // Isopack#initFromPath).
   var isobuildFeatures = [];
   packageSource.architectures.forEach((sourceArch) => {
-    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(sourceArch.arch)) return;
+    if (global.includedWebArchs != null && ![...global.includedWebArchs, 'os'].includes(sourceArch.arch)) return;
     sourceArch.uses.forEach((use) => {
       if (!use.weak && isIsobuildFeaturePackage(use.package) &&
           isobuildFeatures.indexOf(use.package) === -1) {
@@ -182,7 +182,7 @@ compiler.compile = Profile(function (packageSource, options) {
     if (architecture.arch === 'web.cordova' && ! includeCordovaUnibuild) {
       continue;
     }
-    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
+    if (global.includedWebArchs != null && ![...global.includedWebArchs, 'os'].includes(architecture.arch)) continue;
 
     // TODO -> Maybe this withCache will bring some problems in other commands.
     await files.withCache(async () => {
@@ -228,7 +228,7 @@ compiler.lint = Profile(function (packageSource, options) {
         && architecture.arch === 'web.cordova') {
       continue;
     }
-    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
+    if (global.includedWebArchs != null && ![...global.includedWebArchs, 'os'].includes(architecture.arch)) continue;
 
     const unibuildWarnings = await lintUnibuild({
       isopack: options.isopack,
@@ -249,7 +249,7 @@ compiler.getMinifiers = async function (packageSource, options) {
 
   var minifiers = [];
   for (const architecture of packageSource.architectures) {
-    if (global.webArchs != null && ![...global.webArchs, 'os'].includes(architecture.arch)) continue;
+    if (global.includedWebArchs != null && ![...global.includedWebArchs, 'os'].includes(architecture.arch)) continue;
 
     var activePluginPackages = await getActivePluginPackages(options.isopack, {
       isopackCache: options.isopackCache,

From e4a057cf7f27a41d49d2d5e3dba9c1c1819d9524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 08:58:02 +0200
Subject: [PATCH 117/264] ensure to mark a path as being subscribed beforehand
 to avoid parallel repeated subscriptions to the same folder context

---
 tools/fs/safe-watcher.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 6834975f03..f70c7aef3d 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -207,6 +207,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
   // Set up ignore patterns to skip deep node_modules and .meteor/local cache
   const ignorePatterns = ["**/node_modules/**", "**/.meteor/local/**"];
   try {
+    watchRoots.add(dirPath);
     const subscription = await ParcelWatcher.subscribe(
         osDirPath,
         (err, events) => {
@@ -217,6 +218,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
             if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
               fallbackToPolling();
             }
+            watchRoots.delete(dirPath);
             return;
           }
           // Dispatch each event to any registered entries.
@@ -231,7 +233,6 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
         },
         { ignore: ignorePatterns }
     );
-    watchRoots.add(dirPath);
     dirSubscriptions.set(dirPath, subscription);
   } catch (e: any) {
     if (
@@ -249,6 +250,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
         fallbackToPolling();
       }
     }
+    watchRoots.delete(dirPath);
   }
 }
 

From a50f07b7802ab6ca08a057a91f980895784be0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 09:05:21 +0200
Subject: [PATCH 118/264] remove LRU on file replacement since finally was not
 needed to fix an issue

---
 tools/fs/safe-watcher.ts | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index f70c7aef3d..984470028c 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,7 +1,6 @@
 import { Stats } from 'fs';
 import { dirname } from "path";
 import ParcelWatcher from "@parcel/watcher";
-import LRUCache from 'lru-cache';
 
 import { Profile } from "../tool-env/profile";
 import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
@@ -52,27 +51,8 @@ interface Entry extends SafeWatcher {
   _fire(event: string): void;
 }
 
-// Set METEOR_WATCH_USE_LRU environment variable to a truthy value to
-// enable LRU caching for watcher entries to reduce memory usage.
-const useLRU = Boolean(JSON.parse(process.env.METEOR_WATCH_USE_LRU || "false"));
-
-// enable to tweak maximum entries size (default 500MB).
-const sizeMaxLRU = JSON.parse(process.env.METEOR_WATCH_USE_LRU_SIZE || Math.pow(2, 20) * 500);
-
 // Registry mapping normalized absolute paths to their watcher entry.
-// If LRU caching is enabled, this will be an LRUCache instance.
-// Otherwise, we use a Map object for entries.
-const entries = useLRU
-  ? new LRUCache<string, Entry | null>({
-      max: sizeMaxLRU, // 1MB max size
-      length: (entry, key) => {
-        return key.length + (entry ? 100 : 10);
-      },
-      dispose: (key, entry) => {
-        return entry?.close();
-      },
-    })
-  : new Map<string, Entry | null>();
+const entries = new Map<string, Entry | null>();
 
 function getEntry(path: string): Entry | null | undefined {
   return entries.get(path);
@@ -83,10 +63,7 @@ function setEntry(path: string, entry: Entry | null): void {
 }
 
 function deleteEntry(path: string): void {
-  if (useLRU) {
-    return entries.del(path);
-  }
-  return entries.delete(path);
+  entries.delete(path);
 }
 
 // Watch roots are directories for which we have an active ParcelWatcher subscription.
@@ -118,8 +95,7 @@ if (process.env.METEOR_WATCH_PRIORITIZE_CHANGED &&
 }
 
 // Set of paths for which a change event has been fired, watched with
-// watchLibrary.watch if available. This could be an LRU cache, but in
-// practice it should never grow large enough for that to matter.
+// watchLibrary.watch if available.
 const changedPaths = new Set;
 
 function shouldIgnorePath(absPath: string): boolean {

From 2338850138108833ff9748d1f2dec6e67a6bc198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 10:04:24 +0200
Subject: [PATCH 119/264] watch properly add/delete events

---
 tools/fs/safe-watcher.ts | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 984470028c..4da8a8fe2b 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,9 +1,8 @@
 import { Stats } from 'fs';
-import { dirname } from "path";
 import ParcelWatcher from "@parcel/watcher";
 
 import { Profile } from "../tool-env/profile";
-import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile } from "./files";
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
 
 // Register process exit handlers to ensure subscriptions are properly cleaned up
 const registerExitHandlers = () => {
@@ -66,6 +65,27 @@ function deleteEntry(path: string): void {
   entries.delete(path);
 }
 
+function findNearestEntry(startPath: string): Entry | null {
+  let currentPath = pathResolve(startPath);
+
+  while (true) {
+    const entry = getEntry(currentPath);
+    if (entry) {
+      return entry; // Found it!
+    }
+
+    const parentPath = pathDirname(currentPath);
+    if (parentPath === currentPath) {
+      // Reached root
+      break;
+    }
+
+    currentPath = parentPath;
+  }
+
+  return null;
+}
+
 // Watch roots are directories for which we have an active ParcelWatcher subscription.
 const watchRoots = new Set<string>();
 // For each watch root, store its active subscription.
@@ -187,6 +207,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
     const subscription = await ParcelWatcher.subscribe(
         osDirPath,
         (err, events) => {
+          console.log("--> (safe-watcher.ts-Line: 212) events: ", events);
           if (err) {
             console.error(`Parcel watcher error on ${osDirPath}:`, err);
             // Only disable native watching for critical errors (like ENOSPC).
@@ -200,7 +221,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
           // Dispatch each event to any registered entries.
           for (const event of events) {
             const changedPath = toPosixPath(event.path);
-            const entry = getEntry(changedPath);
+            const entry = findNearestEntry(changedPath);
             if (!entry) continue;
             // In Meteor's safe-watcher API, both create/update trigger "change" events.
             const evtType = event.type === "delete" ? "delete" : "change";
@@ -286,9 +307,9 @@ export const watch = Profile(
         let watchTarget: string;
         try {
           const st = statOrNull(convertToOSPath(absPath));
-          watchTarget = st?.isDirectory() ? absPath : toPosixPath(dirname(convertToOSPath(absPath)));
+          watchTarget = st?.isDirectory() ? absPath : toPosixPath(pathDirname(convertToOSPath(absPath)));
         } catch (e) {
-          watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+          watchTarget = toPosixPath(pathDirname(convertToOSPath(absPath)));
         }
         // Set up a watcher on the parent directory (or the directory itself) if not already active.
         ensureWatchRoot(watchTarget);
@@ -318,10 +339,10 @@ export function addWatchRoot(absPath: string) {
   try {
     const st = statOrNull(convertToOSPath(absPath));
     if (!st?.isDirectory()) {
-      watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+      watchTarget = toPosixPath(pathDirname(convertToOSPath(absPath)));
     }
   } catch (e) {
-    watchTarget = toPosixPath(dirname(convertToOSPath(absPath)));
+    watchTarget = toPosixPath(pathDirname(convertToOSPath(absPath)));
   }
   ensureWatchRoot(watchTarget);
 }

From 2a4728fe6cec8effe3844b0976804436d0a1f06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 10:07:21 +0200
Subject: [PATCH 120/264] clean logs

---
 tools/fs/safe-watcher.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 4da8a8fe2b..2a003e5c79 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -207,7 +207,6 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
     const subscription = await ParcelWatcher.subscribe(
         osDirPath,
         (err, events) => {
-          console.log("--> (safe-watcher.ts-Line: 212) events: ", events);
           if (err) {
             console.error(`Parcel watcher error on ${osDirPath}:`, err);
             // Only disable native watching for critical errors (like ENOSPC).

From 677ed084fa96ffcde1982d2aafb66625f4c1ab9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 10:24:16 +0200
Subject: [PATCH 121/264] upgrade Node to latest 22.15.0

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d5a1e7852..1eb4d5be93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.14.0"
+  - "22.15.0"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index b743dccaa9..f8b6467b82 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.10
+BUNDLE_VERSION=22.15.0.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index f60e62fbee..cbb17bf018 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.14.0
+NODE_VERSION=22.15.0
 MONGO_VERSION_64BIT=7.0.16
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 4d55017747..15f96a16ae 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.14.0
+node_version: 22.15.0
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From 1e39167d93193f96da0ef3113fc780c67a88e025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 10:33:36 +0200
Subject: [PATCH 122/264] re-run checks


From 5933b9ac8490e7897b38b40f86f53244749660c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 11:17:45 +0200
Subject: [PATCH 123/264] watch node_modules outside npm context to fix a test
 and avoid regression (keep performance gains)

---
 tools/fs/safe-watcher.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 2a003e5c79..719638429e 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -2,7 +2,7 @@ import { Stats } from 'fs';
 import ParcelWatcher from "@parcel/watcher";
 
 import { Profile } from "../tool-env/profile";
-import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname, exists } from "./files";
 
 // Register process exit handlers to ensure subscriptions are properly cleaned up
 const registerExitHandlers = () => {
@@ -134,6 +134,12 @@ function shouldIgnorePath(absPath: string): boolean {
     // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
   }
 
+  const cwd = toPosixPath(process.cwd());
+  const isWithinCwd = absPath.startsWith(cwd);
+  if (isWithinCwd) {
+    return absPath.includes(`${cwd}/node_modules`);
+  }
+
   // For node_modules: ignore contents unless the package directory is a symlink (which means it’s under active development).
   const nmIndex = parts.indexOf("node_modules");
   if (nmIndex !== -1) {
@@ -200,8 +206,11 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
     return;
   }
 
-  // Set up ignore patterns to skip deep node_modules and .meteor/local cache
-  const ignorePatterns = ["**/node_modules/**", "**/.meteor/local/**"];
+  // Set up ignore patterns to skip node_modules and .meteor/local cache
+  const cwd = toPosixPath(process.cwd());
+  const isWithinCwd = dirPath.startsWith(cwd);
+  const ignPrefix = isWithinCwd ? "" : "**/";
+  const ignorePatterns = [`${ignPrefix}node_modules/**`, `${ignPrefix}.meteor/local/**`];
   try {
     watchRoots.add(dirPath);
     const subscription = await ParcelWatcher.subscribe(

From 76428cfdb2bb70ff3a81e0971454eeff7f938ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 11:25:08 +0200
Subject: [PATCH 124/264] early exit on .meteor/local context

---
 tools/fs/safe-watcher.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 719638429e..4c793979d8 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -122,6 +122,13 @@ function shouldIgnorePath(absPath: string): boolean {
   const posixPath = toPosixPath(absPath);
   const parts = posixPath.split('/');
 
+  const cwd = toPosixPath(process.cwd());
+  const isWithinCwd = absPath.startsWith(cwd);
+
+  if (isWithinCwd && absPath.includes(`${cwd}/.meteor/local`)) {
+    return true;
+  }
+
   // Check for .meteor: allow the .meteor directory itself,
   // but ignore its "local" subdirectory (or any immediate child folder that indicates cache).
   const meteorIndex = parts.indexOf(".meteor");
@@ -134,8 +141,6 @@ function shouldIgnorePath(absPath: string): boolean {
     // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
   }
 
-  const cwd = toPosixPath(process.cwd());
-  const isWithinCwd = absPath.startsWith(cwd);
   if (isWithinCwd) {
     return absPath.includes(`${cwd}/node_modules`);
   }

From 69e6e55ba3ec548154717af1b28a71ed534e73f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 12:06:35 +0200
Subject: [PATCH 125/264] disable symbolic link node_module watching since was
 not originally supported and covered by tests

---
 tools/fs/safe-watcher.ts | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 4c793979d8..e99a139400 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -2,7 +2,7 @@ import { Stats } from 'fs';
 import ParcelWatcher from "@parcel/watcher";
 
 import { Profile } from "../tool-env/profile";
-import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname, exists } from "./files";
+import { statOrNull, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
 
 // Register process exit handlers to ensure subscriptions are properly cleaned up
 const registerExitHandlers = () => {
@@ -141,22 +141,15 @@ function shouldIgnorePath(absPath: string): boolean {
     // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
   }
 
+  // For project node_modules: ignore npm node_modules, rest are valid
   if (isWithinCwd) {
     return absPath.includes(`${cwd}/node_modules`);
   }
 
-  // For node_modules: ignore contents unless the package directory is a symlink (which means it’s under active development).
+  // For external node_modules: ignore contents
   const nmIndex = parts.indexOf("node_modules");
   if (nmIndex !== -1) {
-    try {
-      const stat = lstat(absPath);
-      if (!stat?.isSymbolicLink()) {
-        return true;
-      }
-      // If the package folder is symlinked, we want to watch it.
-    } catch (e) {
-      return true;
-    }
+    return true;
   }
 
   return false;

From dc17c9003f2f576751ec7a6fa010ef2d842efb1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 12:39:16 +0200
Subject: [PATCH 126/264] ensure old tests can exit properly on using the new
 closeAllWatchers

---
 tools/tests/old/test-bundler-assets.js  | 9 ++++++++-
 tools/tests/old/test-bundler-options.js | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index c0c1278434..6f7479f7bc 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -172,6 +172,13 @@ makeGlobalAsyncLocalStorage().run(
 
     // Allow the process to exit normally, since optimistic file watchers
     // may be keeping the event loop busy.
-    safeWatcher.closeAllWatchers();
+    safeWatcher.closeAllWatchers()
+      .then(() => {
+        process.exit(0);
+      })
+      .catch(err => {
+        console.error(`Error closing watchers:`, err);
+        process.exit(1);
+      });
   }
 );
diff --git a/tools/tests/old/test-bundler-options.js b/tools/tests/old/test-bundler-options.js
index 2bf8d00aa1..871146afb6 100644
--- a/tools/tests/old/test-bundler-options.js
+++ b/tools/tests/old/test-bundler-options.js
@@ -200,6 +200,13 @@ makeGlobalAsyncLocalStorage().run(
 
     // Allow the process to exit normally, since optimistic file watchers
     // may be keeping the event loop busy.
-    safeWatcher.closeAllWatchers();
+    safeWatcher.closeAllWatchers()
+      .then(() => {
+        process.exit(0);
+      })
+      .catch(err => {
+        console.error(`Error closing watchers:`, err);
+        process.exit(1);
+      });
   }
 );

From c2dcae2d3953b5eb51c237c5dba3116daa423859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 12:44:07 +0200
Subject: [PATCH 127/264] ensure old tests can exit properly on using the new
 closeAllWatchers

---
 tools/tests/old/test-bundler-assets.js  | 10 ++--------
 tools/tests/old/test-bundler-options.js | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 6f7479f7bc..d15af06f27 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -172,13 +172,7 @@ makeGlobalAsyncLocalStorage().run(
 
     // Allow the process to exit normally, since optimistic file watchers
     // may be keeping the event loop busy.
-    safeWatcher.closeAllWatchers()
-      .then(() => {
-        process.exit(0);
-      })
-      .catch(err => {
-        console.error(`Error closing watchers:`, err);
-        process.exit(1);
-      });
+    safeWatcher.closeAllWatchers();
+    process.exit(0);
   }
 );
diff --git a/tools/tests/old/test-bundler-options.js b/tools/tests/old/test-bundler-options.js
index 871146afb6..9d2b75a299 100644
--- a/tools/tests/old/test-bundler-options.js
+++ b/tools/tests/old/test-bundler-options.js
@@ -200,13 +200,7 @@ makeGlobalAsyncLocalStorage().run(
 
     // Allow the process to exit normally, since optimistic file watchers
     // may be keeping the event loop busy.
-    safeWatcher.closeAllWatchers()
-      .then(() => {
-        process.exit(0);
-      })
-      .catch(err => {
-        console.error(`Error closing watchers:`, err);
-        process.exit(1);
-      });
+    safeWatcher.closeAllWatchers();
+    process.exit(0);
   }
 );

From 9a2e39fce98a9d599be04256fc0ea87a68492553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 23 Apr 2025 14:14:09 +0200
Subject: [PATCH 128/264] re-run checks


From ad7fb255f532ac28ae9fd8541c41419a705871da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 08:51:50 +0200
Subject: [PATCH 129/264] support symlinks with polling

---
 tools/fs/safe-watcher.ts | 58 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index e99a139400..969d20a54e 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -2,7 +2,7 @@ import { Stats } from 'fs';
 import ParcelWatcher from "@parcel/watcher";
 
 import { Profile } from "../tool-env/profile";
-import { statOrNull, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname, realpathOrNull, readdir, pathJoin } from "./files";
 
 // Register process exit handlers to ensure subscriptions are properly cleaned up
 const registerExitHandlers = () => {
@@ -93,6 +93,9 @@ const dirSubscriptions = new Map<string, ParcelWatcher.AsyncSubscription>();
 // A set of roots that are known to be unwatchable.
 const ignoredWatchRoots = new Set<string>();
 
+// A set of roots that are known to be symbolic links.
+const symlinkRoots = new Set<string>();
+
 // Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
 // force the use of files.watchFile instead of ParcelWatcher.
 let watcherEnabled = !JSON.parse(process.env.METEOR_WATCH_FORCE_POLLING || "false");
@@ -155,6 +158,49 @@ function shouldIgnorePath(absPath: string): boolean {
   return false;
 }
 
+/**
+ * Check if a path is a symbolic link.
+ * 
+ * Symbolic links are not supported natively in some operating systems,
+ * so we need to use polling for them to ensure they are properly watched.
+ * This function is used to determine if a path is a symbolic link,
+ * so we can use polling instead of native watching for it.
+ * 
+ * If a path is a symbolic link, its root is added to the symlinkRoots set.
+ */
+function isSymbolicLink(absPath: string): boolean {
+  try {
+    const osPath = convertToOSPath(absPath);
+    const stat = lstat(osPath);
+    if (stat?.isSymbolicLink()) {
+      // Add the directory containing the symlink to the symlinkRoots set
+      const symlinkRoot = toPosixPath(pathDirname(absPath));
+      symlinkRoots.add(symlinkRoot);
+      return true;
+    }
+    return false;
+  } catch (e) {
+    // If we can't stat the file, assume it's not a symlink
+    return false;
+  }
+}
+
+/**
+ * Check if a path is within any symlink root.
+ * 
+ * This is used to determine if a path should use polling instead of native watching,
+ * even if it's not a symlink itself.
+ */
+function isWithinSymlinkRoot(absPath: string): boolean {
+  for (const root of symlinkRoots) {
+    // Check if absPath starts with root + '/'
+    if (absPath === root || (absPath.startsWith(root) && absPath.charAt(root.length) === '/')) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * Ensure that the given directory is being watched by @parcel/watcher.
  * If it is not a directory or is unwatchable, it is immediately added to an ignore set.
@@ -296,12 +342,18 @@ export const watch = Profile(
     callback: ChangeCallback
     ): SafeWatcher => {
       absPath = toPosixPath(absPath);
+
+      // if (absPath.includes('sym')) {
+      //   console.log("--> (safe-watcher.ts-Line: 318)\n absPath: ", absPath);
+      // }
       // If the path should be ignored, immediately return a noop SafeWatcher.
       if (shouldIgnorePath(absPath)) {
         return { close() {} };
       }
-      // If native watching is disabled, use the polling strategy.
-      if (!watcherEnabled) {
+      // If native watching is disabled, the path is a symbolic link, or the path is within a symlink root,
+      // use the polling strategy. Symbolic links are not supported natively in some operating systems,
+      // and paths within symlink roots should also use polling for consistency.
+      if (!watcherEnabled || isWithinSymlinkRoot(absPath) || isSymbolicLink(absPath)) {
         return startPolling(absPath, callback);
       }
       // Try to reuse an existing entry if one was created before.

From 253dccef7bb880f0319a68262efd84429e9e9e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 09:55:32 +0200
Subject: [PATCH 130/264] support symlinks with polling in direct node_modules
 packages

---
 tools/fs/safe-watcher.ts | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 969d20a54e..eb2c69e941 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -144,12 +144,28 @@ function shouldIgnorePath(absPath: string): boolean {
     // Otherwise, do not automatically ignore .meteor (which includes .meteor/packages, etc).
   }
 
-  // For project node_modules: ignore npm node_modules, rest are valid
-  if (isWithinCwd) {
-    return absPath.includes(`${cwd}/node_modules`);
+  // For project node_modules: check if it's a direct node_modules/<package>
+  if (isWithinCwd && absPath.includes(`${cwd}/node_modules`)) {
+    // Check if it's a direct node_modules/<package> path
+    const relPath = absPath.substring(cwd.length + 1); // +1 for the slash
+    const relParts = relPath.split('/');
+    if (relParts.length >= 2 && relParts[0] === 'node_modules') {
+      // If it's a direct node_modules/<package>, check if it's a symlink
+      // We'll return false here (don't ignore) so that the code can later decide to use polling
+      // based on isSymbolicLink check in the watch function
+      if (relParts.length === 2 && isSymbolicLink(absPath, false)) {
+        return false;
+      }
+      // Check if it's within a symlink root to not ignore
+      if (isWithinSymlinkRoot(absPath)) {
+        return false;
+      }
+      return true;
+    }
+    return true;
   }
 
-  // For external node_modules: ignore contents
+  // For external node_modules: check if it's a direct node_modules/<package>
   const nmIndex = parts.indexOf("node_modules");
   if (nmIndex !== -1) {
     return true;
@@ -168,14 +184,16 @@ function shouldIgnorePath(absPath: string): boolean {
  * 
  * If a path is a symbolic link, its root is added to the symlinkRoots set.
  */
-function isSymbolicLink(absPath: string): boolean {
+function isSymbolicLink(absPath: string, addToRoots = true): boolean {
   try {
     const osPath = convertToOSPath(absPath);
     const stat = lstat(osPath);
     if (stat?.isSymbolicLink()) {
-      // Add the directory containing the symlink to the symlinkRoots set
-      const symlinkRoot = toPosixPath(pathDirname(absPath));
-      symlinkRoots.add(symlinkRoot);
+      if (addToRoots) {
+        // Add the directory containing the symlink to the symlinkRoots set
+        const symlinkRoot = toPosixPath(absPath);
+        symlinkRoots.add(symlinkRoot);
+      }
       return true;
     }
     return false;
@@ -343,9 +361,6 @@ export const watch = Profile(
     ): SafeWatcher => {
       absPath = toPosixPath(absPath);
 
-      // if (absPath.includes('sym')) {
-      //   console.log("--> (safe-watcher.ts-Line: 318)\n absPath: ", absPath);
-      // }
       // If the path should be ignored, immediately return a noop SafeWatcher.
       if (shouldIgnorePath(absPath)) {
         return { close() {} };

From 4a0e423d060d5892d086b9c1374b3e899badca7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 10:09:58 +0200
Subject: [PATCH 131/264] avoid register several watchers when polling

---
 tools/fs/safe-watcher.ts | 63 +++++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 10 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index eb2c69e941..fcc3f3e0f8 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -53,6 +53,14 @@ interface Entry extends SafeWatcher {
 // Registry mapping normalized absolute paths to their watcher entry.
 const entries = new Map<string, Entry | null>();
 
+// Registry mapping normalized absolute paths to their polling watchers.
+// Each path can have multiple callbacks, but only one active watcher.
+interface PollingWatcherInfo {
+  callbacks: Set<ChangeCallback>;
+  pollCallback: (curr: Stats, prev: Stats) => void;
+}
+const pollingWatchers = new Map<string, PollingWatcherInfo>();
+
 function getEntry(path: string): Entry | null | undefined {
   return entries.get(path);
 }
@@ -480,18 +488,53 @@ function startPolling(absPath: string, callback: ChangeCallback): SafeWatcher {
   const osPath = convertToOSPath(absPath);
   // Initial polling interval.
   let interval = getPollingInterval(absPath);
-  const pollCallback = (curr: Stats, prev: Stats) => {
-    // Compare modification times to detect a change.
-    if (+curr.mtime !== +prev.mtime) {
-      changedPaths.add(absPath);
-      callback("change");
-    }
-  };
-  watchFile(osPath, { interval }, pollCallback);
+
+  // Check if we already have a polling watcher for this path
+  let watcherInfo = pollingWatchers.get(absPath);
+
+  if (watcherInfo) {
+    // Add this callback to the existing watcher
+    watcherInfo.callbacks.add(callback);
+  } else {
+    // Create a new polling watcher
+    const pollCallback = (curr: Stats, prev: Stats) => {
+      // Compare modification times to detect a change.
+      if (+curr.mtime !== +prev.mtime) {
+        changedPaths.add(absPath);
+        // Notify all callbacks registered for this path
+        const info = pollingWatchers.get(absPath);
+        if (info) {
+          for (const cb of info.callbacks) {
+            cb("change");
+          }
+        }
+      }
+    };
+
+    watchFile(osPath, { interval }, pollCallback);
+
+    // Store the new watcher info
+    watcherInfo = {
+      callbacks: new Set([callback]),
+      pollCallback
+    };
+    pollingWatchers.set(absPath, watcherInfo);
+  }
+
   return {
     close() {
-      unwatchFile(osPath, pollCallback);
-      changedPaths.delete(absPath);
+      const info = pollingWatchers.get(absPath);
+      if (info) {
+        // Remove this callback
+        info.callbacks.delete(callback);
+
+        // If no callbacks remain, remove the watcher
+        if (info.callbacks.size === 0) {
+          unwatchFile(osPath, info.pollCallback);
+          pollingWatchers.delete(absPath);
+          changedPaths.delete(absPath);
+        }
+      }
     }
   };
 }

From 1995445b7b20956b2ba6c21e5acd941bbc27bce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 10:20:43 +0200
Subject: [PATCH 132/264] avoid register several watchers when polling

---
 tools/fs/safe-watcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index fcc3f3e0f8..c97b758c4b 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -161,7 +161,7 @@ function shouldIgnorePath(absPath: string): boolean {
       // If it's a direct node_modules/<package>, check if it's a symlink
       // We'll return false here (don't ignore) so that the code can later decide to use polling
       // based on isSymbolicLink check in the watch function
-      if (relParts.length === 2 && isSymbolicLink(absPath, false)) {
+      if (relParts.length === 2 && isSymbolicLink(absPath)) {
         return false;
       }
       // Check if it's within a symlink root to not ignore

From eaf78bca810e6ffdc9955630091de65293bf9feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 11:03:25 +0200
Subject: [PATCH 133/264] fix a test supporting non-npm node_modules watching

---
 tools/fs/safe-watcher.ts | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index c97b758c4b..90ef55c3bc 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -153,24 +153,25 @@ function shouldIgnorePath(absPath: string): boolean {
   }
 
   // For project node_modules: check if it's a direct node_modules/<package>
-  if (isWithinCwd && absPath.includes(`${cwd}/node_modules`)) {
-    // Check if it's a direct node_modules/<package> path
-    const relPath = absPath.substring(cwd.length + 1); // +1 for the slash
-    const relParts = relPath.split('/');
-    if (relParts.length >= 2 && relParts[0] === 'node_modules') {
-      // If it's a direct node_modules/<package>, check if it's a symlink
-      // We'll return false here (don't ignore) so that the code can later decide to use polling
-      // based on isSymbolicLink check in the watch function
-      if (relParts.length === 2 && isSymbolicLink(absPath)) {
-        return false;
+  if (isWithinCwd) {
+    if (absPath.includes(`${cwd}/node_modules`)) {
+      // Check if it's a direct node_modules/<package> path
+      const relPath = absPath.substring(cwd.length + 1); // +1 for the slash
+      const relParts = relPath.split('/');
+      if (relParts.length >= 2 && relParts[0] === 'node_modules') {
+        // If it's a direct node_modules/<package>, check if it's a symlink
+        // We'll return false here (don't ignore) so that the code can later decide to use polling
+        // based on isSymbolicLink check in the watch function
+        if (relParts.length === 2 && isSymbolicLink(absPath)) {
+          return false;
+        }
+        // Check if it's within a symlink root to not ignore
+        if (isWithinSymlinkRoot(absPath)) {
+          return false;
+        }
       }
-      // Check if it's within a symlink root to not ignore
-      if (isWithinSymlinkRoot(absPath)) {
-        return false;
-      }
-      return true;
     }
-    return true;
+    return false;
   }
 
   // For external node_modules: check if it's a direct node_modules/<package>

From 3fcfc8c5f30f2480aec003b77ab4f891108cdab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 11:04:43 +0200
Subject: [PATCH 134/264] fix a test supporting non-npm node_modules watching

---
 tools/fs/safe-watcher.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 90ef55c3bc..3f8c88dc28 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -170,8 +170,10 @@ function shouldIgnorePath(absPath: string): boolean {
           return false;
         }
       }
+      return true;
+    } else {
+      return false;
     }
-    return false;
   }
 
   // For external node_modules: check if it's a direct node_modules/<package>

From 7460064bf3dcb63c229677431fc8b3e43f902b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 14:10:21 +0200
Subject: [PATCH 135/264] allow .swcrc override jsc.parser values

---
 packages/babel-compiler/babel-compiler.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index d323554201..837772a3cf 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -64,9 +64,6 @@ function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch
         ? deepMerge(baseSwcConfig, swcOptions, [
             'env.targets',
             'module.type',
-            'jsc.parser.syntax',
-            'jsc.parser.jsx',
-            'jsc.parser.tsx',
           ])
         : baseSwcConfig;
 

From 37d54c441dec914ea6289ec64790ce283f9da34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 15:37:55 +0200
Subject: [PATCH 136/264] remove unused imports

---
 tools/fs/safe-watcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 3f8c88dc28..a0b90c6c25 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -2,7 +2,7 @@ import { Stats } from 'fs';
 import ParcelWatcher from "@parcel/watcher";
 
 import { Profile } from "../tool-env/profile";
-import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname, realpathOrNull, readdir, pathJoin } from "./files";
+import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
 
 // Register process exit handlers to ensure subscriptions are properly cleaned up
 const registerExitHandlers = () => {

From c1e454df55f2b775773a48f7548a36a9feb71f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 16:34:18 +0200
Subject: [PATCH 137/264] improve SWC docs addressing feedback

---
 .../modern-transpiler-swc.md                  | 65 ++++++++++++++++---
 1 file changed, 57 insertions(+), 8 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 278da99499..7783fde8e4 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -39,15 +39,18 @@ If all your code uses SWC, you're good and can turn off verbosity. But if you se
   <more-details>
 ```
 
-There are a few things you can do.
+This means SWC encountered syntax incompatibilities on the files. There are a few things you can do.
 
-First, check the fallback details. It may show why SWC couldn’t handle the file. A common reason is nested imports, `import` statements inside a function. Moving them to the top level may fix it. These nested imports work via a Babel plugin specific to Meteor, which SWC doesn’t support.
+First, check the fallback details to **fix the syntax**. They might explain why SWC failed.
 
-Other reasons might involve features tied to Babel plugins. If so, you’ll need to find a similar plugin for SWC. See the [SWC plugin list](https://plugins.swc.rs/versions/range/271).
+- A common cause is [**nested import statements** inside functions](#nested-imports). Move them to the top level. These work in Babel due to a Meteor-specific plugin, which SWC doesn’t support.
+- Other issues may come from features tied to Babel plugins. You’ll need to find SWC equivalents. See the [SWC plugin list](https://plugins.swc.rs/versions/range/271).
 
-Second, you might choose to ignore the fallback if those files are fine with Babel. Even with SWC enabled, Meteor will continue using Babel for those files on future rebuilds.
+Second, **ignore the fallback** if those files run fine with Babel. SWC will still speed up other files. Meteor will keep using Babel for incompatible files on future builds.
 
-Third, you can exclude files or contexts from SWC. For example, if you're using `babel-plugin-react-compiler`, which SWC doesn't support yet, you can exclude your app code adding this to `package.json`:
+Third, **exclude files or contexts from SWC**. Even though it falls back automatically, you can skip the overhead of trying SWC on known-incompatible files.
+
+For example, if you're using `babel-plugin-react-compiler`, which [SWC doesn't support yet](https://react.dev/blog/2025/04/21/react-compiler-rc), you can exclude your app code adding this to `package.json`:
 
 ```json
 "meteor": {
@@ -69,15 +72,32 @@ Or exclude only specific files like `.jsx`:
 
 You can also use `excludePackages`, `excludeNodeModules`, and `excludeLegacy` for finer control. See the [`modernTranspiler` config docs](#config-api) for more.
 
-When no alternatives exist, these settings let you still get most of SWC’s speed benefits by limiting fallback use.
+When no plugin exists, these settings let you still get most of SWC’s speed benefits by limiting fallback use.
 
-We expect most apps will benefit just by enabling `modernTranspiler: true`. Most Meteor packages should work right away, except ones using nested imports. Node modules will mostly work too, since they follow common standards. Most app code should also work unless it depends on Babel-specific behavior.
+Most apps will benefit just by enabling `modernTranspiler: true`. Most Meteor packages should work right away, except ones using nested imports. Node modules will mostly work too, since they follow common standards. Most app code should also work unless it depends on Babel-specific behavior.
 
 > Remember to turn off verbosity when you're done with optimizations.
 
 ## Custom .swcrc
 
-You can use .swcrc config in the root of your project to describe specific [SWC plugins](https://github.com/swc-project/plugins) there, that will be applied to compile the entire files of your project.
+You can use `.swcrc` config in the root of your project to describe specific [SWC plugins](https://github.com/swc-project/plugins) there, that will be applied to compile the entire files of your project.
+
+You can also configure other options using the `.swcrc` format. One common case is when your project uses `.js` files for React code. React typically uses `.jsx` for components. We still recommend following that convention for compatibility, but if you prefer `.js`, you can provide a custom `.swcrc` like this:
+
+``` json
+{
+    "jsc": {
+        "parser": {
+            "syntax": "emcascript",
+            "jsx": true
+        }
+    }
+}
+```
+
+> You can also configure it for TypeScript, make sure to set `"syntax": "typescript"` and `"tsx": true` instead.
+
+This overrides Meteor's internal SWC config to apply your settings, ensuring SWC processes `.js` or `.ts` files with React components without falling back to Babel.
 
 ## Config API
 
@@ -102,6 +122,35 @@ You can use .swcrc config in the root of your project to describe specific [SWC
 - `modernTranspiler.verbose: [true|false]`
   If true, the transpilation process for files is shown when running the app. This helps understand which transpiler is used for each file, what fallbacks are applied, and gives a chance to either exclude files to always use Babel or migrate fully to SWC.
 
+## Related Topics
+
+### Nested imports
+
+Nested imports are a Meteor-specific feature in its bundler, unlike standard bundlers. Meteor introduced them during a time when bundling standards were still evolving and experimented with its own approach. This feature comes from the [`reify` module](https://github.com/benjamn/reify/tree/main) and works with Babel transpilation. SWC doesn't support them since they were never standardized.
+
+Example with a nested import:
+
+``` javascript
+if (condition) {
+  import { a as b } from "./c";
+  console.log(b);
+}
+```
+
+Without a nested import (moved to top):
+
+``` javascript
+import { a as b } from "./c";
+
+if (condition) {
+  console.log(b);
+}
+```
+
+For background, see: [Why nested import](https://github.com/benjamn/reify/blob/main/WHY_NEST_IMPORTS.md).
+
+With `"modernTranspiler": true`, if SWC finds one, it silently falls back to Babel (only shows in `"verbose": true`). Nested imports isn’t standard, most modern projects use other deferred loading methods. You might want to move imports to the top or use require instead, letting SWC handle the file and speeding up builds. Still, this decision is up to the devs, some Meteor devs use them for valid reasons.
+
 ## Troubleshotting
 
 If you run into issues, try `meteor reset` or delete the `.meteor/local` folder in the project root.

From 6024cbe773bdb46b7fe43208bb7ac57ec1b4fcf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 16:59:20 +0200
Subject: [PATCH 138/264] update 3.3.0 changelog to describe latest changes and
 feedback

---
 .../generators/changelog/versions/3.3.0.md    | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 0e63e671fd..cba0b4aea3 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -3,36 +3,46 @@
 ### Highlights
 
 - Support SWC transpiler for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657)
-- Default to modern architecture in new apps [PR#13665](https://github.com/meteor/meteor/pull/13665)
+- Use `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
+- Default to modern architecture, skip legacy processing [PR#13665](https://github.com/meteor/meteor/pull/13665), [PR#13698](https://github.com/meteor/meteor/pull/13698)
+- Optimize SQLite for faster startup and better performance [PR#13702](https://github.com/meteor/meteor/pull/13702)
 - Support CPU profiling in Meteor 3 bundler [PR#13650](https://github.com/meteor/meteor/pull/13650)
-- Improve `meteor profile`@show rebuild steps, support `--build` [PR#13694](https://github.com/meteor/meteor/pull/13694)
+- Improve `meteor profile`: show rebuild steps and total, support `--build` [PR#16](https://github.com/meteor/performance/pull/16) and [PR#13694](https://github.com/meteor/meteor/pull/13694)
 - Improve `useFind` and `useSubscribe` React hooks
 - Add `replaceEmailAsync` helper to Accounts [PR#13677](https://github.com/meteor/meteor/pull/13677)
 - Fix user agent detection and oplog collection filtering
 - Refine type definitions for Meteor methods and SSR's ServerSink
-- Update Express to 5.1.0
+- Allow opting out of usage stats with `DO_NOT_TRACK`
+- Update Node to 22.15.0 and Express to 5.1.0
 
-All merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
-
-React packages PRs@[PR#419](https://github.com/meteor/react-packages/pull/419), [PR#429](https://github.com/meteor/react-packages/pull/429) and [PR#430](https://github.com/meteor/react-packages/pull/430)
+All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
+React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
 
 #### Breaking Changes
 
-N/A
+- `react-meteor-data@4.0.0-beta.0`
+  - Independent from the core, only applies if upgraded manually.
+  - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
 
 ####  Internal API changes
 
-N/A
+- `express@5.1.0` - Depends on Meteor’s `webapp` package.
+  - Deprecates non-native promise usage [#154](https://github.com/pillarjs/router/pull/154)
+  - Use `async/await` or `Promise.resolve` when defining endpoints to avoid deprecation warnings.
 
 #### Migration Steps
 
 Please run the following command to update your project:
 
 ```bash
-
 meteor update --release 3.3-beta.0
+```
 
+To apply react-meteor-data changes:
+
+```bash
+meteor add react-meteor-data@4.0.0-beta.0
 ```
 
 #### Bumped Meteor Packages

From ebf733b4bb4e8e3f53638209a56d6aa48851ab04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 18:07:44 +0200
Subject: [PATCH 139/264] add new watcher docs and update changelog with
 internal and breaking changes

---
 .../modern-build-stack/modern-bundler.md      | 20 ++++++++++++++++++-
 .../generators/changelog/versions/3.3.0.md    |  5 +++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index d5ebb5b55e..a240c67ec8 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -6,7 +6,7 @@ Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we'v
 
 ## Modern builds
 
-Starting with Meteor 3.3, new apps skip `web.browser.legacy` and `web.cordova` by default in development mode (unless developing for native).
+Starting with Meteor 3.3, new apps skip `web.browser.legacy` and `web.cordova` by default in development mode (unless developing for native). This results on getting a faster build process on development mode.
 
 For existing apps, enable this by adding to `package.json`:
 
@@ -17,3 +17,21 @@ For existing apps, enable this by adding to `package.json`:
 ```
 
 This works like using `--exclude-archs web.browser.legacy,web.cordova` with `meteor run`.
+
+## Modern watcher
+
+Starting with Meteor 3.3, development mode uses a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
+
+If the watcher doesn’t work properly, such as when using WSL with host, a volume, or a remote setup, switch fully to the polling strategy.
+
+To enable polling, run your Meteor app with:
+
+```shell
+# enable polling
+METEOR_WATCH_FORCE_POLLING=true meteor run
+
+# set polling interval (in ms)
+METEOR_WATCH_POLLING_INTERVAL_MS=1000 METEOR_WATCH_FORCE_POLLING=true meteor run
+```
+
+> Polling uses more CPU and RAM, but it's the most reliable option in some environments.
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index cba0b4aea3..9dc6052aea 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -21,6 +21,11 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 
 #### Breaking Changes
 
+- File watching strategy switched to @parcel/watcher
+    - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+    - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+    - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+
 - `react-meteor-data@4.0.0-beta.0`
   - Independent from the core, only applies if upgraded manually.
   - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)

From 2ba043fc8adbd413333e283290d87fe62991a1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 18:12:38 +0200
Subject: [PATCH 140/264] add starting with Meteor 3.3 on bundler docs

---
 v3-docs/docs/about/modern-build-stack/modern-bundler.md       | 4 ++++
 .../docs/about/modern-build-stack/modern-transpiler-swc.md    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index a240c67ec8..c572951fbd 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -1,5 +1,9 @@
 # Modern Bundler
 
+:::info
+Starting with Meteor 3.3
+:::
+
 Meteor handles watching and linking all project files into the final bundle. While we'd like to offload more of this to modern bundlers, we're still focused on keeping what's left in the Meteor context as fast as possible.
 
 Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 7783fde8e4..135b3075b3 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -1,5 +1,9 @@
 # Modern Transpiler: SWC
 
+:::info
+Starting with Meteor 3.3
+:::
+
 Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, reaching parity with Babel.
 
 Since transpilation is one of the slowest steps in development, Meteor now gives you the option to use SWC for your apps.

From 962584a814f7dcce2caf6c4eeffcb963e0afd145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Apr 2025 18:28:55 +0200
Subject: [PATCH 141/264] clean

---
 .../about/modern-build-stack/modern-transpiler-swc.md  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 135b3075b3..cf452b9d93 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -90,12 +90,12 @@ You can also configure other options using the `.swcrc` format. One common case
 
 ``` json
 {
-    "jsc": {
-        "parser": {
-            "syntax": "emcascript",
-            "jsx": true
-        }
+  "jsc": {
+    "parser": {
+      "syntax": "emcascript",
+      "jsx": true
     }
+  }
 }
 ```
 

From b013c3e33ea453a9355ddfbca62c3fa854c7fbc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 25 Apr 2025 09:42:10 +0200
Subject: [PATCH 142/264] implement rewatching polling strategy

---
 tools/fs/safe-watcher.ts | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index a0b90c6c25..32fe547e88 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -204,6 +204,8 @@ function isSymbolicLink(absPath: string, addToRoots = true): boolean {
         // Add the directory containing the symlink to the symlinkRoots set
         const symlinkRoot = toPosixPath(absPath);
         symlinkRoots.add(symlinkRoot);
+        // Rewatch using polling any existing watchers under this symlink root
+        rewatchPolling(symlinkRoot);
       }
       return true;
     }
@@ -542,6 +544,35 @@ function startPolling(absPath: string, callback: ChangeCallback): SafeWatcher {
   };
 }
 
+/**
+ * Rewatch entries under a symlink root from native watchers to polling watchers.
+ * This is called when a new symlink root is discovered.
+ */
+function rewatchPolling(root: string) {
+  for (const [watchedPath, entry] of entries) {
+    // if it lives under the new symlink root...
+    if (watchedPath === root ||
+        (watchedPath.startsWith(root) && watchedPath.charAt(root.length) === '/')) {
+      // Skip if entry is null or already closed
+      if (!entry) continue;
+
+      // Store the callbacks before closing the entry
+      const callbacks = Array.from(entry.callbacks);
+
+      // Tear down the old native watcher
+      entry.close();
+
+      // Remove it from the map
+      entries.delete(watchedPath);
+
+      // Re-watch via polling for each callback
+      for (const cb of callbacks) {
+        startPolling(watchedPath, cb);
+      }
+    }
+  }
+}
+
 /**
  * Fall back to polling. If a critical error occurs,
  * we disable native watching and close all existing native watchers.

From 90b5ccc5763a383e0e41a09eae697b65723f3528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 25 Apr 2025 10:19:13 +0200
Subject: [PATCH 143/264] don't ignore node_modules in packages linked
 externally

---
 tools/fs/safe-watcher.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 32fe547e88..dc03089bb2 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -154,6 +154,7 @@ function shouldIgnorePath(absPath: string): boolean {
 
   // For project node_modules: check if it's a direct node_modules/<package>
   if (isWithinCwd) {
+    // Check if it's the project node_modules
     if (absPath.includes(`${cwd}/node_modules`)) {
       // Check if it's a direct node_modules/<package> path
       const relPath = absPath.substring(cwd.length + 1); // +1 for the slash
@@ -172,6 +173,7 @@ function shouldIgnorePath(absPath: string): boolean {
       }
       return true;
     } else {
+      // Otherwise, don't ignore non-npm node_modules
       return false;
     }
   }
@@ -179,6 +181,12 @@ function shouldIgnorePath(absPath: string): boolean {
   // For external node_modules: check if it's a direct node_modules/<package>
   const nmIndex = parts.indexOf("node_modules");
   if (nmIndex !== -1) {
+    // Don't ignore node_modules within .npm/package/ paths
+    const npmPackageIndex = parts.indexOf(".npm");
+    if (npmPackageIndex !== -1 && parts[npmPackageIndex + 1] === "package" && 
+        nmIndex > npmPackageIndex && parts[nmIndex - 1] === "package") {
+      return false;
+    }
     return true;
   }
 

From 7e49bca0e8a62467805b77624c43dbb9f1276858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 25 Apr 2025 20:01:03 +0200
Subject: [PATCH 144/264] favor reify transpile all time

---
 packages/babel-compiler/babel-compiler.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index d323554201..c8681c674a 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -91,9 +91,7 @@ function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch
         generateLetDeclarations: true,
       }),
     });
-    if (!result.identical) {
-      content = result.code;
-    }
+    content = result.code;
 
     return {
       code: content,

From 43af635d1b1355d7fb76c950cc9138b6a3dfd982 Mon Sep 17 00:00:00 2001
From: Welkin Wong <welkin.wong@me.com>
Date: Sat, 26 Apr 2025 02:55:09 +0800
Subject: [PATCH 145/264] Bump mongodb dependency to version 6.16.0 in
 npm-mongo package (#13710)

---
 packages/npm-mongo/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 8b45db0032..fad1d65554 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,7 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "6.9.0"
+  mongodb: "6.16.0"
 });
 
 Package.onUse(function (api) {

From 14a35d449f8341bb79a2b100ec53349e8c7516ab Mon Sep 17 00:00:00 2001
From: Welkin Wong <welkin.wong@me.com>
Date: Mon, 28 Apr 2025 17:51:53 +0800
Subject: [PATCH 146/264] fix: handle all-zero versions in modern browser
 detection (#13712)

---
 packages/modern-browsers/modern-tests.js | 14 ++++++++++++++
 packages/modern-browsers/modern.js       |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/modern-browsers/modern-tests.js b/packages/modern-browsers/modern-tests.js
index 4f658f0da2..a19fcad1c8 100644
--- a/packages/modern-browsers/modern-tests.js
+++ b/packages/modern-browsers/modern-tests.js
@@ -49,6 +49,13 @@ Tinytest.add('modern-browsers - versions - basic', function (test) {
     patch: 0,
   }));
 
+  test.isFalse(isModern({
+    name: "mobileSafariUI/WKWebView", 
+    major: 0, 
+    minor: 0,
+    patch: 0,
+  }));
+
   const oldPackageSettings = Meteor.settings.packages;
   
   Meteor.settings.packages = {
@@ -64,6 +71,13 @@ Tinytest.add('modern-browsers - versions - basic', function (test) {
     patch: 0,
   }));
 
+  test.isTrue(isModern({
+    name: "mobileSafariUI/WKWebView", 
+    major: 0, 
+    minor: 0,
+    patch: 0,
+  }));
+
 
   Meteor.settings.packages = oldPackageSettings;
 });
diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 801a83c271..0223f14909 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -93,7 +93,13 @@ function isModern(browser) {
   const entry = hasOwn.call(minimumVersions, lowerCaseName)
     ? minimumVersions[lowerCaseName]
     : undefined;
-  if (!entry) {
+    if (
+      !entry ||
+      // When all version numbers are 0, this typically comes from in-app WebView UAs (e.g., iOS WKWebView).
+      // We can let users decide whether to treat it as a modern browser
+      // via the packageSettings.unknownBrowsersAssumedModern option.
+      (browser.major === 0 && browser.minor === 0 && browser.patch === 0)
+    ) {
     const packageSettings = Meteor.settings.packages
       ? Meteor.settings.packages['modern-browsers']
       : undefined;

From 4a89a7fc0c513d207af746eccd5f3c4a1741b8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 08:57:07 +0200
Subject: [PATCH 147/264] support filename references in source maps during SWC
 compilation to improve debugging

---
 packages/babel-compiler/babel-compiler.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index c8681c674a..f03765405a 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -35,7 +35,7 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch }) {
+function compileWithSwc(source, swcOptions = {}, { inputFilePath, filename, sourceFileName, features, arch }) {
   return profile('SWC.compile', function () {
     // Determine file extension based syntax.
     const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
@@ -55,6 +55,8 @@ function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch
       module: { type: 'es6' },
       minify: false,
       sourceMaps: true,
+      filename,
+      sourceFileName,
       ...(isLegacyWebArch && {
         env: { targets: lastModifiedSwcLegacyConfig || {} },
       }),
@@ -336,10 +338,16 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               }
               return compilation;
             }
+
+
+            const filename = packageName
+              ? `packages/${packageName}/${inputFilePath}`
+              : inputFilePath;
+            const sourceFileName = filename;
             compilation = compileWithSwc(
               source,
               lastModifiedSwcConfig,
-              { inputFilePath, features, arch },
+              { inputFilePath, features, arch, filename, sourceFileName },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });

From f13a56a284d398c5c2057d7c521d8d2b35b8ca81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 09:16:18 +0200
Subject: [PATCH 148/264] support filename references in source maps during SWC
 compilation to improve debugging

---
 packages/socket-stream-client/sockjs-1.6.1-min-.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/socket-stream-client/sockjs-1.6.1-min-.js b/packages/socket-stream-client/sockjs-1.6.1-min-.js
index 7850ea9d02..50cb4cb267 100644
--- a/packages/socket-stream-client/sockjs-1.6.1-min-.js
+++ b/packages/socket-stream-client/sockjs-1.6.1-min-.js
@@ -1,3 +1,2 @@
 /* sockjs-client v1.6.1 | http://sockjs.org | MIT license */
 !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).SockJS=e()}}(function(){return function i(s,a,l){function u(t,e){if(!a[t]){if(!s[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(c)return c(t,!0);var r=new Error("Cannot find module '"+t+"'");throw r.code="MODULE_NOT_FOUND",r}var o=a[t]={exports:{}};s[t][0].call(o.exports,function(e){return u(s[t][1][e]||e)},o,o.exports,i,s,a,l)}return a[t].exports}for(var c="function"==typeof require&&require,e=0;e<l.length;e++)u(l[e]);return u}({1:[function(n,r,e){(function(t){(function(){"use strict";var e=n("./transport-list");r.exports=n("./main")(e),"_sockjs_onload"in t&&setTimeout(t._sockjs_onload,1)}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./main":14,"./transport-list":16}],2:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./event");function i(){o.call(this),this.initEvent("close",!1,!1),this.wasClean=!1,this.code=0,this.reason=""}r(i,o),t.exports=i},{"./event":4,"inherits":54}],3:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./eventtarget");function i(){o.call(this)}r(i,o),i.prototype.removeAllListeners=function(e){e?delete this._listeners[e]:this._listeners={}},i.prototype.once=function(t,n){var r=this,o=!1;this.on(t,function e(){r.removeListener(t,e),o||(o=!0,n.apply(this,arguments))})},i.prototype.emit=function(){var e=arguments[0],t=this._listeners[e];if(t){for(var n=arguments.length,r=new Array(n-1),o=1;o<n;o++)r[o-1]=arguments[o];for(var i=0;i<t.length;i++)t[i].apply(this,r)}},i.prototype.on=i.prototype.addListener=o.prototype.addEventListener,i.prototype.removeListener=o.prototype.removeEventListener,t.exports.EventEmitter=i},{"./eventtarget":5,"inherits":54}],4:[function(e,t,n){"use strict";function r(e){this.type=e}r.prototype.initEvent=function(e,t,n){return this.type=e,this.bubbles=t,this.cancelable=n,this.timeStamp=+new Date,this},r.prototype.stopPropagation=function(){},r.prototype.preventDefault=function(){},r.CAPTURING_PHASE=1,r.AT_TARGET=2,r.BUBBLING_PHASE=3,t.exports=r},{}],5:[function(e,t,n){"use strict";function r(){this._listeners={}}r.prototype.addEventListener=function(e,t){e in this._listeners||(this._listeners[e]=[]);var n=this._listeners[e];-1===n.indexOf(t)&&(n=n.concat([t])),this._listeners[e]=n},r.prototype.removeEventListener=function(e,t){var n=this._listeners[e];if(n){var r=n.indexOf(t);-1===r||(1<n.length?this._listeners[e]=n.slice(0,r).concat(n.slice(r+1)):delete this._listeners[e])}},r.prototype.dispatchEvent=function(){var e=arguments[0],t=e.type,n=1===arguments.length?[e]:Array.apply(null,arguments);if(this["on"+t]&&this["on"+t].apply(this,n),t in this._listeners)for(var r=this._listeners[t],o=0;o<r.length;o++)r[o].apply(this,n)},t.exports=r},{}],6:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./event");function i(e){o.call(this),this.initEvent("message",!1,!1),this.data=e}r(i,o),t.exports=i},{"./event":4,"inherits":54}],7:[function(e,t,n){"use strict";var r=e("./utils/iframe");function o(e){(this._transport=e).on("message",this._transportMessage.bind(this)),e.on("close",this._transportClose.bind(this))}o.prototype._transportClose=function(e,t){r.postMessage("c",JSON.stringify([e,t]))},o.prototype._transportMessage=function(e){r.postMessage("t",e)},o.prototype._send=function(e){this._transport.send(e)},o.prototype._close=function(){this._transport.close(),this._transport.removeAllListeners()},t.exports=o},{"./utils/iframe":47}],8:[function(e,t,n){"use strict";var f=e("./utils/url"),r=e("./utils/event"),h=e("./facade"),o=e("./info-iframe-receiver"),d=e("./utils/iframe"),p=e("./location"),m=function(){};t.exports=function(l,e){var u,c={};e.forEach(function(e){e.facadeTransport&&(c[e.facadeTransport.transportName]=e.facadeTransport)}),c[o.transportName]=o,l.bootstrap_iframe=function(){var a;d.currentWindowId=p.hash.slice(1);r.attachEvent("message",function(t){if(t.source===parent&&(void 0===u&&(u=t.origin),t.origin===u)){var n;try{n=JSON.parse(t.data)}catch(e){return void m("bad json",t.data)}if(n.windowId===d.currentWindowId)switch(n.type){case"s":var e;try{e=JSON.parse(n.data)}catch(e){m("bad json",n.data);break}var r=e[0],o=e[1],i=e[2],s=e[3];if(m(r,o,i,s),r!==l.version)throw new Error('Incompatible SockJS! Main site uses: "'+r+'", the iframe: "'+l.version+'".');if(!f.isOriginEqual(i,p.href)||!f.isOriginEqual(s,p.href))throw new Error("Can't connect to different domain from within an iframe. ("+p.href+", "+i+", "+s+")");a=new h(new c[o](i,s));break;case"m":a._send(n.data);break;case"c":a&&a._close(),a=null}}}),d.postMessage("s")}}},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,"debug":void 0}],9:[function(e,t,n){"use strict";var r=e("events").EventEmitter,o=e("inherits"),s=e("./utils/object"),a=function(){};function i(e,t){r.call(this);var o=this,i=+new Date;this.xo=new t("GET",e),this.xo.once("finish",function(e,t){var n,r;if(200===e){if(r=+new Date-i,t)try{n=JSON.parse(t)}catch(e){a("bad json",t)}s.isObject(n)||(n={})}o.emit("finish",n,r),o.removeAllListeners()})}o(i,r),i.prototype.close=function(){this.removeAllListeners(),this.xo.close()},t.exports=i},{"./utils/object":49,"debug":void 0,"events":3,"inherits":54}],10:[function(e,t,n){"use strict";var r=e("inherits"),o=e("events").EventEmitter,i=e("./transport/sender/xhr-local"),s=e("./info-ajax");function a(e){var n=this;o.call(this),this.ir=new s(e,i),this.ir.once("finish",function(e,t){n.ir=null,n.emit("message",JSON.stringify([e,t]))})}r(a,o),a.transportName="iframe-info-receiver",a.prototype.close=function(){this.ir&&(this.ir.close(),this.ir=null),this.removeAllListeners()},t.exports=a},{"./info-ajax":9,"./transport/sender/xhr-local":37,"events":3,"inherits":54}],11:[function(n,o,e){(function(u){(function(){"use strict";var r=n("events").EventEmitter,e=n("inherits"),i=n("./utils/event"),s=n("./transport/iframe"),a=n("./info-iframe-receiver"),l=function(){};function t(t,n){var o=this;r.call(this);function e(){var e=o.ifr=new s(a.transportName,n,t);e.once("message",function(t){if(t){var e;try{e=JSON.parse(t)}catch(e){return l("bad json",t),o.emit("finish"),void o.close()}var n=e[0],r=e[1];o.emit("finish",n,r)}o.close()}),e.once("close",function(){o.emit("finish"),o.close()})}u.document.body?e():i.attachEvent("load",e)}e(t,r),t.enabled=function(){return s.enabled()},t.prototype.close=function(){this.ifr&&this.ifr.close(),this.removeAllListeners(),this.ifr=null},o.exports=t}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,"debug":void 0,"events":3,"inherits":54}],12:[function(e,t,n){"use strict";var r=e("events").EventEmitter,o=e("inherits"),i=e("./utils/url"),s=e("./transport/sender/xdr"),a=e("./transport/sender/xhr-cors"),l=e("./transport/sender/xhr-local"),u=e("./transport/sender/xhr-fake"),c=e("./info-iframe"),f=e("./info-ajax"),h=function(){};function d(e,t){h(e);var n=this;r.call(this),setTimeout(function(){n.doXhr(e,t)},0)}o(d,r),d._getReceiver=function(e,t,n){return n.sameOrigin?new f(t,l):a.enabled?new f(t,a):s.enabled&&n.sameScheme?new f(t,s):c.enabled()?new c(e,t):new f(t,u)},d.prototype.doXhr=function(e,t){var n=this,r=i.addPath(e,"/info");h("doXhr",r),this.xo=d._getReceiver(e,r,t),this.timeoutRef=setTimeout(function(){h("timeout"),n._cleanup(!1),n.emit("finish")},d.timeout),this.xo.once("finish",function(e,t){h("finish",e,t),n._cleanup(!0),n.emit("finish",e,t)})},d.prototype._cleanup=function(e){h("_cleanup"),clearTimeout(this.timeoutRef),this.timeoutRef=null,!e&&this.xo&&this.xo.close(),this.xo=null},d.prototype.close=function(){h("close"),this.removeAllListeners(),this._cleanup(!1)},d.timeout=8e3,t.exports=d},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,"debug":void 0,"events":3,"inherits":54}],13:[function(e,t,n){(function(e){(function(){"use strict";t.exports=e.location||{origin:"http://localhost:80",protocol:"http:",host:"localhost",port:80,href:"http://localhost/",hash:""}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],14:[function(x,_,e){(function(w){(function(){"use strict";x("./shims");var r,l=x("url-parse"),e=x("inherits"),u=x("./utils/random"),t=x("./utils/escape"),c=x("./utils/url"),i=x("./utils/event"),n=x("./utils/transport"),o=x("./utils/object"),f=x("./utils/browser"),h=x("./utils/log"),s=x("./event/event"),d=x("./event/eventtarget"),p=x("./location"),a=x("./event/close"),m=x("./event/trans-message"),v=x("./info-receiver"),b=function(){};function y(e,t,n){if(!(this instanceof y))return new y(e,t,n);if(arguments.length<1)throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");d.call(this),this.readyState=y.CONNECTING,this.extensions="",this.protocol="",(n=n||{}).protocols_whitelist&&h.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead."),this._transportsWhitelist=n.transports,this._transportOptions=n.transportOptions||{},this._timeout=n.timeout||0;var r=n.sessionId||8;if("function"==typeof r)this._generateSessionId=r;else{if("number"!=typeof r)throw new TypeError("If sessionId is used in the options, it needs to be a number or a function.");this._generateSessionId=function(){return u.string(r)}}this._server=n.server||u.numberString(1e3);var o=new l(e);if(!o.host||!o.protocol)throw new SyntaxError("The URL '"+e+"' is invalid");if(o.hash)throw new SyntaxError("The URL must not contain a fragment");if("http:"!==o.protocol&&"https:"!==o.protocol)throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '"+o.protocol+"' is not allowed.");var i="https:"===o.protocol;if("https:"===p.protocol&&!i&&!c.isLoopbackAddr(o.hostname))throw new Error("SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS");t?Array.isArray(t)||(t=[t]):t=[];var s=t.sort();s.forEach(function(e,t){if(!e)throw new SyntaxError("The protocols entry '"+e+"' is invalid.");if(t<s.length-1&&e===s[t+1])throw new SyntaxError("The protocols entry '"+e+"' is duplicated.")});var a=c.getOrigin(p.href);this._origin=a?a.toLowerCase():null,o.set("pathname",o.pathname.replace(/\/+$/,"")),this.url=o.href,b("using url",this.url),this._urlInfo={nullOrigin:!f.hasDomain(),sameOrigin:c.isOriginEqual(this.url,p.href),sameScheme:c.isSchemeEqual(this.url,p.href)},this._ir=new v(this.url,this._urlInfo),this._ir.once("finish",this._receiveInfo.bind(this))}function g(e){return 1e3===e||3e3<=e&&e<=4999}e(y,d),y.prototype.close=function(e,t){if(e&&!g(e))throw new Error("InvalidAccessError: Invalid code");if(t&&123<t.length)throw new SyntaxError("reason argument has an invalid length");if(this.readyState!==y.CLOSING&&this.readyState!==y.CLOSED){this._close(e||1e3,t||"Normal closure",!0)}},y.prototype.send=function(e){if("string"!=typeof e&&(e=""+e),this.readyState===y.CONNECTING)throw new Error("InvalidStateError: The connection has not been established yet");this.readyState===y.OPEN&&this._transport.send(t.quote(e))},y.version=x("./version"),y.CONNECTING=0,y.OPEN=1,y.CLOSING=2,y.CLOSED=3,y.prototype._receiveInfo=function(e,t){if(b("_receiveInfo",t),this._ir=null,e){this._rto=this.countRTO(t),this._transUrl=e.base_url?e.base_url:this.url,e=o.extend(e,this._urlInfo),b("info",e);var n=r.filterToEnabled(this._transportsWhitelist,e);this._transports=n.main,b(this._transports.length+" enabled transports"),this._connect()}else this._close(1002,"Cannot connect to server")},y.prototype._connect=function(){for(var e=this._transports.shift();e;e=this._transports.shift()){if(b("attempt",e.transportName),e.needBody&&(!w.document.body||void 0!==w.document.readyState&&"complete"!==w.document.readyState&&"interactive"!==w.document.readyState))return b("waiting for body"),this._transports.unshift(e),void i.attachEvent("load",this._connect.bind(this));var t=Math.max(this._timeout,this._rto*e.roundTrips||5e3);this._transportTimeoutId=setTimeout(this._transportTimeout.bind(this),t),b("using timeout",t);var n=c.addPath(this._transUrl,"/"+this._server+"/"+this._generateSessionId()),r=this._transportOptions[e.transportName];b("transport url",n);var o=new e(n,this._transUrl,r);return o.on("message",this._transportMessage.bind(this)),o.once("close",this._transportClose.bind(this)),o.transportName=e.transportName,void(this._transport=o)}this._close(2e3,"All transports failed",!1)},y.prototype._transportTimeout=function(){b("_transportTimeout"),this.readyState===y.CONNECTING&&(this._transport&&this._transport.close(),this._transportClose(2007,"Transport timed out"))},y.prototype._transportMessage=function(e){b("_transportMessage",e);var t,n=this,r=e.slice(0,1),o=e.slice(1);switch(r){case"o":return void this._open();case"h":return this.dispatchEvent(new s("heartbeat")),void b("heartbeat",this.transport)}if(o)try{t=JSON.parse(o)}catch(e){b("bad json",o)}if(void 0!==t)switch(r){case"a":Array.isArray(t)&&t.forEach(function(e){b("message",n.transport,e),n.dispatchEvent(new m(e))});break;case"m":b("message",this.transport,t),this.dispatchEvent(new m(t));break;case"c":Array.isArray(t)&&2===t.length&&this._close(t[0],t[1],!0)}else b("empty payload",o)},y.prototype._transportClose=function(e,t){b("_transportClose",this.transport,e,t),this._transport&&(this._transport.removeAllListeners(),this._transport=null,this.transport=null),g(e)||2e3===e||this.readyState!==y.CONNECTING?this._close(e,t):this._connect()},y.prototype._open=function(){b("_open",this._transport&&this._transport.transportName,this.readyState),this.readyState===y.CONNECTING?(this._transportTimeoutId&&(clearTimeout(this._transportTimeoutId),this._transportTimeoutId=null),this.readyState=y.OPEN,this.transport=this._transport.transportName,this.dispatchEvent(new s("open")),b("connected",this.transport)):this._close(1006,"Server lost session")},y.prototype._close=function(t,n,r){b("_close",this.transport,t,n,r,this.readyState);var o=!1;if(this._ir&&(o=!0,this._ir.close(),this._ir=null),this._transport&&(this._transport.close(),this._transport=null,this.transport=null),this.readyState===y.CLOSED)throw new Error("InvalidStateError: SockJS has already been closed");this.readyState=y.CLOSING,setTimeout(function(){this.readyState=y.CLOSED,o&&this.dispatchEvent(new s("error"));var e=new a("close");e.wasClean=r||!1,e.code=t||1e3,e.reason=n,this.dispatchEvent(e),this.onmessage=this.onclose=this.onerror=null,b("disconnected")}.bind(this),0)},y.prototype.countRTO=function(e){return 100<e?4*e:300+e},_.exports=function(e){return r=n(e),x("./iframe-bootstrap")(y,e),y}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,"debug":void 0,"inherits":54,"url-parse":57}],15:[function(e,t,n){"use strict";function a(e){return"[object Function]"===i.toString.call(e)}function l(e){return"[object String]"===f.call(e)}var o,c=Array.prototype,i=Object.prototype,r=Function.prototype,s=String.prototype,u=c.slice,f=i.toString,h=Object.defineProperty&&function(){try{return Object.defineProperty({},"x",{}),!0}catch(e){return!1}}();o=h?function(e,t,n,r){!r&&t in e||Object.defineProperty(e,t,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(e,t,n,r){!r&&t in e||(e[t]=n)};function d(e,t,n){for(var r in t)i.hasOwnProperty.call(t,r)&&o(e,r,t[r],n)}function p(e){if(null==e)throw new TypeError("can't convert "+e+" to object");return Object(e)}function m(){}d(r,{bind:function(t){var n=this;if(!a(n))throw new TypeError("Function.prototype.bind called on incompatible "+n);for(var r=u.call(arguments,1),e=Math.max(0,n.length-r.length),o=[],i=0;i<e;i++)o.push("$"+i);var s=Function("binder","return function ("+o.join(",")+"){ return binder.apply(this, arguments); }")(function(){if(this instanceof s){var e=n.apply(this,r.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,r.concat(u.call(arguments)))});return n.prototype&&(m.prototype=n.prototype,s.prototype=new m,m.prototype=null),s}}),d(Array,{isArray:function(e){return"[object Array]"===f.call(e)}});var v,b,y,g=Object("a"),w="a"!==g[0]||!(0 in g);d(c,{forEach:function(e,t){var n=p(this),r=w&&l(this)?this.split(""):n,o=t,i=-1,s=r.length>>>0;if(!a(e))throw new TypeError;for(;++i<s;)i in r&&e.call(o,r[i],i,n)}},(v=c.forEach,y=b=!0,v&&(v.call("foo",function(e,t,n){"object"!=typeof n&&(b=!1)}),v.call([1],function(){y="string"==typeof this},"x")),!(v&&b&&y)));var x=Array.prototype.indexOf&&-1!==[0,1].indexOf(1,2);d(c,{indexOf:function(e,t){var n=w&&l(this)?this.split(""):p(this),r=n.length>>>0;if(!r)return-1;var o=0;for(1<arguments.length&&(o=function(e){var t=+e;return t!=t?t=0:0!==t&&t!==1/0&&t!==-1/0&&(t=(0<t||-1)*Math.floor(Math.abs(t))),t}(t)),o=0<=o?o:Math.max(0,r+o);o<r;o++)if(o in n&&n[o]===e)return o;return-1}},x);var _,E=s.split;2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||1<".".split(/()()/).length?(_=void 0===/()??/.exec("")[1],s.split=function(e,t){var n=this;if(void 0===e&&0===t)return[];if("[object RegExp]"!==f.call(e))return E.call(this,e,t);var r,o,i,s,a=[],l=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":""),u=0;for(e=new RegExp(e.source,l+"g"),n+="",_||(r=new RegExp("^"+e.source+"$(?!\\s)",l)),t=void 0===t?-1>>>0:function(e){return e>>>0}(t);(o=e.exec(n))&&!(u<(i=o.index+o[0].length)&&(a.push(n.slice(u,o.index)),!_&&1<o.length&&o[0].replace(r,function(){for(var e=1;e<arguments.length-2;e++)void 0===arguments[e]&&(o[e]=void 0)}),1<o.length&&o.index<n.length&&c.push.apply(a,o.slice(1)),s=o[0].length,u=i,a.length>=t));)e.lastIndex===o.index&&e.lastIndex++;return u===n.length?!s&&e.test("")||a.push(""):a.push(n.slice(u)),a.length>t?a.slice(0,t):a}):"0".split(void 0,0).length&&(s.split=function(e,t){return void 0===e&&0===t?[]:E.call(this,e,t)});var S=s.substr,O="".substr&&"b"!=="0b".substr(-1);d(s,{substr:function(e,t){return S.call(this,e<0&&(e=this.length+e)<0?0:e,t)}},O)},{}],16:[function(e,t,n){"use strict";t.exports=[e("./transport/websocket"),e("./transport/xhr-streaming"),e("./transport/xdr-streaming"),e("./transport/eventsource"),e("./transport/lib/iframe-wrap")(e("./transport/eventsource")),e("./transport/htmlfile"),e("./transport/lib/iframe-wrap")(e("./transport/htmlfile")),e("./transport/xhr-polling"),e("./transport/xdr-polling"),e("./transport/lib/iframe-wrap")(e("./transport/xhr-polling")),e("./transport/jsonp-polling")]},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(o,f,e){(function(r){(function(){"use strict";var i=o("events").EventEmitter,e=o("inherits"),s=o("../../utils/event"),a=o("../../utils/url"),l=r.XMLHttpRequest,u=function(){};function c(e,t,n,r){u(e,t);var o=this;i.call(this),setTimeout(function(){o._start(e,t,n,r)},0)}e(c,i),c.prototype._start=function(e,t,n,r){var o=this;try{this.xhr=new l}catch(e){}if(!this.xhr)return u("no xhr"),this.emit("finish",0,"no xhr support"),void this._cleanup();t=a.addQuery(t,"t="+ +new Date),this.unloadRef=s.unloadAdd(function(){u("unload cleanup"),o._cleanup(!0)});try{this.xhr.open(e,t,!0),this.timeout&&"timeout"in this.xhr&&(this.xhr.timeout=this.timeout,this.xhr.ontimeout=function(){u("xhr timeout"),o.emit("finish",0,""),o._cleanup(!1)})}catch(e){return u("exception",e),this.emit("finish",0,""),void this._cleanup(!1)}if(r&&r.noCredentials||!c.supportsCORS||(u("withCredentials"),this.xhr.withCredentials=!0),r&&r.headers)for(var i in r.headers)this.xhr.setRequestHeader(i,r.headers[i]);this.xhr.onreadystatechange=function(){if(o.xhr){var e,t,n=o.xhr;switch(u("readyState",n.readyState),n.readyState){case 3:try{t=n.status,e=n.responseText}catch(e){}u("status",t),1223===t&&(t=204),200===t&&e&&0<e.length&&(u("chunk"),o.emit("chunk",t,e));break;case 4:t=n.status,u("status",t),1223===t&&(t=204),12005!==t&&12029!==t||(t=0),u("finish",t,n.responseText),o.emit("finish",t,n.responseText),o._cleanup(!1)}}};try{o.xhr.send(n)}catch(e){o.emit("finish",0,""),o._cleanup(!1)}},c.prototype._cleanup=function(e){if(u("cleanup"),this.xhr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xhr.onreadystatechange=function(){},this.xhr.ontimeout&&(this.xhr.ontimeout=null),e)try{this.xhr.abort()}catch(e){}this.unloadRef=this.xhr=null}},c.prototype.close=function(){u("close"),this._cleanup(!0)},c.enabled=!!l;var t=["Active"].concat("Object").join("X");!c.enabled&&t in r&&(u("overriding xmlhttprequest"),c.enabled=!!new(l=function(){try{return new r[t]("Microsoft.XMLHTTP")}catch(e){return null}}));var n=!1;try{n="withCredentials"in new l}catch(e){}c.supportsCORS=n,f.exports=c}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/event":46,"../../utils/url":52,"debug":void 0,"events":3,"inherits":54}],18:[function(e,t,n){(function(e){(function(){t.exports=e.EventSource}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],19:[function(e,n,t){(function(e){(function(){"use strict";var t=e.WebSocket||e.MozWebSocket;n.exports=t?function(e){return new t(e)}:void 0}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],20:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./lib/ajax-based"),i=e("./receiver/eventsource"),s=e("./sender/xhr-cors"),a=e("eventsource");function l(e){if(!l.enabled())throw new Error("Transport created when disabled");o.call(this,e,"/eventsource",i,s)}r(l,o),l.enabled=function(){return!!a},l.transportName="eventsource",l.roundTrips=2,t.exports=l},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,"eventsource":18,"inherits":54}],21:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./receiver/htmlfile"),i=e("./sender/xhr-local"),s=e("./lib/ajax-based");function a(e){if(!o.enabled)throw new Error("Transport created when disabled");s.call(this,e,"/htmlfile",o,i)}r(a,s),a.enabled=function(e){return o.enabled&&e.sameOrigin},a.transportName="htmlfile",a.roundTrips=2,t.exports=a},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,"inherits":54}],22:[function(e,t,n){"use strict";var r=e("inherits"),i=e("events").EventEmitter,o=e("../version"),s=e("../utils/url"),a=e("../utils/iframe"),l=e("../utils/event"),u=e("../utils/random"),c=function(){};function f(e,t,n){if(!f.enabled())throw new Error("Transport created when disabled");i.call(this);var r=this;this.origin=s.getOrigin(n),this.baseUrl=n,this.transUrl=t,this.transport=e,this.windowId=u.string(8);var o=s.addPath(n,"/iframe.html")+"#"+this.windowId;c(e,t,o),this.iframeObj=a.createIframe(o,function(e){c("err callback"),r.emit("close",1006,"Unable to load an iframe ("+e+")"),r.close()}),this.onmessageCallback=this._message.bind(this),l.attachEvent("message",this.onmessageCallback)}r(f,i),f.prototype.close=function(){if(c("close"),this.removeAllListeners(),this.iframeObj){l.detachEvent("message",this.onmessageCallback);try{this.postMessage("c")}catch(e){}this.iframeObj.cleanup(),this.iframeObj=null,this.onmessageCallback=this.iframeObj=null}},f.prototype._message=function(t){if(c("message",t.data),s.isOriginEqual(t.origin,this.origin)){var n;try{n=JSON.parse(t.data)}catch(e){return void c("bad json",t.data)}if(n.windowId===this.windowId)switch(n.type){case"s":this.iframeObj.loaded(),this.postMessage("s",JSON.stringify([o,this.transport,this.transUrl,this.baseUrl]));break;case"t":this.emit("message",n.data);break;case"c":var e;try{e=JSON.parse(n.data)}catch(e){return void c("bad json",n.data)}this.emit("close",e[0],e[1]),this.close()}else c("mismatched window id",n.windowId,this.windowId)}else c("not same origin",t.origin,this.origin)},f.prototype.postMessage=function(e,t){c("postMessage",e,t),this.iframeObj.post(JSON.stringify({windowId:this.windowId,type:e,data:t||""}),this.origin)},f.prototype.send=function(e){c("send",e),this.postMessage("m",e)},f.enabled=function(){return a.iframeEnabled},f.transportName="iframe",f.roundTrips=2,t.exports=f},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,"debug":void 0,"events":3,"inherits":54}],23:[function(s,a,e){(function(i){(function(){"use strict";var e=s("inherits"),t=s("./lib/sender-receiver"),n=s("./receiver/jsonp"),r=s("./sender/jsonp");function o(e){if(!o.enabled())throw new Error("Transport created when disabled");t.call(this,e,"/jsonp",r,n)}e(o,t),o.enabled=function(){return!!i.document},o.transportName="jsonp-polling",o.roundTrips=1,o.needBody=!0,a.exports=o}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,"inherits":54}],24:[function(e,t,n){"use strict";var r=e("inherits"),a=e("../../utils/url"),o=e("./sender-receiver"),l=function(){};function i(e,t,n,r){o.call(this,e,t,function(s){return function(e,t,n){l("create ajax sender",e,t);var r={};"string"==typeof t&&(r.headers={"Content-type":"text/plain"});var o=a.addPath(e,"/xhr_send"),i=new s("POST",o,t,r);return i.once("finish",function(e){if(l("finish",e),i=null,200!==e&&204!==e)return n(new Error("http status "+e));n()}),function(){l("abort"),i.close(),i=null;var e=new Error("Aborted");e.code=1e3,n(e)}}}(r),n,r)}r(i,o),t.exports=i},{"../../utils/url":52,"./sender-receiver":28,"debug":void 0,"inherits":54}],25:[function(e,t,n){"use strict";var r=e("inherits"),o=e("events").EventEmitter,i=function(){};function s(e,t){i(e),o.call(this),this.sendBuffer=[],this.sender=t,this.url=e}r(s,o),s.prototype.send=function(e){i("send",e),this.sendBuffer.push(e),this.sendStop||this.sendSchedule()},s.prototype.sendScheduleWait=function(){i("sendScheduleWait");var e,t=this;this.sendStop=function(){i("sendStop"),t.sendStop=null,clearTimeout(e)},e=setTimeout(function(){i("timeout"),t.sendStop=null,t.sendSchedule()},25)},s.prototype.sendSchedule=function(){i("sendSchedule",this.sendBuffer.length);var t=this;if(0<this.sendBuffer.length){var e="["+this.sendBuffer.join(",")+"]";this.sendStop=this.sender(this.url,e,function(e){t.sendStop=null,e?(i("error",e),t.emit("close",e.code||1006,"Sending error: "+e),t.close()):t.sendScheduleWait()}),this.sendBuffer=[]}},s.prototype._cleanup=function(){i("_cleanup"),this.removeAllListeners()},s.prototype.close=function(){i("close"),this._cleanup(),this.sendStop&&(this.sendStop(),this.sendStop=null)},t.exports=s},{"debug":void 0,"events":3,"inherits":54}],26:[function(e,n,t){(function(s){(function(){"use strict";var t=e("inherits"),o=e("../iframe"),i=e("../../utils/object");n.exports=function(r){function e(e,t){o.call(this,r.transportName,e,t)}return t(e,o),e.enabled=function(e,t){if(!s.document)return!1;var n=i.extend({},t);return n.sameOrigin=!0,r.enabled(n)&&o.enabled()},e.transportName="iframe-"+r.transportName,e.needBody=!0,e.roundTrips=o.roundTrips+r.roundTrips-1,e.facadeTransport=r,e}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/object":49,"../iframe":22,"inherits":54}],27:[function(e,t,n){"use strict";var r=e("inherits"),o=e("events").EventEmitter,i=function(){};function s(e,t,n){i(t),o.call(this),this.Receiver=e,this.receiveUrl=t,this.AjaxObject=n,this._scheduleReceiver()}r(s,o),s.prototype._scheduleReceiver=function(){i("_scheduleReceiver");var n=this,r=this.poll=new this.Receiver(this.receiveUrl,this.AjaxObject);r.on("message",function(e){i("message",e),n.emit("message",e)}),r.once("close",function(e,t){i("close",e,t,n.pollIsClosing),n.poll=r=null,n.pollIsClosing||("network"===t?n._scheduleReceiver():(n.emit("close",e||1006,t),n.removeAllListeners()))})},s.prototype.abort=function(){i("abort"),this.removeAllListeners(),this.pollIsClosing=!0,this.poll&&this.poll.abort()},t.exports=s},{"debug":void 0,"events":3,"inherits":54}],28:[function(e,t,n){"use strict";var r=e("inherits"),a=e("../../utils/url"),l=e("./buffered-sender"),u=e("./polling"),c=function(){};function o(e,t,n,r,o){var i=a.addPath(e,t);c(i);var s=this;l.call(this,e,n),this.poll=new u(r,i,o),this.poll.on("message",function(e){c("poll message",e),s.emit("message",e)}),this.poll.once("close",function(e,t){c("poll close",e,t),s.poll=null,s.emit("close",e,t),s.close()})}r(o,l),o.prototype.close=function(){l.prototype.close.call(this),c("close"),this.removeAllListeners(),this.poll&&(this.poll.abort(),this.poll=null)},t.exports=o},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,"debug":void 0,"inherits":54}],29:[function(e,t,n){"use strict";var r=e("inherits"),o=e("events").EventEmitter,i=e("eventsource"),s=function(){};function a(e){s(e),o.call(this);var n=this,r=this.es=new i(e);r.onmessage=function(e){s("message",e.data),n.emit("message",decodeURI(e.data))},r.onerror=function(e){s("error",r.readyState,e);var t=2!==r.readyState?"network":"permanent";n._cleanup(),n._close(t)}}r(a,o),a.prototype.abort=function(){s("abort"),this._cleanup(),this._close("user")},a.prototype._cleanup=function(){s("cleanup");var e=this.es;e&&(e.onmessage=e.onerror=null,e.close(),this.es=null)},a.prototype._close=function(e){s("close",e);var t=this;setTimeout(function(){t.emit("close",null,e),t.removeAllListeners()},200)},t.exports=a},{"debug":void 0,"events":3,"eventsource":18,"inherits":54}],30:[function(n,c,e){(function(u){(function(){"use strict";var e=n("inherits"),r=n("../../utils/iframe"),o=n("../../utils/url"),i=n("events").EventEmitter,s=n("../../utils/random"),a=function(){};function l(e){a(e),i.call(this);var t=this;r.polluteGlobalNamespace(),this.id="a"+s.string(6),e=o.addQuery(e,"c="+decodeURIComponent(r.WPrefix+"."+this.id)),a("using htmlfile",l.htmlfileEnabled);var n=l.htmlfileEnabled?r.createHtmlfile:r.createIframe;u[r.WPrefix][this.id]={start:function(){a("start"),t.iframeObj.loaded()},message:function(e){a("message",e),t.emit("message",e)},stop:function(){a("stop"),t._cleanup(),t._close("network")}},this.iframeObj=n(e,function(){a("callback"),t._cleanup(),t._close("permanent")})}e(l,i),l.prototype.abort=function(){a("abort"),this._cleanup(),this._close("user")},l.prototype._cleanup=function(){a("_cleanup"),this.iframeObj&&(this.iframeObj.cleanup(),this.iframeObj=null),delete u[r.WPrefix][this.id]},l.prototype._close=function(e){a("_close",e),this.emit("close",null,e),this.removeAllListeners()},l.htmlfileEnabled=!1;var t=["Active"].concat("Object").join("X");if(t in u)try{l.htmlfileEnabled=!!new u[t]("htmlfile")}catch(e){}l.enabled=l.htmlfileEnabled||r.iframeEnabled,c.exports=l}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":void 0,"events":3,"inherits":54}],31:[function(t,n,e){(function(c){(function(){"use strict";var r=t("../../utils/iframe"),i=t("../../utils/random"),s=t("../../utils/browser"),o=t("../../utils/url"),e=t("inherits"),a=t("events").EventEmitter,l=function(){};function u(e){l(e);var t=this;a.call(this),r.polluteGlobalNamespace(),this.id="a"+i.string(6);var n=o.addQuery(e,"c="+encodeURIComponent(r.WPrefix+"."+this.id));c[r.WPrefix][this.id]=this._callback.bind(this),this._createScript(n),this.timeoutId=setTimeout(function(){l("timeout"),t._abort(new Error("JSONP script loaded abnormally (timeout)"))},u.timeout)}e(u,a),u.prototype.abort=function(){if(l("abort"),c[r.WPrefix][this.id]){var e=new Error("JSONP user aborted read");e.code=1e3,this._abort(e)}},u.timeout=35e3,u.scriptErrorTimeout=1e3,u.prototype._callback=function(e){l("_callback",e),this._cleanup(),this.aborting||(e&&(l("message",e),this.emit("message",e)),this.emit("close",null,"network"),this.removeAllListeners())},u.prototype._abort=function(e){l("_abort",e),this._cleanup(),this.aborting=!0,this.emit("close",e.code,e.message),this.removeAllListeners()},u.prototype._cleanup=function(){if(l("_cleanup"),clearTimeout(this.timeoutId),this.script2&&(this.script2.parentNode.removeChild(this.script2),this.script2=null),this.script){var e=this.script;e.parentNode.removeChild(e),e.onreadystatechange=e.onerror=e.onload=e.onclick=null,this.script=null}delete c[r.WPrefix][this.id]},u.prototype._scriptError=function(){l("_scriptError");var e=this;this.errorTimer||(this.errorTimer=setTimeout(function(){e.loadedOkay||e._abort(new Error("JSONP script loaded abnormally (onerror)"))},u.scriptErrorTimeout))},u.prototype._createScript=function(e){l("_createScript",e);var t,n=this,r=this.script=c.document.createElement("script");if(r.id="a"+i.string(8),r.src=e,r.type="text/javascript",r.charset="UTF-8",r.onerror=this._scriptError.bind(this),r.onload=function(){l("onload"),n._abort(new Error("JSONP script loaded abnormally (onload)"))},r.onreadystatechange=function(){if(l("onreadystatechange",r.readyState),/loaded|closed/.test(r.readyState)){if(r&&r.htmlFor&&r.onclick){n.loadedOkay=!0;try{r.onclick()}catch(e){}}r&&n._abort(new Error("JSONP script loaded abnormally (onreadystatechange)"))}},void 0===r.async&&c.document.attachEvent)if(s.isOpera())(t=this.script2=c.document.createElement("script")).text="try{var a = document.getElementById('"+r.id+"'); if(a)a.onerror();}catch(x){};",r.async=t.async=!1;else{try{r.htmlFor=r.id,r.event="onclick"}catch(e){}r.async=!0}void 0!==r.async&&(r.async=!0);var o=c.document.getElementsByTagName("head")[0];o.insertBefore(r,o.firstChild),t&&o.insertBefore(t,o.firstChild)},n.exports=u}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":void 0,"events":3,"inherits":54}],32:[function(e,t,n){"use strict";var r=e("inherits"),o=e("events").EventEmitter,i=function(){};function s(e,t){i(e),o.call(this);var r=this;this.bufferPosition=0,this.xo=new t("POST",e,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(e,t){i("finish",e,t),r._chunkHandler(e,t),r.xo=null;var n=200===e?"network":"permanent";i("close",n),r.emit("close",null,n),r._cleanup()})}r(s,o),s.prototype._chunkHandler=function(e,t){if(i("_chunkHandler",e),200===e&&t)for(var n=-1;;this.bufferPosition+=n+1){var r=t.slice(this.bufferPosition);if(-1===(n=r.indexOf("\n")))break;var o=r.slice(0,n);o&&(i("message",o),this.emit("message",o))}},s.prototype._cleanup=function(){i("_cleanup"),this.removeAllListeners()},s.prototype.abort=function(){i("abort"),this.xo&&(this.xo.close(),i("close"),this.emit("close",null,"user"),this.xo=null),this._cleanup()},t.exports=s},{"debug":void 0,"events":3,"inherits":54}],33:[function(e,t,n){(function(f){(function(){"use strict";var s,a,l=e("../../utils/random"),u=e("../../utils/url"),c=function(){};t.exports=function(e,t,n){c(e,t),s||(c("createForm"),(s=f.document.createElement("form")).style.display="none",s.style.position="absolute",s.method="POST",s.enctype="application/x-www-form-urlencoded",s.acceptCharset="UTF-8",(a=f.document.createElement("textarea")).name="d",s.appendChild(a),f.document.body.appendChild(s));var r="a"+l.string(8);s.target=r,s.action=u.addQuery(u.addPath(e,"/jsonp_send"),"i="+r);var o=function(t){c("createIframe",t);try{return f.document.createElement('<iframe name="'+t+'">')}catch(e){var n=f.document.createElement("iframe");return n.name=t,n}}(r);o.id=r,o.style.display="none",s.appendChild(o);try{a.value=t}catch(e){}s.submit();function i(e){c("completed",r,e),o.onerror&&(o.onreadystatechange=o.onerror=o.onload=null,setTimeout(function(){c("cleaning up",r),o.parentNode.removeChild(o),o=null},500),a.value="",n(e))}return o.onerror=function(){c("onerror",r),i()},o.onload=function(){c("onload",r),i()},o.onreadystatechange=function(e){c("onreadystatechange",r,o.readyState,e),"complete"===o.readyState&&i()},function(){c("aborted",r),i(new Error("Aborted"))}}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/random":50,"../../utils/url":52,"debug":void 0}],34:[function(r,u,e){(function(l){(function(){"use strict";var o=r("events").EventEmitter,e=r("inherits"),i=r("../../utils/event"),t=r("../../utils/browser"),s=r("../../utils/url"),a=function(){};function n(e,t,n){a(e,t);var r=this;o.call(this),setTimeout(function(){r._start(e,t,n)},0)}e(n,o),n.prototype._start=function(e,t,n){a("_start");var r=this,o=new l.XDomainRequest;t=s.addQuery(t,"t="+ +new Date),o.onerror=function(){a("onerror"),r._error()},o.ontimeout=function(){a("ontimeout"),r._error()},o.onprogress=function(){a("progress",o.responseText),r.emit("chunk",200,o.responseText)},o.onload=function(){a("load"),r.emit("finish",200,o.responseText),r._cleanup(!1)},this.xdr=o,this.unloadRef=i.unloadAdd(function(){r._cleanup(!0)});try{this.xdr.open(e,t),this.timeout&&(this.xdr.timeout=this.timeout),this.xdr.send(n)}catch(e){this._error()}},n.prototype._error=function(){this.emit("finish",0,""),this._cleanup(!1)},n.prototype._cleanup=function(e){if(a("cleanup",e),this.xdr){if(this.removeAllListeners(),i.unloadDel(this.unloadRef),this.xdr.ontimeout=this.xdr.onerror=this.xdr.onprogress=this.xdr.onload=null,e)try{this.xdr.abort()}catch(e){}this.unloadRef=this.xdr=null}},n.prototype.close=function(){a("close"),this._cleanup(!0)},n.enabled=!(!l.XDomainRequest||!t.hasDomain()),u.exports=n}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,"debug":void 0,"events":3,"inherits":54}],35:[function(e,t,n){"use strict";var r=e("inherits"),o=e("../driver/xhr");function i(e,t,n,r){o.call(this,e,t,n,r)}r(i,o),i.enabled=o.enabled&&o.supportsCORS,t.exports=i},{"../driver/xhr":17,"inherits":54}],36:[function(e,t,n){"use strict";var r=e("events").EventEmitter;function o(){var e=this;r.call(this),this.to=setTimeout(function(){e.emit("finish",200,"{}")},o.timeout)}e("inherits")(o,r),o.prototype.close=function(){clearTimeout(this.to)},o.timeout=2e3,t.exports=o},{"events":3,"inherits":54}],37:[function(e,t,n){"use strict";var r=e("inherits"),o=e("../driver/xhr");function i(e,t,n){o.call(this,e,t,n,{noCredentials:!0})}r(i,o),i.enabled=o.enabled,t.exports=i},{"../driver/xhr":17,"inherits":54}],38:[function(e,t,n){"use strict";var i=e("../utils/event"),s=e("../utils/url"),r=e("inherits"),a=e("events").EventEmitter,l=e("./driver/websocket"),u=function(){};function c(e,t,n){if(!c.enabled())throw new Error("Transport created when disabled");a.call(this),u("constructor",e);var r=this,o=s.addPath(e,"/websocket");o="https"===o.slice(0,5)?"wss"+o.slice(5):"ws"+o.slice(4),this.url=o,this.ws=new l(this.url,[],n),this.ws.onmessage=function(e){u("message event",e.data),r.emit("message",e.data)},this.unloadRef=i.unloadAdd(function(){u("unload"),r.ws.close()}),this.ws.onclose=function(e){u("close event",e.code,e.reason),r.emit("close",e.code,e.reason),r._cleanup()},this.ws.onerror=function(e){u("error event",e),r.emit("close",1006,"WebSocket connection broken"),r._cleanup()}}r(c,a),c.prototype.send=function(e){var t="["+e+"]";u("send",t),this.ws.send(t)},c.prototype.close=function(){u("close");var e=this.ws;this._cleanup(),e&&e.close()},c.prototype._cleanup=function(){u("_cleanup");var e=this.ws;e&&(e.onmessage=e.onclose=e.onerror=null),i.unloadDel(this.unloadRef),this.unloadRef=this.ws=null,this.removeAllListeners()},c.enabled=function(){return u("enabled"),!!l},c.transportName="websocket",c.roundTrips=2,t.exports=c},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,"debug":void 0,"events":3,"inherits":54}],39:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./lib/ajax-based"),i=e("./xdr-streaming"),s=e("./receiver/xhr"),a=e("./sender/xdr");function l(e){if(!a.enabled)throw new Error("Transport created when disabled");o.call(this,e,"/xhr",s,a)}r(l,o),l.enabled=i.enabled,l.transportName="xdr-polling",l.roundTrips=2,t.exports=l},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,"inherits":54}],40:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./lib/ajax-based"),i=e("./receiver/xhr"),s=e("./sender/xdr");function a(e){if(!s.enabled)throw new Error("Transport created when disabled");o.call(this,e,"/xhr_streaming",i,s)}r(a,o),a.enabled=function(e){return!e.cookie_needed&&!e.nullOrigin&&(s.enabled&&e.sameScheme)},a.transportName="xdr-streaming",a.roundTrips=2,t.exports=a},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"inherits":54}],41:[function(e,t,n){"use strict";var r=e("inherits"),o=e("./lib/ajax-based"),i=e("./receiver/xhr"),s=e("./sender/xhr-cors"),a=e("./sender/xhr-local");function l(e){if(!a.enabled&&!s.enabled)throw new Error("Transport created when disabled");o.call(this,e,"/xhr",i,s)}r(l,o),l.enabled=function(e){return!e.nullOrigin&&(!(!a.enabled||!e.sameOrigin)||s.enabled)},l.transportName="xhr-polling",l.roundTrips=2,t.exports=l},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":54}],42:[function(l,u,e){(function(a){(function(){"use strict";var e=l("inherits"),t=l("./lib/ajax-based"),n=l("./receiver/xhr"),r=l("./sender/xhr-cors"),o=l("./sender/xhr-local"),i=l("../utils/browser");function s(e){if(!o.enabled&&!r.enabled)throw new Error("Transport created when disabled");t.call(this,e,"/xhr_streaming",n,r)}e(s,t),s.enabled=function(e){return!e.nullOrigin&&(!i.isOpera()&&r.enabled)},s.transportName="xhr-streaming",s.roundTrips=2,s.needBody=!!a.document,u.exports=s}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":54}],43:[function(e,t,n){(function(n){(function(){"use strict";n.crypto&&n.crypto.getRandomValues?t.exports.randomBytes=function(e){var t=new Uint8Array(e);return n.crypto.getRandomValues(t),t}:t.exports.randomBytes=function(e){for(var t=new Array(e),n=0;n<e;n++)t[n]=Math.floor(256*Math.random());return t}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],44:[function(e,t,n){(function(e){(function(){"use strict";t.exports={isOpera:function(){return e.navigator&&/opera/i.test(e.navigator.userAgent)},isKonqueror:function(){return e.navigator&&/konqueror/i.test(e.navigator.userAgent)},hasDomain:function(){if(!e.document)return!0;try{return!!e.document.domain}catch(e){return!1}}}}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],45:[function(e,t,n){"use strict";var r,o=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g;t.exports={quote:function(e){var t=JSON.stringify(e);return o.lastIndex=0,o.test(t)?(r=r||function(e){var t,n={},r=[];for(t=0;t<65536;t++)r.push(String.fromCharCode(t));return e.lastIndex=0,r.join("").replace(e,function(e){return n[e]="\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4),""}),e.lastIndex=0,n}(o),t.replace(o,function(e){return r[e]})):t}}},{}],46:[function(e,t,n){(function(s){(function(){"use strict";var n=e("./random"),r={},o=!1,i=s.chrome&&s.chrome.app&&s.chrome.app.runtime;t.exports={attachEvent:function(e,t){void 0!==s.addEventListener?s.addEventListener(e,t,!1):s.document&&s.attachEvent&&(s.document.attachEvent("on"+e,t),s.attachEvent("on"+e,t))},detachEvent:function(e,t){void 0!==s.addEventListener?s.removeEventListener(e,t,!1):s.document&&s.detachEvent&&(s.document.detachEvent("on"+e,t),s.detachEvent("on"+e,t))},unloadAdd:function(e){if(i)return null;var t=n.string(8);return r[t]=e,o&&setTimeout(this.triggerUnloadCallbacks,0),t},unloadDel:function(e){e in r&&delete r[e]},triggerUnloadCallbacks:function(){for(var e in r)r[e](),delete r[e]}};i||t.exports.attachEvent("unload",function(){o||(o=!0,t.exports.triggerUnloadCallbacks())})}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./random":50}],47:[function(t,p,e){(function(d){(function(){"use strict";var f=t("./event"),e=t("./browser"),h=function(){};p.exports={WPrefix:"_jp",currentWindowId:null,polluteGlobalNamespace:function(){p.exports.WPrefix in d||(d[p.exports.WPrefix]={})},postMessage:function(e,t){d.parent!==d?d.parent.postMessage(JSON.stringify({windowId:p.exports.currentWindowId,type:e,data:t||""}),"*"):h("Cannot postMessage, no parent window.",e,t)},createIframe:function(e,t){function n(){h("unattach"),clearTimeout(i);try{a.onload=null}catch(e){}a.onerror=null}function r(){h("cleanup"),a&&(n(),setTimeout(function(){a&&a.parentNode.removeChild(a),a=null},0),f.unloadDel(s))}function o(e){h("onerror",e),a&&(r(),t(e))}var i,s,a=d.document.createElement("iframe");return a.src=e,a.style.display="none",a.style.position="absolute",a.onerror=function(){o("onerror")},a.onload=function(){h("onload"),clearTimeout(i),i=setTimeout(function(){o("onload timeout")},2e3)},d.document.body.appendChild(a),i=setTimeout(function(){o("timeout")},15e3),s=f.unloadAdd(r),{post:function(e,t){h("post",e,t),setTimeout(function(){try{a&&a.contentWindow&&a.contentWindow.postMessage(e,t)}catch(e){}},0)},cleanup:r,loaded:n}},createHtmlfile:function(e,t){function n(){clearTimeout(i),a.onerror=null}function r(){u&&(n(),f.unloadDel(s),a.parentNode.removeChild(a),a=u=null,CollectGarbage())}function o(e){h("onerror",e),u&&(r(),t(e))}var i,s,a,l=["Active"].concat("Object").join("X"),u=new d[l]("htmlfile");u.open(),u.write('<html><script>document.domain="'+d.document.domain+'";<\/script></html>'),u.close(),u.parentWindow[p.exports.WPrefix]=d[p.exports.WPrefix];var c=u.createElement("div");return u.body.appendChild(c),a=u.createElement("iframe"),c.appendChild(a),a.src=e,a.onerror=function(){o("onerror")},i=setTimeout(function(){o("timeout")},15e3),s=f.unloadAdd(r),{post:function(e,t){try{setTimeout(function(){a&&a.contentWindow&&a.contentWindow.postMessage(e,t)},0)}catch(e){}},cleanup:r,loaded:n}}},p.exports.iframeEnabled=!1,d.document&&(p.exports.iframeEnabled=("function"==typeof d.postMessage||"object"==typeof d.postMessage)&&!e.isKonqueror())}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./browser":44,"./event":46,"debug":void 0}],48:[function(e,t,n){(function(r){(function(){"use strict";var n={};["log","debug","warn"].forEach(function(e){var t;try{t=r.console&&r.console[e]&&r.console[e].apply}catch(e){}n[e]=t?function(){return r.console[e].apply(r.console,arguments)}:"log"===e?function(){}:n.log}),t.exports=n}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],49:[function(e,t,n){"use strict";t.exports={isObject:function(e){var t=typeof e;return"function"==t||"object"==t&&!!e},extend:function(e){if(!this.isObject(e))return e;for(var t,n,r=1,o=arguments.length;r<o;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}}},{}],50:[function(e,t,n){"use strict";var i=e("crypto"),s="abcdefghijklmnopqrstuvwxyz012345";t.exports={string:function(e){for(var t=s.length,n=i.randomBytes(e),r=[],o=0;o<e;o++)r.push(s.substr(n[o]%t,1));return r.join("")},number:function(e){return Math.floor(Math.random()*e)},numberString:function(e){var t=(""+(e-1)).length;return(new Array(t+1).join("0")+this.number(e)).slice(-t)}}},{"crypto":43}],51:[function(e,t,n){"use strict";var o=function(){};t.exports=function(e){return{filterToEnabled:function(t,n){var r={main:[],facade:[]};return t?"string"==typeof t&&(t=[t]):t=[],e.forEach(function(e){e&&("websocket"!==e.transportName||!1!==n.websocket?t.length&&-1===t.indexOf(e.transportName)?o("not in whitelist",e.transportName):e.enabled(n)?(o("enabled",e.transportName),r.main.push(e),e.facadeTransport&&r.facade.push(e.facadeTransport)):o("disabled",e.transportName):o("disabled from server","websocket"))}),r}}}},{"debug":void 0}],52:[function(e,t,n){"use strict";var r=e("url-parse"),o=function(){};t.exports={getOrigin:function(e){if(!e)return null;var t=new r(e);if("file:"===t.protocol)return null;var n=t.port;return n=n||("https:"===t.protocol?"443":"80"),t.protocol+"//"+t.hostname+":"+n},isOriginEqual:function(e,t){var n=this.getOrigin(e)===this.getOrigin(t);return o("same",e,t,n),n},isSchemeEqual:function(e,t){return e.split(":")[0]===t.split(":")[0]},addPath:function(e,t){var n=e.split("?");return n[0]+t+(n[1]?"?"+n[1]:"")},addQuery:function(e,t){return e+(-1===e.indexOf("?")?"?"+t:"&"+t)},isLoopbackAddr:function(e){return/^127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(e)||/^\[::1\]$/.test(e)}}},{"debug":void 0,"url-parse":57}],53:[function(e,t,n){t.exports="1.6.1"},{}],54:[function(e,t,n){"function"==typeof Object.create?t.exports=function(e,t){t&&(e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:t.exports=function(e,t){if(t){e.super_=t;function n(){}n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}}},{}],55:[function(e,t,n){"use strict";var i=Object.prototype.hasOwnProperty;function s(e){try{return decodeURIComponent(e.replace(/\+/g," "))}catch(e){return null}}n.stringify=function(e,t){t=t||"";var n,r,o=[];for(r in"string"!=typeof t&&(t="?"),e)if(i.call(e,r)){if((n=e[r])||null!=n&&!isNaN(n)||(n=""),r=encodeURIComponent(r),n=encodeURIComponent(n),null===r||null===n)continue;o.push(r+"="+n)}return o.length?t+o.join("&"):""},n.parse=function(e){for(var t,n=/([^=?&]+)=?([^&]*)/g,r={};t=n.exec(e);){var o=s(t[1]),i=s(t[2]);null===o||null===i||o in r||(r[o]=i)}return r}},{}],56:[function(e,t,n){"use strict";t.exports=function(e,t){if(t=t.split(":")[0],!(e=+e))return!1;switch(t){case"http":case"ws":return 80!==e;case"https":case"wss":return 443!==e;case"ftp":return 21!==e;case"gopher":return 70!==e;case"file":return!1}return 0!==e}},{}],57:[function(e,n,t){(function(a){(function(){"use strict";var d=e("requires-port"),p=e("querystringify"),t=/^[\x00-\x20\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/,m=/[\n\r\t]/g,i=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,l=/:\d+$/,u=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\\/]+)?([\S\s]*)/i,v=/^[a-zA-Z]:/;function b(e){return(e||"").toString().replace(t,"")}var y=[["#","hash"],["?","query"],function(e,t){return w(t.protocol)?e.replace(/\\/g,"/"):e},["/","pathname"],["@","auth",1],[NaN,"host",void 0,1,1],[/:(\d*)$/,"port",void 0,1],[NaN,"hostname",void 0,1,1]],s={hash:1,query:1};function g(e){var t,n=("undefined"!=typeof window?window:void 0!==a?a:"undefined"!=typeof self?self:{}).location||{},r={},o=typeof(e=e||n);if("blob:"===e.protocol)r=new _(unescape(e.pathname),{});else if("string"==o)for(t in r=new _(e,{}),s)delete r[t];else if("object"==o){for(t in e)t in s||(r[t]=e[t]);void 0===r.slashes&&(r.slashes=i.test(e.href))}return r}function w(e){return"file:"===e||"ftp:"===e||"http:"===e||"https:"===e||"ws:"===e||"wss:"===e}function x(e,t){e=(e=b(e)).replace(m,""),t=t||{};var n,r=u.exec(e),o=r[1]?r[1].toLowerCase():"",i=!!r[2],s=!!r[3],a=0;return i?a=s?(n=r[2]+r[3]+r[4],r[2].length+r[3].length):(n=r[2]+r[4],r[2].length):s?(n=r[3]+r[4],a=r[3].length):n=r[4],"file:"===o?2<=a&&(n=n.slice(2)):w(o)?n=r[4]:o?i&&(n=n.slice(2)):2<=a&&w(t.protocol)&&(n=r[4]),{protocol:o,slashes:i||w(o),slashesCount:a,rest:n}}function _(e,t,n){if(e=(e=b(e)).replace(m,""),!(this instanceof _))return new _(e,t,n);var r,o,i,s,a,l,u=y.slice(),c=typeof t,f=this,h=0;for("object"!=c&&"string"!=c&&(n=t,t=null),n&&"function"!=typeof n&&(n=p.parse),r=!(o=x(e||"",t=g(t))).protocol&&!o.slashes,f.slashes=o.slashes||r&&t.slashes,f.protocol=o.protocol||t.protocol||"",e=o.rest,("file:"===o.protocol&&(2!==o.slashesCount||v.test(e))||!o.slashes&&(o.protocol||o.slashesCount<2||!w(f.protocol)))&&(u[3]=[/(.*)/,"pathname"]);h<u.length;h++)"function"!=typeof(s=u[h])?(i=s[0],l=s[1],i!=i?f[l]=e:"string"==typeof i?~(a="@"===i?e.lastIndexOf(i):e.indexOf(i))&&(e="number"==typeof s[2]?(f[l]=e.slice(0,a),e.slice(a+s[2])):(f[l]=e.slice(a),e.slice(0,a))):(a=i.exec(e))&&(f[l]=a[1],e=e.slice(0,a.index)),f[l]=f[l]||r&&s[3]&&t[l]||"",s[4]&&(f[l]=f[l].toLowerCase())):e=s(e,f);n&&(f.query=n(f.query)),r&&t.slashes&&"/"!==f.pathname.charAt(0)&&(""!==f.pathname||""!==t.pathname)&&(f.pathname=function(e,t){if(""===e)return t;for(var n=(t||"/").split("/").slice(0,-1).concat(e.split("/")),r=n.length,o=n[r-1],i=!1,s=0;r--;)"."===n[r]?n.splice(r,1):".."===n[r]?(n.splice(r,1),s++):s&&(0===r&&(i=!0),n.splice(r,1),s--);return i&&n.unshift(""),"."!==o&&".."!==o||n.push(""),n.join("/")}(f.pathname,t.pathname)),"/"!==f.pathname.charAt(0)&&w(f.protocol)&&(f.pathname="/"+f.pathname),d(f.port,f.protocol)||(f.host=f.hostname,f.port=""),f.username=f.password="",f.auth&&(~(a=f.auth.indexOf(":"))?(f.username=f.auth.slice(0,a),f.username=encodeURIComponent(decodeURIComponent(f.username)),f.password=f.auth.slice(a+1),f.password=encodeURIComponent(decodeURIComponent(f.password))):f.username=encodeURIComponent(decodeURIComponent(f.auth)),f.auth=f.password?f.username+":"+f.password:f.username),f.origin="file:"!==f.protocol&&w(f.protocol)&&f.host?f.protocol+"//"+f.host:"null",f.href=f.toString()}_.prototype={set:function(e,t,n){var r=this;switch(e){case"query":"string"==typeof t&&t.length&&(t=(n||p.parse)(t)),r[e]=t;break;case"port":r[e]=t,d(t,r.protocol)?t&&(r.host=r.hostname+":"+t):(r.host=r.hostname,r[e]="");break;case"hostname":r[e]=t,r.port&&(t+=":"+r.port),r.host=t;break;case"host":r[e]=t,l.test(t)?(t=t.split(":"),r.port=t.pop(),r.hostname=t.join(":")):(r.hostname=t,r.port="");break;case"protocol":r.protocol=t.toLowerCase(),r.slashes=!n;break;case"pathname":case"hash":if(t){var o="pathname"===e?"/":"#";r[e]=t.charAt(0)!==o?o+t:t}else r[e]=t;break;case"username":case"password":r[e]=encodeURIComponent(t);break;case"auth":var i=t.indexOf(":");~i?(r.username=t.slice(0,i),r.username=encodeURIComponent(decodeURIComponent(r.username)),r.password=t.slice(i+1),r.password=encodeURIComponent(decodeURIComponent(r.password))):r.username=encodeURIComponent(decodeURIComponent(t))}for(var s=0;s<y.length;s++){var a=y[s];a[4]&&(r[a[1]]=r[a[1]].toLowerCase())}return r.auth=r.password?r.username+":"+r.password:r.username,r.origin="file:"!==r.protocol&&w(r.protocol)&&r.host?r.protocol+"//"+r.host:"null",r.href=r.toString(),r},toString:function(e){e&&"function"==typeof e||(e=p.stringify);var t,n=this,r=n.host,o=n.protocol;o&&":"!==o.charAt(o.length-1)&&(o+=":");var i=o+(n.protocol&&n.slashes||w(n.protocol)?"//":"");return n.username?(i+=n.username,n.password&&(i+=":"+n.password),i+="@"):n.password?(i+=":"+n.password,i+="@"):"file:"!==n.protocol&&w(n.protocol)&&!r&&"/"!==n.pathname&&(i+="@"),(":"===r[r.length-1]||l.test(n.hostname)&&!n.port)&&(r+=":"),i+=r+n.pathname,(t="object"==typeof n.query?e(n.query):n.query)&&(i+="?"!==t.charAt(0)?"?"+t:t),n.hash&&(i+=n.hash),i}},_.extractProtocol=x,_.location=g,_.trimLeft=b,_.qs=p,n.exports=_}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"querystringify":55,"requires-port":56}]},{},[1])(1)});
-//# sourceMappingURL=sockjs.min.js.map
\ No newline at end of file

From 7660f0a35c956fbd779c21cb2933b737ca19605e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 11:28:19 +0200
Subject: [PATCH 149/264] refactor the modern config to apply all modern
 changes through a single setting

---
 packages/babel-compiler/babel-compiler.js     |  8 ++--
 tools/cli/commands.js                         |  2 +-
 tools/static-assets/skel-apollo/package.json  |  3 +-
 tools/static-assets/skel-blaze/package.json   |  3 +-
 .../static-assets/skel-chakra-ui/package.json |  3 +-
 tools/static-assets/skel-minimal/package.json |  3 +-
 tools/static-assets/skel-react/package.json   |  3 +-
 tools/static-assets/skel-solid/package.json   |  3 +-
 tools/static-assets/skel-svelte/package.json  |  3 +-
 .../static-assets/skel-tailwind/package.json  |  3 +-
 .../skel-typescript/package.json              |  3 +-
 v3-docs/docs/about/modern-build-stack.md      |  3 +-
 .../modern-build-stack/modern-bundler.md      | 12 ++++-
 .../modern-transpiler-swc.md                  | 44 +++++++++++++------
 14 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 1673205443..3cb6946d32 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -111,7 +111,7 @@ BCp.initializeMeteorAppConfig = function () {
     lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
     lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
 
-    if (lastModifiedMeteorConfig?.modernTranspiler?.verbose) {
+    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
     }
   }
@@ -131,7 +131,7 @@ BCp.initializeMeteorAppSwcrc = function () {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
     lastModifiedSwcConfig = getMeteorAppSwcrc();
 
-    if (lastModifiedMeteorConfig?.modernTranspiler?.verbose) {
+    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('SWC Config', lastModifiedSwcConfig);
     }
   }
@@ -141,7 +141,7 @@ BCp.initializeMeteorAppSwcrc = function () {
 let lastModifiedSwcLegacyConfig;
 BCp.initializeMeteorAppLegacyConfig = function () {
   const swcLegacyConfig = convertBabelTargetsForSwc(Babel.getMinimumModernBrowserVersions());
-  if (lastModifiedMeteorConfig?.modernTranspiler?.verbose && !lastModifiedSwcLegacyConfig) {
+  if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose && !lastModifiedSwcLegacyConfig) {
     logConfigBlock('SWC Legacy Config', swcLegacyConfig);
   }
   lastModifiedSwcLegacyConfig = swcLegacyConfig;
@@ -275,7 +275,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isPackageCode = packageName != null;
         const isLegacyWebArch = arch.includes('legacy');
 
-        const config = lastModifiedMeteorConfig?.modernTranspiler;
+        const config = lastModifiedMeteorConfig?.modern?.transpiler;
         const hasModernTranspiler = config != null;
         const shouldSkipSwc =
           !hasModernTranspiler ||
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index dc0eef53d4..fd85e7d7dd 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -268,7 +268,7 @@ function isModernArchsOnlyEnabled(appDir) {
   }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
-  return packageJson?.meteor?.modernWebArchsOnly === true;
+  return packageJson?.meteor?.modern?.webArchsOnly === true;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json
index 5ecaafb90b..211e19310a 100644
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -22,7 +22,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json
index 241f4001e8..3845c0046d 100644
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -18,7 +18,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json
index 561d051ac7..fdcb9c2717 100644
--- a/tools/static-assets/skel-chakra-ui/package.json
+++ b/tools/static-assets/skel-chakra-ui/package.json
@@ -25,7 +25,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
index f0038698c7..903c3e9bb7 100644
--- a/tools/static-assets/skel-minimal/package.json
+++ b/tools/static-assets/skel-minimal/package.json
@@ -17,7 +17,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json
index 59d8f0c986..b49bf5903e 100644
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -19,7 +19,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index b24dd0ead4..bb50ecbd9b 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -19,8 +19,7 @@
       "server": "server/entry-meteor.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   },
   "devDependencies": {
     "babel-preset-solid": "^1.8.15",
diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json
index 07c594351b..c1d703791d 100644
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -28,7 +28,6 @@
       }
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json
index 3ad26935c0..e4b556a821 100644
--- a/tools/static-assets/skel-tailwind/package.json
+++ b/tools/static-assets/skel-tailwind/package.json
@@ -23,7 +23,6 @@
       "server": "server/main.js"
     },
     "testModule": "tests/main.js",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index a5a9a1e979..90c078b082 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -26,7 +26,6 @@
       "server": "server/main.ts"
     },
     "testModule": "tests/main.ts",
-    "modernWebArchsOnly": true,
-    "modernTranspiler": true
+    "modern": true
   }
 }
diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index e16e814e24..7c5d0bc9ce 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -18,8 +18,7 @@ Start using the new build stack by creating a Meteor app, or add this to your `p
 
 ```json
 "meteor": {
-  "modernWebArchsOnly": true,
-  "modernTranspiler": true
+  "modern": true
 }
 ```
 
diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index c572951fbd..2d730274dc 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -16,12 +16,22 @@ For existing apps, enable this by adding to `package.json`:
 
 ```json
 "meteor": {
-  "modernWebArchsOnly": true
+  "modern": true
 }
 ```
 
 This works like using `--exclude-archs web.browser.legacy,web.cordova` with `meteor run`.
 
+By default, `"modern": true` enables all build stack upgrades: new transpiler, web arch-only compilation, watcher and more. To opt out of web arch-only compilation, set `"webArchOnly": false` in your `package.json`.
+
+```json
+"meteor": {
+  "modern": {
+    "webArchOnly": false
+  }
+}
+```
+
 ## Modern watcher
 
 Starting with Meteor 3.3, development mode uses a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index cf452b9d93..b800f99b74 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -14,20 +14,32 @@ Add this to your app's `package.json`:
 
 ```json
 "meteor": {
-  "modernTranspiler": true
+  "modern": true
 }
 ```
 
 When starting your app for web or native, SWC will handle all files: your app, npm packages, and Atmosphere packages. This also applies to production builds.
 
+By default, `"modern": true` enables all build stack upgrades: new transpiler, web arch-only compilation, watcher and more. To opt out of SWC, set `"transpiler": false` in your `package.json`.
+
+```json
+"meteor": {
+  "modern": {
+    "transpiler": false
+  }
+}
+```
+
 ## Verbose transpilation process
 
 To analyze and improve transpilation, you can enable verbose output. Add this to `package.json`:
 
 ```json
 "meteor": {
-  "modernTranspiler": {
-	  "verbose": true
+  "modern": {
+    "transpiler": {
+      "verbose": true
+    }
   }
 }
 ```
@@ -58,8 +70,10 @@ For example, if you're using `babel-plugin-react-compiler`, which [SWC doesn't s
 
 ```json
 "meteor": {
-  "modernTranspiler": {
-	  "excludeApp": true
+  "modern": {
+    "transpiler": {
+      "excludeApp": true
+    }
   }
 }
 ```
@@ -68,8 +82,10 @@ Or exclude only specific files like `.jsx`:
 
 ```json
 "meteor": {
-  "modernTranspiler": {
-	  "excludeApp": ["\\.jsx"]
+  "modern": {
+    "transpiler": {
+      "excludeApp": ["\\.jsx"]
+    }
   }
 }
 ```
@@ -105,25 +121,25 @@ This overrides Meteor's internal SWC config to apply your settings, ensuring SWC
 
 ## Config API
 
-- `modernTranspiler: [true|false]`
+- `modern.transpiler: [true|false]` - Default: `true`
   Enables or disables the use of the modern transpiler (SWC). If disabled, Babel will be used directly instead.
 
-- `modernTranspiler.excludeApp: [true|false] or [string[]]`
+- `modern.transpiler.excludeApp: [true|false] or [string[]]`
   If true, the app’s own code (outside of Meteor core and packages) will continue using Babel.
   Otherwise, a list of file paths or regex-like patterns within the app to exclude from SWC transpilation.
 
-- `modernTranspiler.excludeNodeModules: [true|false] or [string[]]`
+- `modern.transpiler.excludeNodeModules: [true|false] or [string[]]`
   If true, the app’s node_modules will continue using Babel.
   Otherwise, a list of NPM packages names, file paths or regex-like patterns within the node_modules folder to exclude from SWC transpilation.
 
-- `modernTranspiler.excludePackages: [true|false] or [string[]]`
+- `modern.transpiler.excludePackages: [true|false] or [string[]]`
   If true, the Meteor’s packages will continue using Babel.
   Otherwise, a list of package names, file paths or regex-like patterns within the package to exclude from SWC transpilation.
 
-- `modernTranspiler.excludeLegacy: [true|false]`
+- `modern.transpiler.excludeLegacy: [true|false]`
   If true, the Meteor’s bundle for legacy browsers will continue using Babel.
 
-- `modernTranspiler.verbose: [true|false]`
+- `modern.transpiler.verbose: [true|false]`
   If true, the transpilation process for files is shown when running the app. This helps understand which transpiler is used for each file, what fallbacks are applied, and gives a chance to either exclude files to always use Babel or migrate fully to SWC.
 
 ## Related Topics
@@ -153,7 +169,7 @@ if (condition) {
 
 For background, see: [Why nested import](https://github.com/benjamn/reify/blob/main/WHY_NEST_IMPORTS.md).
 
-With `"modernTranspiler": true`, if SWC finds one, it silently falls back to Babel (only shows in `"verbose": true`). Nested imports isn’t standard, most modern projects use other deferred loading methods. You might want to move imports to the top or use require instead, letting SWC handle the file and speeding up builds. Still, this decision is up to the devs, some Meteor devs use them for valid reasons.
+With `"modern.transpiler": true`, if SWC finds one, it silently falls back to Babel (only shows in `"verbose": true`). Nested imports isn’t standard, most modern projects use other deferred loading methods. You might want to move imports to the top or use require instead, letting SWC handle the file and speeding up builds. Still, this decision is up to the devs, some Meteor devs use them for valid reasons.
 
 ## Troubleshotting
 

From 0a146146fe0b6546e27300a75e5c5017e951a244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 11:43:14 +0200
Subject: [PATCH 150/264] update docs for the new watcher control

---
 .../modern-build-stack/modern-bundler.md      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index 2d730274dc..c30263bf62 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -34,9 +34,27 @@ By default, `"modern": true` enables all build stack upgrades: new transpiler, w
 
 ## Modern watcher
 
-Starting with Meteor 3.3, development mode uses a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
+Starting with Meteor 3.3, new apps use a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
 
-If the watcher doesn’t work properly, such as when using WSL with host, a volume, or a remote setup, switch fully to the polling strategy.
+For existing apps, enable this by adding to `package.json`:
+
+```json
+"meteor": {
+  "modern": true
+}
+```
+
+If you run into issues with the new watcher, you can revert to the previous implementation for better file change detection. To disable the new watcher, set `"watcher": false` in your package.json.
+
+```json
+"meteor": {
+  "modern": {
+    "watcher": false
+  }
+}
+```
+
+The modern watcher uses the OS's native file watching with a performance-first approach. Both modern and legacy watchers support environment variables for polling, useful in edge cases like WSL with host, volumes, or remote setups.
 
 To enable polling, run your Meteor app with:
 

From 1df9b486fc7b3b2be82f803b865e2bd6ba57d1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 12:03:50 +0200
Subject: [PATCH 151/264] ensure modern also activate web arch-only compilation

---
 tools/cli/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index fd85e7d7dd..ed2ece09db 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -268,7 +268,7 @@ function isModernArchsOnlyEnabled(appDir) {
   }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
-  return packageJson?.meteor?.modern?.webArchsOnly === true;
+  return packageJson?.meteor?.modern?.webArchsOnly === true || packageJson?.meteor?.modern === true;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {

From 88306046f45ceb0858e83946661341f620eafb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 12:46:11 +0200
Subject: [PATCH 152/264] ensure proper modern transpiler compilation

---
 packages/babel-compiler/babel-compiler.js | 28 ++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 3cb6946d32..3bb046af8e 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -276,30 +276,32 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isLegacyWebArch = arch.includes('legacy');
 
         const config = lastModifiedMeteorConfig?.modern?.transpiler;
-        const hasModernTranspiler = config != null;
+        const hasModernTranspiler =
+          lastModifiedMeteorConfig?.modern?.transpiler === true ||
+            lastModifiedMeteorConfig?.modern === true;
         const shouldSkipSwc =
           !hasModernTranspiler ||
-          (isAppCode && config.excludeApp === true) ||
-          (isNodeModulesCode && config.excludeNodeModules === true) ||
-          (isPackageCode && config.excludePackages === true) ||
-          (isLegacyWebArch && config.excludeLegacy === true) ||
+          (isAppCode && config?.excludeApp === true) ||
+          (isNodeModulesCode && config?.excludeNodeModules === true) ||
+          (isPackageCode && config?.excludePackages === true) ||
+          (isLegacyWebArch && config?.excludeLegacy === true) ||
           (isAppCode &&
-            Array.isArray(config.excludeApp) &&
-            isExcludedConfig(inputFilePath, config.excludeApp || [])) ||
+            Array.isArray(config?.excludeApp) &&
+            isExcludedConfig(inputFilePath, config?.excludeApp || [])) ||
           (isNodeModulesCode &&
-            Array.isArray(config.excludeNodeModules) &&
-            (isExcludedConfig(inputFilePath, config.excludeNodeModules || []) ||
+            Array.isArray(config?.excludeNodeModules) &&
+            (isExcludedConfig(inputFilePath, config?.excludeNodeModules || []) ||
               isExcludedConfig(
                 inputFilePath.replace('node_modules/', ''),
-                config.excludeNodeModules || [],
+                config?.excludeNodeModules || [],
                 true,
               ))) ||
           (isPackageCode &&
-            Array.isArray(config.excludePackages) &&
-            (isExcludedConfig(packageName, config.excludePackages || []) ||
+            Array.isArray(config?.excludePackages) &&
+            (isExcludedConfig(packageName, config?.excludePackages || []) ||
               isExcludedConfig(
                 `${packageName}/${inputFilePath}`,
-                config.excludePackages || [],
+                config?.excludePackages || [],
               )));
 
         const cacheKey = [

From 86ae1efad0be416163c055128a9c4193c5883103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 12:50:36 +0200
Subject: [PATCH 153/264] enable legacy watcher by config

---
 scripts/dev-bundle-tool-package.js |   2 +
 tools/cli/commands.js              |  21 +-
 tools/cli/main.js                  |   3 +-
 tools/fs/safe-watcher-legacy.ts    | 476 +++++++++++++++++++++++++++++
 tools/fs/safe-watcher.ts           |  17 ++
 5 files changed, 516 insertions(+), 3 deletions(-)
 create mode 100644 tools/fs/safe-watcher-legacy.ts

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8d9292efb0..6996b8f674 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -57,6 +57,8 @@ var packageJson = {
     escope: "3.6.0",
     split2: "3.2.2",
     multipipe: "2.0.1",
+    pathwatcher: "8.1.2",
+    "vscode-nsfw": "2.1.8",
     "@parcel/watcher": "2.5.1",
     // The @wry/context package version must be compatible with the
     // version constraint imposed by optimism/package.json.
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index ed2ece09db..017dbab8d6 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -261,14 +261,28 @@ export function parseRunTargets(targets) {
   });
 };
 
-function isModernArchsOnlyEnabled(appDir) {
+let meteorConfig;
+
+function getMeteorConfig(appDir) {
+  if (meteorConfig) return meteorConfig;
   const packageJsonPath = files.pathJoin(appDir, 'package.json');
   if (!files.exists(packageJsonPath)) {
     return false;
   }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
-  return packageJson?.meteor?.modern?.webArchsOnly === true || packageJson?.meteor?.modern === true;
+  meteorConfig = packageJson?.meteor;
+  return meteorConfig;
+}
+
+function isModernArchsOnlyEnabled(appDir) {
+  const meteorConfig = getMeteorConfig(appDir);
+  return meteorConfig?.modern?.webArchsOnly === true || meteorConfig?.modern === true;
+}
+
+export function isModernWatcherEnabled(appDir) {
+  const meteorConfig = getMeteorConfig(appDir);
+  return meteorConfig?.modern?.watcher === true || meteorConfig?.modern === true;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
@@ -547,6 +561,7 @@ async function doRunCommand(options) {
   webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir, options);
   // Set the webArchs to include for compilation later
   global.includedWebArchs = webArchs;
+  global.modernWatcher = isModernWatcherEnabled(options.appDir);
 
   const buildMode = options.production ? 'production' : 'development';
 
@@ -1447,6 +1462,7 @@ on an OS X system.");
       ...options,
       platforms: projectContext.platformList.getPlatforms(),
     });
+    global.modernWatcher = isModernWatcherEnabled(options.appDir);
   }
 
   var buildDir = projectContext.getProjectLocalDirectory('build_tar');
@@ -2517,6 +2533,7 @@ var runTestAppForPackages = async function (projectContext, options) {
   buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory, options);
   // Set the webArchs to include for compilation later
   global.includedWebArchs = buildOptions.webArchs;
+  global.modernWatcher = isModernWatcherEnabled(projectContext.appDirectory);
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.
diff --git a/tools/cli/main.js b/tools/cli/main.js
index 998e2bfc63..2060057adb 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -287,7 +287,7 @@ main.captureAndExit = async function (header, title, f) {
 
 // NB: files required up to this point may not define commands
 
-require('./commands.js');
+const { isModernWatcherEnabled } = require('./commands.js');
 require('./commands-packages.js');
 require('./commands-packages-query.js');
 require('./commands-cordova.js');
@@ -866,6 +866,7 @@ makeGlobalAsyncLocalStorage().run({}, async function () {
   if (appDir) {
     appDir = files.pathResolve(appDir);
   }
+  global.modernWatcher = isModernWatcherEnabled(appDir);
 
   await require('../tool-env/isopackets.js').ensureIsopacketsLoadable();
 
diff --git a/tools/fs/safe-watcher-legacy.ts b/tools/fs/safe-watcher-legacy.ts
new file mode 100644
index 0000000000..f5461f4965
--- /dev/null
+++ b/tools/fs/safe-watcher-legacy.ts
@@ -0,0 +1,476 @@
+import { FSWatcher, Stats, BigIntStats } from "fs";
+import { Profile } from "../tool-env/profile";
+import {
+    statOrNull,
+    convertToOSPath,
+    watchFile,
+    unwatchFile,
+    toPosixPath,
+    pathRelative
+} from "./files";
+import {
+    join as nativeJoin
+} from 'path';
+import nsfw from 'vscode-nsfw';
+
+const pathwatcher = require('pathwatcher');
+
+// Default to prioritizing changed files, but disable that behavior (and
+// thus prioritize all files equally) if METEOR_WATCH_PRIORITIZE_CHANGED
+// is explicitly set to a string that parses to a falsy value.
+var PRIORITIZE_CHANGED = true;
+if (process.env.METEOR_WATCH_PRIORITIZE_CHANGED &&
+    ! JSON.parse(process.env.METEOR_WATCH_PRIORITIZE_CHANGED)) {
+    PRIORITIZE_CHANGED = false;
+}
+
+var DEFAULT_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000);
+
+var NO_WATCHER_POLLING_INTERVAL =
+    +(process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500);
+
+// This may seems like a long time to wait before actually closing the
+// file watchers, but it's to our advantage if they survive restarts.
+const WATCHER_CLEANUP_DELAY_MS = 30000;
+
+// Since linux doesn't have recursive file watching, nsfw has to walk the
+// watched folder and create a separate watcher for each subfolder. Until it has a
+// way for us to filter which folders it walks we will continue to use
+// pathwatcher to avoid having too many watchers.
+let watcherLibrary = process.env.METEOR_WATCHER_LIBRARY ||
+    (process.platform === 'linux' ? 'pathwatcher' : 'nsfw');
+
+// Pathwatcher complains (using console.error, ugh) if you try to watch
+// two files with the same stat.ino number but different paths on linux, so we have
+// to deduplicate files by ino.
+const DEDUPLICATE_BY_INO = watcherLibrary === 'pathwatcher';
+// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
+// force the use of files.watchFile instead of watchLibrary.watch.
+let watcherEnabled = ! JSON.parse(
+    process.env.METEOR_WATCH_FORCE_POLLING || "false"
+);
+
+const entriesByIno = new Map;
+
+export type SafeWatcher = {
+    close: () => void;
+}
+
+type EntryCallback = (event: string) => void;
+
+interface Entry extends SafeWatcher {
+    callbacks: Set<EntryCallback>;
+    rewatch: () => void;
+    release: (callback: EntryCallback) => void;
+    _fire: (event: string) => void;
+}
+
+const entries: Record<string, Entry | null> = Object.create(null);
+
+// Folders that are watched recursively
+let watchRoots = new Set<string>();
+
+// Set of paths for which a change event has been fired, watched with
+// watchLibrary.watch if available. This could be an LRU cache, but in
+// practice it should never grow large enough for that to matter.
+const changedPaths = new Set;
+
+function hasPriority(absPath: string) {
+    // If we're not prioritizing changed files, then all files have
+    // priority, which means they should be watched with native file
+    // watchers if the platform supports them. If we are prioritizing
+    // changed files, then only changed files get priority.
+    return PRIORITIZE_CHANGED
+        ? changedPaths.has(absPath)
+        : true;
+}
+
+function acquireWatcher(absPath: string, callback: EntryCallback) {
+    const entry = entries[absPath] || (
+        entries[absPath] = startNewWatcher(absPath));
+
+    // Watches successfully established in the past may have become invalid
+    // because the watched file was deleted or renamed, so we need to make
+    // sure we're still watching every time we call safeWatcher.watch.
+    entry.rewatch();
+
+    // The size of the entry.callbacks Set also serves as a reference count
+    // for this watcher.
+    entry.callbacks.add(callback);
+
+    return entry;
+}
+
+function startNewWatcher(absPath: string): Entry {
+    let stat: Stats | BigIntStats | null | undefined = null;
+
+    if (DEDUPLICATE_BY_INO) {
+        stat = statOrNull(absPath);
+        if (stat && stat.ino > 0 && entriesByIno.has(stat.ino)) {
+            const entry = entriesByIno.get(stat.ino);
+            if (entries[absPath] === entry) {
+                return entry;
+            }
+        }
+    } else {
+        let entry = entries[absPath];
+        if (entry) {
+            return entry;
+        }
+    }
+
+    function safeUnwatch() {
+        if (watcher) {
+            watcher.close();
+            watcher = null;
+            if (stat && stat.ino > 0) {
+                entriesByIno.delete(stat.ino);
+            }
+        }
+    }
+
+    let lastWatcherEventTime = Date.now();
+    const callbacks = new Set<EntryCallback>();
+    let watcherCleanupTimer: ReturnType<typeof setTimeout> | null = null;
+    let watcher: FSWatcher | null = null;
+
+    // Determines the polling interval to be used for the fs.watchFile-based
+    // safety net that works on all platforms and file systems.
+    function getPollingInterval() {
+        if (hasPriority(absPath)) {
+            // Regardless of whether we have a native file watcher and it works
+            // correctly on this file system, poll prioritized files (that is,
+            // files that have been changed at least once) at a higher frequency
+            // (every 500ms by default).
+            return NO_WATCHER_POLLING_INTERVAL;
+        }
+
+        if (watcherEnabled || PRIORITIZE_CHANGED) {
+            // As long as native file watching is enabled (even if it doesn't
+            // work correctly) and the developer hasn't explicitly opted out of
+            // the file watching priority system, poll unchanged files at a
+            // lower frequency (every 5000ms by default).
+            return DEFAULT_POLLING_INTERVAL;
+        }
+
+        // If native file watching is disabled and the developer has
+        // explicitly opted out of the priority system, poll everything at the
+        // higher frequency (every 500ms by default). Note that this leads to
+        // higher idle CPU usage, so the developer may want to adjust the
+        // METEOR_WATCH_POLLING_INTERVAL_MS environment variable.
+        return NO_WATCHER_POLLING_INTERVAL;
+    }
+
+    function fire(event: string) {
+        if (event !== "change") {
+            // When we receive a "delete" or "rename" event, the watcher is
+            // probably not going to generate any more notifications for this
+            // file, so we close and nullify the watcher to ensure that
+            // entry.rewatch() will attempt to reestablish the watcher the next
+            // time we call safeWatcher.watch.
+            safeUnwatch();
+
+            // Make sure we don't throttle the watchFile callback after a
+            // "delete" or "rename" event, since it is now our only reliable
+            // source of file change notifications.
+            lastWatcherEventTime = 0;
+
+        } else {
+            changedPaths.add(absPath);
+            rewatch();
+        }
+
+        callbacks.forEach(cb => cb(event));
+    }
+
+    function watchWrapper(event: string) {
+        lastWatcherEventTime = Date.now();
+        fire(event);
+
+        // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
+        // but previous watcher success is no guarantee of future watcher
+        // reliability. For example, watchLibrary.watch works just fine when file
+        // changes originate from within a Vagrant VM, but changes to shared
+        // files made outside the VM are invisible to watcher, so our only
+        // hope of catching them is to continue polling.
+    }
+
+    function rewatch() {
+        if (hasPriority(absPath)) {
+            if (watcher) {
+                // Already watching; nothing to do.
+                return;
+            }
+            watcher = watchLibraryWatch(absPath, watchWrapper);
+        } else if (watcher) {
+            safeUnwatch();
+        }
+
+        // Since we're about to restart the stat-based file watcher, we don't
+        // want to miss any of its events because of the lastWatcherEventTime
+        // throttling that it attempts to do.
+        lastWatcherEventTime = 0;
+
+        // We use files.watchFile in addition to watcher.watch as a fail-safe
+        // to detect file changes even on network file systems.  However
+        // (unless the user disabled watcher or this watcher call failed), we
+        // use a relatively long default polling interval of 5000ms to save
+        // CPU cycles.
+        statWatch(absPath, getPollingInterval(), watchFileWrapper);
+    }
+
+    function watchFileWrapper(newStat: Stats, oldStat: Stats) {
+        if (newStat.ino === 0 &&
+            oldStat.ino === 0 &&
+            +newStat.mtime === +oldStat.mtime) {
+            // Node calls the watchFile listener once with bogus identical stat
+            // objects, which should not trigger a file change event.
+            return;
+        }
+
+        // If a watcher event fired in the last polling interval, ignore
+        // this event.
+        if (Date.now() - lastWatcherEventTime > getPollingInterval()) {
+            fire("change");
+        }
+    }
+
+    const entry = {
+        callbacks,
+        rewatch,
+
+        release(callback: EntryCallback) {
+            if (! entries[absPath]) {
+                return;
+            }
+
+            callbacks.delete(callback);
+            if (callbacks.size > 0) {
+                return;
+            }
+
+            // Once there are no more callbacks in the Set, close both watchers
+            // and nullify the shared data.
+            if (watcherCleanupTimer) {
+                clearTimeout(watcherCleanupTimer);
+            }
+
+            watcherCleanupTimer = setTimeout(() => {
+                if (callbacks.size > 0) {
+                    // If another callback was added while the timer was pending, we
+                    // can avoid tearing anything down.
+                    return;
+                }
+                entry.close();
+            }, WATCHER_CLEANUP_DELAY_MS);
+        },
+
+        close() {
+            if (entries[absPath] !== entry) return;
+            entries[absPath] = null;
+
+            if (watcherCleanupTimer) {
+                clearTimeout(watcherCleanupTimer);
+                watcherCleanupTimer = null;
+            }
+
+            safeUnwatch();
+
+            unwatchFile(absPath, watchFileWrapper);
+        },
+        _fire: fire
+    };
+
+    if (stat && stat.ino > 0) {
+        entriesByIno.set(stat.ino, entry);
+    }
+
+    return entry;
+}
+
+export function closeAllWatchers() {
+    Object.keys(entries).forEach(absPath => {
+        const entry = entries[absPath];
+        if (entry) {
+            entry.close();
+        }
+    });
+}
+
+const statWatchers = Object.create(null);
+
+function statWatch(
+    absPath: string,
+    interval: number,
+    callback: (current: Stats, previous: Stats) => void,
+) {
+    let statWatcher = statWatchers[absPath];
+
+    if (!statWatcher) {
+        statWatcher = {
+            interval,
+            changeListeners: [],
+            stat: null
+        };
+        statWatchers[absPath] = statWatcher;
+    }
+
+    // If the interval needs to be changed, replace the watcher.
+    // Node will only recreate the watcher with the new interval if all old
+    // watchers are stopped (which unwatchFile does when not passed a
+    // specific listener)
+    if (statWatcher.interval !== interval && statWatcher.stat) {
+        // This stops all stat watchers for the file, not just those created by
+        // statWatch
+        unwatchFile(absPath);
+        statWatcher.stat = null;
+        statWatcher.interval = interval;
+    }
+
+    if (!statWatcher.changeListeners.includes(callback)) {
+        statWatcher.changeListeners.push(callback);
+    }
+
+    if (!statWatcher.stat) {
+        const newStat = watchFile(absPath, {
+            persistent: false, // never persistent
+            interval,
+        }, (newStat, oldStat) => {
+            statWatcher.changeListeners.forEach((
+                listener: (newStat: Stats, oldStat: Stats) => void
+            ) => {
+                listener(newStat, oldStat);
+            });
+        });
+
+        newStat.on("stop", () => {
+            if (statWatchers[absPath] === statWatch) {
+                delete statWatchers[absPath];
+            }
+        });
+
+        statWatcher.stat = newStat;
+    }
+
+    return statWatcher;
+}
+
+function watchLibraryWatch(absPath: string, callback: EntryCallback) {
+    if (watcherEnabled && watcherLibrary === 'pathwatcher') {
+        try {
+            return pathwatcher.watch(convertToOSPath(absPath), callback);
+        } catch (e: any) {
+            maybeSuggestRaisingWatchLimit(e);
+            // ... ignore the error.  We'll still have watchFile, which is good
+            // enough.
+        }
+    }
+
+    return null;
+}
+
+let suggestedRaisingWatchLimit = false;
+
+function maybeSuggestRaisingWatchLimit(error: Error & { errno: number }) {
+    var constants = require('constants');
+    var archinfo = require('../utils/archinfo');
+    if (! suggestedRaisingWatchLimit &&
+        // Note: the not-super-documented require('constants') maps from
+        // strings to SYSTEM errno values. System errno values aren't the same
+        // as the numbers used internally by libuv! Once we're upgraded
+        // to Node 0.12, we'll have the system errno as a string (on 'code'),
+        // but the support for that wasn't in Node 0.10's uv.
+        // See our PR https://github.com/atom/node-pathwatcher/pull/53
+        // (and make sure to read the final commit message, not the original
+        // proposed PR, which had a slightly different interface).
+        error.errno === constants.ENOSPC &&
+        // The only suggestion we currently have is for Linux.
+        archinfo.matches(archinfo.host(), 'os.linux')) {
+
+        // Check suggestedRaisingWatchLimit again because archinfo.host() may
+        // have yielded.
+        if (suggestedRaisingWatchLimit) return;
+        suggestedRaisingWatchLimit = true;
+
+        var Console = require('../console/console.js').Console;
+        if (! Console.isHeadless()) {
+            Console.arrowWarn(
+                "It looks like a simple tweak to your system's configuration will " +
+                "make many tools (including this Meteor command) more efficient. " +
+                "To learn more, see " +
+                Console.url("https://github.com/meteor/docs/blob/master/long-form/file-change-watcher-efficiency.md"));
+        }
+    }
+}
+
+export const watch = Profile(
+    "safeWatcher.watch",
+    (absPath: string, callback: EntryCallback) => {
+        const entry = acquireWatcher(absPath, callback);
+        return {
+            close() {
+                entry.release(callback);
+            }
+        } as SafeWatcher;
+    }
+);
+
+const fireNames = {
+    [nsfw.actions.CREATED]: 'change',
+    [nsfw.actions.MODIFIED]: 'change',
+    [nsfw.actions.DELETED]: 'delete'
+}
+
+export function addWatchRoot(absPath: string) {
+    if (watchRoots.has(absPath) || watcherLibrary !== 'nsfw' || !watcherEnabled) {
+        return;
+    }
+
+    watchRoots.add(absPath);
+
+    // If there already is a watcher for a parent directory, there is no need
+    // to create this watcher.
+    for (const path of watchRoots) {
+        let relativePath = pathRelative(path, absPath);
+        if (
+            path !== absPath &&
+            !relativePath.startsWith('..') &&
+            !relativePath.startsWith('/')
+        ) {
+            return;
+        }
+    }
+
+    // TODO: check if there are any existing watchers that are children of this
+    // watcher and stop them
+
+    nsfw(
+        convertToOSPath(absPath),
+        (events) => {
+            events.forEach(event => {
+                if(event.action === nsfw.actions.RENAMED) {
+                    let oldPath = nativeJoin(event.directory, event.oldFile);
+                    let oldEntry = entries[toPosixPath(oldPath)];
+                    if (oldEntry) {
+                        oldEntry._fire('rename');
+                    }
+
+                    let path = nativeJoin(event.newDirectory, event.newFile);
+                    let newEntry = entries[toPosixPath(path)];
+                    if (newEntry) {
+                        newEntry._fire('change');
+                    }
+                } else {
+                    let path = nativeJoin(event.directory, event.file);
+                    let entry = entries[toPosixPath(path)];
+                    if (entry) {
+                        entry._fire(fireNames[event.action]);
+                    }
+                }
+            })
+        }
+    ).then(watcher => {
+        watcher.start()
+    });
+}
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index dc03089bb2..fbb7d432f2 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -1,5 +1,6 @@
 import { Stats } from 'fs';
 import ParcelWatcher from "@parcel/watcher";
+import { watch as watchLegacy, addWatchRoot as addWatchRootLegacy, closeAllWatchers as closeAllWatchersLegacy } from './safe-watcher-legacy';
 
 import { Profile } from "../tool-env/profile";
 import { statOrNull, lstat, toPosixPath, convertToOSPath, pathRelative, watchFile, unwatchFile, pathResolve, pathDirname } from "./files";
@@ -380,6 +381,11 @@ export const watch = Profile(
     absPath: string,
     callback: ChangeCallback
     ): SafeWatcher => {
+      // @ts-ignore
+      if (!global.modernWatcher) {
+        // @ts-ignore
+        return watchLegacy(absPath, callback);
+      }
       absPath = toPosixPath(absPath);
 
       // If the path should be ignored, immediately return a noop SafeWatcher.
@@ -428,6 +434,12 @@ export const watch = Profile(
  * If the provided path is a file, its parent directory is used.
  */
 export function addWatchRoot(absPath: string) {
+  // @ts-ignore
+  if (!global.modernWatcher) {
+    // @ts-ignore
+    return addWatchRootLegacy(absPath);
+  }
+
   absPath = toPosixPath(absPath);
   let watchTarget = absPath;
   try {
@@ -455,6 +467,11 @@ async function safeUnsubscribeSub(root: string) {
 }
 
 export async function closeAllWatchers() {
+  // @ts-ignore
+  if (!global.modernWatcher) {
+    // @ts-ignore
+    return closeAllWatchersLegacy();
+  }
   for (const root of Array.from(watchRoots)) {
     await safeUnsubscribeSub(root);
   }

From 4a232d10ef66e99656ab29b6e7d628e47a7d5078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 12:51:54 +0200
Subject: [PATCH 154/264] enable proper transpiler config

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 3bb046af8e..28b679ab49 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -277,7 +277,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
         const config = lastModifiedMeteorConfig?.modern?.transpiler;
         const hasModernTranspiler =
-          lastModifiedMeteorConfig?.modern?.transpiler === true ||
+          lastModifiedMeteorConfig?.modern?.transpiler !== false ||
             lastModifiedMeteorConfig?.modern === true;
         const shouldSkipSwc =
           !hasModernTranspiler ||

From df576c66047ebf1b6f22b89101bdf93d90ac8bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 13:15:34 +0200
Subject: [PATCH 155/264] normalize properly the modern config to ensure
 defaults even on scenarios of partial configs

---
 packages/babel-compiler/babel-compiler.js | 20 ++++++++++++++++++++
 tools/cli/commands.js                     | 23 +++++++++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 28b679ab49..0a592c3ec6 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -97,6 +97,22 @@ function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch
     };
   });
 }
+const DEFAULT_MODERN = {
+  transpiler: true,
+};
+
+const normalizeModern = r => Object.fromEntries(
+    Object.entries(DEFAULT_MODERN).map(([k, def]) => [
+      k,
+      r === true
+        ? def
+        : r === false || r?.[k] === false
+        ? false
+        : typeof r?.[k] === 'object'
+        ? { ...r[k] }
+        : def,
+    ]),
+);
 
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
@@ -110,6 +126,10 @@ BCp.initializeMeteorAppConfig = function () {
   if (currentLastModifiedConfigTime !== lastModifiedMeteorConfigTime) {
     lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
     lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
+    lastModifiedMeteorConfig = {
+      ...lastModifiedMeteorConfig,
+      modern: normalizeModern(lastModifiedMeteorConfig?.modern),
+    };
 
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index ed2ece09db..3bb3c72de4 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -261,6 +261,25 @@ export function parseRunTargets(targets) {
   });
 };
 
+const DEFAULT_MODERN = {
+  transpiler: true,
+  webArchsOnly: true,
+  watcher: true,
+};
+
+const normalizeModern = r => Object.fromEntries(
+    Object.entries(DEFAULT_MODERN).map(([k, def]) => [
+      k,
+      r === true
+          ? def
+          : r === false || r?.[k] === false
+              ? false
+              : typeof r?.[k] === 'object'
+                  ? { ...r[k] }
+                  : def,
+    ]),
+);
+
 function isModernArchsOnlyEnabled(appDir) {
   const packageJsonPath = files.pathJoin(appDir, 'package.json');
   if (!files.exists(packageJsonPath)) {
@@ -268,7 +287,7 @@ function isModernArchsOnlyEnabled(appDir) {
   }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
-  return packageJson?.meteor?.modern?.webArchsOnly === true || packageJson?.meteor?.modern === true;
+  return normalizeModern(packageJson?.meteor?.modern).webArchOnly === true;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
@@ -292,7 +311,7 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
       const hasExcludeArchsOptions = (excludeArchsOptions?.length || 0) > 0;
       const hasModernArchsOnlyEnabled = appDir && isModernArchsOnlyEnabled(appDir);
       if (hasExcludeArchsOptions && hasModernArchsOnlyEnabled) {
-        console.warn('modernWebArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
+        console.warn('modern.webArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
       }
       const automaticallyIgnoredLegacyArchs = (!hasExcludeArchsOptions && hasModernArchsOnlyEnabled) ? ['web.browser.legacy', 'web.cordova'] : [];
       if (hasExcludeArchsOptions || automaticallyIgnoredLegacyArchs.length) {

From 2fee467d6c988d6dcc8371bac27bd6717d34c7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 13:36:04 +0200
Subject: [PATCH 156/264] fix normalization

---
 packages/babel-compiler/babel-compiler.js | 4 +---
 tools/cli/commands.js                     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 0a592c3ec6..a8e3a0c539 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -296,9 +296,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isLegacyWebArch = arch.includes('legacy');
 
         const config = lastModifiedMeteorConfig?.modern?.transpiler;
-        const hasModernTranspiler =
-          lastModifiedMeteorConfig?.modern?.transpiler !== false ||
-            lastModifiedMeteorConfig?.modern === true;
+        const hasModernTranspiler = lastModifiedMeteorConfig?.modern?.transpiler !== false;
         const shouldSkipSwc =
           !hasModernTranspiler ||
           (isAppCode && config?.excludeApp === true) ||
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 3bb3c72de4..9c5a95b1eb 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -287,7 +287,7 @@ function isModernArchsOnlyEnabled(appDir) {
   }
   const packageJsonFile = files.readFile(packageJsonPath, 'utf8');
   const packageJson = JSON.parse(packageJsonFile);
-  return normalizeModern(packageJson?.meteor?.modern).webArchOnly === true;
+  return normalizeModern(packageJson?.meteor?.modern).webArchOnly !== false;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {

From bf41ff8822d6e3a8fe18dd41142375e9219db378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 13:42:07 +0200
Subject: [PATCH 157/264] bump dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 3886794b56..5d621e5490 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.15.0.1
+BUNDLE_VERSION=22.15.0.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 269a89a8e8222382325fe83012642d822711886b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 14:08:16 +0200
Subject: [PATCH 158/264] bump dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 5d621e5490..cdc7ffc05a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.15.0.2
+BUNDLE_VERSION=22.15.0.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From b4bc6ed7e392f32936367dcf738de63e3bdfffd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 14:37:27 +0200
Subject: [PATCH 159/264] re-run checks


From 7eef543902d292418f711f7036a1e6b9f6f39233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 15:00:13 +0200
Subject: [PATCH 160/264] fix issue with global watcher detection

---
 tools/cli/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index 2060057adb..a6742e3d08 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -865,8 +865,8 @@ makeGlobalAsyncLocalStorage().run({}, async function () {
   var appDir = files.findAppDir();
   if (appDir) {
     appDir = files.pathResolve(appDir);
+    global.modernWatcher = isModernWatcherEnabled(appDir);
   }
-  global.modernWatcher = isModernWatcherEnabled(appDir);
 
   await require('../tool-env/isopackets.js').ensureIsopacketsLoadable();
 

From a00a34fcc9ca65df52d4a093dfa816fbd5783c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 15:11:59 +0200
Subject: [PATCH 161/264] force CI to pass tests using modern bundler

---
 .circleci/config.yml                      | 3 +++
 packages/babel-compiler/babel-compiler.js | 4 +++-
 tools/cli/commands.js                     | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be2fe2cae4..8b714c9285 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,6 +115,9 @@ build_machine_environment:
     NUM_GROUPS: 12
     RUNNING_AVG_LENGTH: 6
 
+    # Force modern bundler test
+    METEOR_MODERN: true
+
 jobs:
   Get Ready:
     <<: *build_machine_environment
diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index a8e3a0c539..32e486a05b 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -114,6 +114,8 @@ const normalizeModern = r => Object.fromEntries(
     ]),
 );
 
+let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
+
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
 BCp.initializeMeteorAppConfig = function () {
@@ -128,7 +130,7 @@ BCp.initializeMeteorAppConfig = function () {
     lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
     lastModifiedMeteorConfig = {
       ...lastModifiedMeteorConfig,
-      modern: normalizeModern(lastModifiedMeteorConfig?.modern),
+      modern: normalizeModern(modernForced || lastModifiedMeteorConfig?.modern),
     };
 
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index fb4cb93f6f..7ad18f597f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -280,6 +280,8 @@ const normalizeModern = r => Object.fromEntries(
     ]),
 );
 
+
+let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
 let meteorConfig;
 
 function getMeteorConfig(appDir) {
@@ -296,12 +298,12 @@ function getMeteorConfig(appDir) {
 
 function isModernArchsOnlyEnabled(appDir) {
   const meteorConfig = getMeteorConfig(appDir);
-  return normalizeModern(meteorConfig?.modern).webArchOnly !== false;
+  return normalizeModern(modernForced || meteorConfig?.modern).webArchOnly !== false;
 }
 
 export function isModernWatcherEnabled(appDir) {
   const meteorConfig = getMeteorConfig(appDir);
-  return normalizeModern(meteorConfig?.modern).watcher !== false;
+  return normalizeModern(modernForced || meteorConfig?.modern).watcher !== false;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {

From 8a2d74bef1485707b76bd6f2db963ef5ee78dda5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 15:49:30 +0200
Subject: [PATCH 162/264] clean

---
 packages/babel-compiler/babel-compiler.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f03765405a..5162432511 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -264,10 +264,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
     this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
     babelOptions.sourceMaps = true;
-    babelOptions.filename =
-      babelOptions.sourceFileName = packageName
-        ? "packages/" + packageName + "/" + inputFilePath
+    const filename = packageName
+        ? `packages/${packageName}/${inputFilePath}`
         : inputFilePath;
+    babelOptions.filename = babelOptions.sourceFileName = filename;
 
     if (this.modifyBabelConfig) {
       this.modifyBabelConfig(babelOptions, inputFile);
@@ -339,15 +339,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               return compilation;
             }
 
-
-            const filename = packageName
-              ? `packages/${packageName}/${inputFilePath}`
-              : inputFilePath;
-            const sourceFileName = filename;
             compilation = compileWithSwc(
               source,
               lastModifiedSwcConfig,
-              { inputFilePath, features, arch, filename, sourceFileName },
+              { inputFilePath, features, arch, filename, sourceFileName: filename },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });

From b922a71fc061e65b36d529e3644f6461837f6f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 15:50:42 +0200
Subject: [PATCH 163/264] clean

---
 packages/babel-compiler/babel-compiler.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 5162432511..31a0dbee92 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -339,10 +339,11 @@ BCp.processOneFileForTarget = function (inputFile, source) {
               return compilation;
             }
 
+            const sourceFileName = filename;
             compilation = compileWithSwc(
               source,
               lastModifiedSwcConfig,
-              { inputFilePath, features, arch, filename, sourceFileName: filename },
+              { inputFilePath, features, arch, filename, sourceFileName },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });

From 9682b60f6ac3f4881851dc55fec03c6ed59493dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 16:41:52 +0200
Subject: [PATCH 164/264] fix tests

---
 packages/babel-compiler/babel-compiler.js | 6 +++---
 tools/cli/commands.js                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index ce50c6dfdd..aaec42177c 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -103,7 +103,7 @@ const DEFAULT_MODERN = {
   transpiler: true,
 };
 
-const normalizeModern = r => Object.fromEntries(
+const normalizeModern = (r = false) => Object.fromEntries(
     Object.entries(DEFAULT_MODERN).map(([k, def]) => [
       k,
       r === true
@@ -128,10 +128,10 @@ BCp.initializeMeteorAppConfig = function () {
   if (currentLastModifiedConfigTime !== lastModifiedMeteorConfigTime) {
     lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
     lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
-    lastModifiedMeteorConfig = {
+    lastModifiedMeteorConfig = lastModifiedMeteorConfig != null ? {
       ...lastModifiedMeteorConfig,
       modern: normalizeModern(lastModifiedMeteorConfig?.modern),
-    };
+    } : {};
 
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 9c5a95b1eb..c11944e594 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -267,7 +267,7 @@ const DEFAULT_MODERN = {
   watcher: true,
 };
 
-const normalizeModern = r => Object.fromEntries(
+const normalizeModern = (r = false) => Object.fromEntries(
     Object.entries(DEFAULT_MODERN).map(([k, def]) => [
       k,
       r === true

From 3585ec6ed190ced64946106a766b4e3f6f07c651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 16:45:42 +0200
Subject: [PATCH 165/264] use meteor modern across other CI tests

---
 .github/workflows/meteor-selftest-windows.yml | 1 +
 .travis.yml                                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index c6831b7a6f..c328e7bf2d 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -18,6 +18,7 @@ env:
   TIMEOUT_SCALE_FACTOR: 20
   METEOR_HEADLESS: true
   SELF_TEST_EXCLUDE: '^NULL-LEAVE-THIS-HERE-NULL$'
+  METEOR_MODERN: true
 
 jobs:
   test:
diff --git a/.travis.yml b/.travis.yml
index 1eb4d5be93..ee9af17abb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ env:
     - phantom=false
     - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
     - TEST_PACKAGES_EXCLUDE=stylus
+    - METEOR_MODERN=true
 addons:
   apt:
     sources:

From 56e74492d0506801346f0996e2519f6fa2cb6dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 17:22:03 +0200
Subject: [PATCH 166/264] fix tests

---
 tools/cli/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index c11944e594..7b89118a3c 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -263,7 +263,7 @@ export function parseRunTargets(targets) {
 
 const DEFAULT_MODERN = {
   transpiler: true,
-  webArchsOnly: true,
+  webArchOnly: true,
   watcher: true,
 };
 
@@ -311,7 +311,7 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
       const hasExcludeArchsOptions = (excludeArchsOptions?.length || 0) > 0;
       const hasModernArchsOnlyEnabled = appDir && isModernArchsOnlyEnabled(appDir);
       if (hasExcludeArchsOptions && hasModernArchsOnlyEnabled) {
-        console.warn('modern.webArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
+        console.warn('modern.webArchOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
       }
       const automaticallyIgnoredLegacyArchs = (!hasExcludeArchsOptions && hasModernArchsOnlyEnabled) ? ['web.browser.legacy', 'web.cordova'] : [];
       if (hasExcludeArchsOptions || automaticallyIgnoredLegacyArchs.length) {

From f0a747d5956cdc42dff5ea91b0e7077326eb89e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 18:15:10 +0200
Subject: [PATCH 167/264] fix tests

---
 tools/cli/commands.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 1f6a525daa..5322a5dad0 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -580,7 +580,6 @@ async function doRunCommand(options) {
   webArchs = filterWebArchs(webArchs, options['exclude-archs'], options.appDir, options);
   // Set the webArchs to include for compilation later
   global.includedWebArchs = webArchs;
-  global.modernWatcher = isModernWatcherEnabled(options.appDir);
 
   const buildMode = options.production ? 'production' : 'development';
 
@@ -1481,7 +1480,6 @@ on an OS X system.");
       ...options,
       platforms: projectContext.platformList.getPlatforms(),
     });
-    global.modernWatcher = isModernWatcherEnabled(options.appDir);
   }
 
   var buildDir = projectContext.getProjectLocalDirectory('build_tar');
@@ -2552,7 +2550,6 @@ var runTestAppForPackages = async function (projectContext, options) {
   buildOptions.webArchs = filterWebArchs(webArchs, options['exclude-archs'], projectContext.appDirectory, options);
   // Set the webArchs to include for compilation later
   global.includedWebArchs = buildOptions.webArchs;
-  global.modernWatcher = isModernWatcherEnabled(projectContext.appDirectory);
 
   if (options.deploy) {
     // Run the constraint solver and build local packages.

From ca65e01cacc5f93208e990a0cebb0d0fd7a08a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 3 May 2025 08:42:22 +0200
Subject: [PATCH 168/264] add currentCommand context

---
 tools/cli/main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index a6742e3d08..6888765ad9 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -1544,6 +1544,9 @@ makeGlobalAsyncLocalStorage().run({}, async function () {
       });
     }
 
+    // Set the currentCommand in the global object to spread context
+    global.currentCommand = { name: command.name, options };
+
     var ret = await command.func(options, { rawOptions });
 
   } catch (e) {

From 7c189700d50c45d8f3b8617b2809bd7e70ba3a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 3 May 2025 08:53:22 +0200
Subject: [PATCH 169/264] add METEOR_FORCE_INCLUDE_ARCHS and
 METEOR_FORCE_EXCLUDE_ARCHS envs to custom handling

---
 tools/cli/commands.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 5322a5dad0..2563973998 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -332,9 +332,21 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
         const excludeArchs = [...excludeArchsOptions, ...automaticallyIgnoredLegacyArchs];
         webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
       }
-      return webArchs;
     }
   }
+
+  const forcedInclArchs = process.env.METEOR_FORCE_INCLUDE_ARCHS;
+  if (forcedInclArchs != null) {
+    const nextInclArchs = forcedInclArchs.trim().split(/\s*,\s*/);
+    webArchs = Array.from(new Set([...webArchs, ...nextInclArchs]));
+  }
+
+  const forcedExclArchs = process.env.METEOR_FORCE_EXCLUDE_ARCHS;
+  if (forcedExclArchs != null) {
+    const nextExclArchs = forcedExclArchs.trim().split(/\s*,\s*/);
+    webArchs = webArchs.filter(_webArch => !nextExclArchs.includes(_webArch));
+  }
+
   return webArchs;
 }
 

From 2dfcde49f57355f8b00a6a889bc5dc1954d4f01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sat, 3 May 2025 09:07:20 +0200
Subject: [PATCH 170/264] add METEOR_CORDOVA_DISABLE env

---
 tools/cli/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 2563973998..5cae318e1f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -596,7 +596,8 @@ async function doRunCommand(options) {
   const buildMode = options.production ? 'production' : 'development';
 
   let cordovaRunner;
-  if (!_.isEmpty(runTargets)) {
+  const shouldDisableCordova =  Boolean(JSON.parse(process.env.METEOR_CORDOVA_DISABLE || 'false'));
+  if (!shouldDisableCordova && !_.isEmpty(runTargets)) {
 
     async function prepareCordovaProject() {
       import { CordovaProject } from '../cordova/project.js';

From ef72206ab1b2cf7ec3fbb3b4b4b6a5a97a8996f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 5 May 2025 12:31:33 +0200
Subject: [PATCH 171/264] add self-test for the modern build stack

---
 packages/babel-compiler/babel-compiler.js     |    4 +-
 tools/fs/safe-watcher-legacy.ts               |    2 +-
 tools/fs/safe-watcher.ts                      |   20 +-
 tools/tests/apps/modern/.gitignore            |    1 +
 .../apps/modern/.meteor/.finished-upgraders   |   19 +
 tools/tests/apps/modern/.meteor/.gitignore    |    1 +
 tools/tests/apps/modern/.meteor/.id           |    7 +
 tools/tests/apps/modern/.meteor/packages      |   15 +
 tools/tests/apps/modern/.meteor/platforms     |    2 +
 tools/tests/apps/modern/.meteor/release       |    1 +
 tools/tests/apps/modern/.meteor/versions      |   39 +
 tools/tests/apps/modern/client/main.css       |    4 +
 tools/tests/apps/modern/client/main.html      |   21 +
 tools/tests/apps/modern/client/main.js        |    1 +
 tools/tests/apps/modern/package-lock.json     | 1119 +++++++++++++++++
 tools/tests/apps/modern/package.json          |   19 +
 tools/tests/apps/modern/server/main.js        |    3 +
 tools/tests/apps/modern/tests/main.js         |    0
 tools/tests/modern.js                         |  236 ++++
 tools/tool-testing/run.js                     |   14 +
 20 files changed, 1519 insertions(+), 9 deletions(-)
 create mode 100644 tools/tests/apps/modern/.gitignore
 create mode 100644 tools/tests/apps/modern/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/modern/.meteor/.gitignore
 create mode 100644 tools/tests/apps/modern/.meteor/.id
 create mode 100644 tools/tests/apps/modern/.meteor/packages
 create mode 100644 tools/tests/apps/modern/.meteor/platforms
 create mode 100644 tools/tests/apps/modern/.meteor/release
 create mode 100644 tools/tests/apps/modern/.meteor/versions
 create mode 100644 tools/tests/apps/modern/client/main.css
 create mode 100644 tools/tests/apps/modern/client/main.html
 create mode 100644 tools/tests/apps/modern/client/main.js
 create mode 100644 tools/tests/apps/modern/package-lock.json
 create mode 100644 tools/tests/apps/modern/package.json
 create mode 100644 tools/tests/apps/modern/server/main.js
 create mode 100644 tools/tests/apps/modern/tests/main.js
 create mode 100644 tools/tests/modern.js

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index aaec42177c..9341fa9c52 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -909,8 +909,10 @@ function isExcludedConfig(name, excludeList = [], startsWith) {
   });
 }
 
+const disableTextColors = Boolean(JSON.parse(process.env.METEOR_DISABLE_COLORS || "false"));
+
 function color(text, code) {
-  return `\x1b[${code}m${text}\x1b[0m`;
+  return disableTextColors ? text : `\x1b[${code}m${text}\x1b[0m`;
 }
 
 function logTranspilation({
diff --git a/tools/fs/safe-watcher-legacy.ts b/tools/fs/safe-watcher-legacy.ts
index f5461f4965..f9f108afc8 100644
--- a/tools/fs/safe-watcher-legacy.ts
+++ b/tools/fs/safe-watcher-legacy.ts
@@ -405,7 +405,7 @@ function maybeSuggestRaisingWatchLimit(error: Error & { errno: number }) {
 }
 
 export const watch = Profile(
-    "safeWatcher.watch",
+    "safeWatcher.watchLegacy",
     (absPath: string, callback: EntryCallback) => {
         const entry = acquireWatcher(absPath, callback);
         return {
diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index fbb7d432f2..3e9bda0ab4 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -375,17 +375,23 @@ function startNewEntry(absPath: string): Entry {
  * This registers the callback on the internally managed entry and
  * ensures that a Parcel watcher is subscribed to a covering directory.
  */
-export const watch = Profile(
-    "safeWatcher.watch",
+export function watch (absPath: string, callback: ChangeCallback): SafeWatcher {
+  // @ts-ignore
+  if (!global.modernWatcher) {
+    // @ts-ignore
+    return watchLegacy(absPath, callback);
+  }
+  // @ts-ignore
+  return watchModern(absPath, callback);
+};
+
+const watchModern =
+    Profile(
+    "safeWatcher.watchModern",
     (
     absPath: string,
     callback: ChangeCallback
     ): SafeWatcher => {
-      // @ts-ignore
-      if (!global.modernWatcher) {
-        // @ts-ignore
-        return watchLegacy(absPath, callback);
-      }
       absPath = toPosixPath(absPath);
 
       // If the path should be ignored, immediately return a noop SafeWatcher.
diff --git a/tools/tests/apps/modern/.gitignore b/tools/tests/apps/modern/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/tests/apps/modern/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/tests/apps/modern/.meteor/.finished-upgraders b/tools/tests/apps/modern/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/tools/tests/apps/modern/.meteor/.gitignore b/tools/tests/apps/modern/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/modern/.meteor/.id b/tools/tests/apps/modern/.meteor/.id
new file mode 100644
index 0000000000..b92c6c71e9
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+xh4qomttjyd.znxg6je45aan
diff --git a/tools/tests/apps/modern/.meteor/packages b/tools/tests/apps/modern/.meteor/packages
new file mode 100644
index 0000000000..341bbfc93a
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/packages
@@ -0,0 +1,15 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor                  # Shared foundation for all Meteor packages
+static-html             # Define static page content in .html files
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+webapp                  # Serves a Meteor app over HTTP
+server-render           # Support for server-side rendering
diff --git a/tools/tests/apps/modern/.meteor/platforms b/tools/tests/apps/modern/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/modern/.meteor/release b/tools/tests/apps/modern/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/modern/.meteor/versions b/tools/tests/apps/modern/.meteor/versions
new file mode 100644
index 0000000000..91b9af05b0
--- /dev/null
+++ b/tools/tests/apps/modern/.meteor/versions
@@ -0,0 +1,39 @@
+babel-compiler@7.2.4
+babel-runtime@1.3.0
+base64@1.0.11
+blaze-tools@1.0.10
+boilerplate-generator@1.6.0
+caching-compiler@1.2.1
+caching-html-compiler@1.1.3
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+es5-shim@4.8.0
+fetch@0.1.0
+html-tools@1.0.11
+htmljs@1.0.11
+inter-process-messaging@0.1.0
+logging@1.1.20
+meteor@1.9.3
+minifier-css@1.4.1
+minifier-js@2.4.0
+modern-browsers@0.1.4-beta181.16
+modules@0.13.0
+modules-runtime@0.10.3
+promise@0.11.2
+random@1.1.0
+routepolicy@1.1.0
+server-render@0.3.1
+shell-server@0.4.0
+spacebars-compiler@1.1.3
+standard-minifier-css@1.5.2
+standard-minifier-js@2.4.0
+static-html@1.2.2
+templating-tools@1.1.2
+tracker@1.2.1
+underscore@1.0.11
+webapp@1.7.3-beta181.16
+webapp-hashing@1.0.9
diff --git a/tools/tests/apps/modern/client/main.css b/tools/tests/apps/modern/client/main.css
new file mode 100644
index 0000000000..7f354f0fa7
--- /dev/null
+++ b/tools/tests/apps/modern/client/main.css
@@ -0,0 +1,4 @@
+body {
+  padding: 10px;
+  font-family: sans-serif;
+}
diff --git a/tools/tests/apps/modern/client/main.html b/tools/tests/apps/modern/client/main.html
new file mode 100644
index 0000000000..19789db4de
--- /dev/null
+++ b/tools/tests/apps/modern/client/main.html
@@ -0,0 +1,21 @@
+<head>
+  <title>Minimal Meteor app</title>
+</head>
+
+<body>
+  <h1>Minimal Meteor app</h1>
+  <p>
+    This Meteor app uses as few Meteor packages as possible, to keep the
+    client JavaScript bundle as small as possible.
+  </p>
+
+  <em id="server-render-target"></em>
+
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li><a href="https://www.meteor.com/try" target="_blank">Do the Tutorial</a></li>
+    <li><a href="http://guide.meteor.com" target="_blank">Follow the Guide</a></li>
+    <li><a href="https://docs.meteor.com" target="_blank">Read the Docs</a></li>
+    <li><a href="https://forums.meteor.com" target="_blank">Discussions</a></li>
+  </ul>
+</body>
diff --git a/tools/tests/apps/modern/client/main.js b/tools/tests/apps/modern/client/main.js
new file mode 100644
index 0000000000..ce4d5b3750
--- /dev/null
+++ b/tools/tests/apps/modern/client/main.js
@@ -0,0 +1 @@
+Meteor.startup(() => {});
diff --git a/tools/tests/apps/modern/package-lock.json b/tools/tests/apps/modern/package-lock.json
new file mode 100644
index 0000000000..b21affb1c2
--- /dev/null
+++ b/tools/tests/apps/modern/package-lock.json
@@ -0,0 +1,1119 @@
+{
+  "name": "modern",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
+      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+      "requires": {
+        "regenerator-runtime": "^0.14.0"
+      }
+    },
+    "@types/mime-types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
+      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM="
+    },
+    "agent-base": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "extract-zip": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "requires": {
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "requires": {
+        "agent-base": "5",
+        "debug": "4"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "meteor-node-stubs": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.9.tgz",
+      "integrity": "sha512-EKRezc1/PblYtYiK4BOT3h5geWDo9AFBBSYNamPNh8AC5msUbVCcg8kekzAa7r7JPzBX8nZWaXEQVar4t8q/Hg==",
+      "requires": {
+        "@meteorjs/crypto-browserify": "^3.12.1",
+        "assert": "^2.1.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "domain-browser": "^4.23.0",
+        "elliptic": "^6.5.4",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.2",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.3",
+        "util": "^0.12.5",
+        "vm-browserify": "^1.1.2"
+      },
+      "dependencies": {
+        "@meteorjs/crypto-browserify": {
+          "version": "3.12.1",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.1",
+            "browserify-sign": "^4.2.3",
+            "create-ecdh": "^4.0.4",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "diffie-hellman": "^5.0.3",
+            "hash-base": "~3.0.4",
+            "inherits": "^2.0.4",
+            "pbkdf2": "^3.1.2",
+            "public-encrypt": "^4.0.3",
+            "randombytes": "^2.1.0",
+            "randomfill": "^1.0.4"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
+          }
+        },
+        "asn1.js": {
+          "version": "4.10.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "assert": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "is-nan": "^1.3.2",
+            "object-is": "^1.1.5",
+            "object.assign": "^4.1.4",
+            "util": "^0.12.5"
+          }
+        },
+        "available-typed-arrays": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "bn.js": {
+          "version": "5.2.0",
+          "bundled": true
+        },
+        "brorand": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "browserify-aes": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "browserify-cipher": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
+          }
+        },
+        "browserify-des": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "browserify-rsa": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.0.0",
+            "randombytes": "^2.0.1"
+          }
+        },
+        "browserify-sign": {
+          "version": "4.2.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.2.1",
+            "browserify-rsa": "^4.1.0",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "elliptic": "^6.5.5",
+            "hash-base": "~3.0",
+            "inherits": "^2.0.4",
+            "parse-asn1": "^5.1.7",
+            "readable-stream": "^2.3.8",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "5.2.1",
+              "bundled": true
+            },
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.8",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2",
+                  "bundled": true
+                }
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2",
+                  "bundled": true
+                }
+              }
+            }
+          }
+        },
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "bundled": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-xor": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "builtin-status-codes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "call-bind": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.1",
+            "set-function-length": "^1.1.1"
+          }
+        },
+        "cipher-base": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "console-browserify": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "constants-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "create-ecdh": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.5.3"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "create-hash": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
+          }
+        },
+        "create-hmac": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "define-data-property": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
+          }
+        },
+        "define-properties": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "define-data-property": "^1.0.1",
+            "has-property-descriptors": "^1.0.0",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "des.js": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          }
+        },
+        "diffie-hellman": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "domain-browser": {
+          "version": "4.23.0",
+          "bundled": true
+        },
+        "elliptic": {
+          "version": "6.5.5",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.11.9",
+            "brorand": "^1.1.0",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.1",
+            "inherits": "^2.0.4",
+            "minimalistic-assert": "^1.0.1",
+            "minimalistic-crypto-utils": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "events": {
+          "version": "3.3.0",
+          "bundled": true
+        },
+        "evp_bytestokey": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "for-each": {
+          "version": "0.3.3",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.3"
+          }
+        },
+        "function-bind": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "get-intrinsic": {
+          "version": "1.2.2",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "gopd": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.1.3"
+          }
+        },
+        "has-property-descriptors": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.2.2"
+          }
+        },
+        "has-proto": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "has-tostringtag": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "hash-base": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "hash.js": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.1"
+          }
+        },
+        "hasown": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2"
+          }
+        },
+        "hmac-drbg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
+          }
+        },
+        "https-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "is-arguments": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.7",
+          "bundled": true
+        },
+        "is-generator-function": {
+          "version": "1.0.10",
+          "bundled": true,
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-nan": {
+          "version": "1.3.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "is-typed-array": {
+          "version": "1.1.12",
+          "bundled": true,
+          "requires": {
+            "which-typed-array": "^1.1.11"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "md5.js": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "miller-rabin": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "minimalistic-assert": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "minimalistic-crypto-utils": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-inspect": {
+          "version": "1.13.1",
+          "bundled": true
+        },
+        "object-is": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "object-keys": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "object.assign": {
+          "version": "4.1.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "has-symbols": "^1.0.3",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "os-browserify": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "pako": {
+          "version": "1.0.11",
+          "bundled": true
+        },
+        "parse-asn1": {
+          "version": "5.1.7",
+          "bundled": true,
+          "requires": {
+            "asn1.js": "^4.10.1",
+            "browserify-aes": "^1.2.0",
+            "evp_bytestokey": "^1.0.3",
+            "hash-base": "~3.0",
+            "pbkdf2": "^3.1.2",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
+          }
+        },
+        "path-browserify": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pbkdf2": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "process": {
+          "version": "0.11.10",
+          "bundled": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "public-encrypt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "qs": {
+          "version": "6.11.2",
+          "bundled": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "querystring-es3": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "randombytes": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "randomfill": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.2",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ripemd160": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "bundled": true
+        },
+        "set-function-length": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "define-data-property": "^1.1.1",
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "sha.js": {
+          "version": "2.4.11",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "side-channel": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "get-intrinsic": "^1.0.2",
+            "object-inspect": "^1.9.0"
+          }
+        },
+        "stream-browserify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "~2.0.4",
+            "readable-stream": "^3.5.0"
+          }
+        },
+        "stream-http": {
+          "version": "3.2.0",
+          "bundled": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "timers-browserify": {
+          "version": "2.0.12",
+          "bundled": true,
+          "requires": {
+            "setimmediate": "^1.0.4"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "url": {
+          "version": "0.11.3",
+          "bundled": true,
+          "requires": {
+            "punycode": "^1.4.1",
+            "qs": "^6.11.2"
+          }
+        },
+        "util": {
+          "version": "0.12.5",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "is-arguments": "^1.0.4",
+            "is-generator-function": "^1.0.7",
+            "is-typed-array": "^1.1.3",
+            "which-typed-array": "^1.1.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "vm-browserify": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "which-typed-array": {
+          "version": "1.1.13",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.5",
+            "call-bind": "^1.0.4",
+            "for-each": "^0.3.3",
+            "gopd": "^1.0.1",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "mime": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "puppeteer": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
+      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
+      "requires": {
+        "@types/mime-types": "^2.1.0",
+        "debug": "^4.1.0",
+        "extract-zip": "^1.6.6",
+        "https-proxy-agent": "^4.0.0",
+        "mime": "^2.0.3",
+        "mime-types": "^2.1.25",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^2.6.1",
+        "ws": "^6.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "ws": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  }
+}
diff --git a/tools/tests/apps/modern/package.json b/tools/tests/apps/modern/package.json
new file mode 100644
index 0000000000..a7fe68949f
--- /dev/null
+++ b/tools/tests/apps/modern/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "modern",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.23.5",
+    "meteor-node-stubs": "^1.2.12",
+    "react": "^18.3.1"
+  },
+  "meteor": {
+    "mainModule": {
+      "client": "client/main.js",
+      "server": "server/main.js"
+    },
+    "testModule": "tests/main.js"
+  }
+}
diff --git a/tools/tests/apps/modern/server/main.js b/tools/tests/apps/modern/server/main.js
new file mode 100644
index 0000000000..3ce3d20aab
--- /dev/null
+++ b/tools/tests/apps/modern/server/main.js
@@ -0,0 +1,3 @@
+import { Meteor } from "meteor/meteor";
+
+Meteor.startup(() => {});
diff --git a/tools/tests/apps/modern/tests/main.js b/tools/tests/apps/modern/tests/main.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
new file mode 100644
index 0000000000..e5960e449e
--- /dev/null
+++ b/tools/tests/modern.js
@@ -0,0 +1,236 @@
+var selftest = require('../tool-testing/selftest.js');
+var Sandbox = selftest.Sandbox;
+
+const waitToStart = 10;
+
+async function writeModernConfig(s, modernConfig) {
+  const json = JSON.parse(s.read("package.json"));
+
+  json.meteor = {
+    ...json.meteor,
+    modern: modernConfig,
+  };
+
+  s.write("package.json", JSON.stringify(json, null, 2) + "\n");
+
+}
+
+selftest.define("legacy build stack", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+
+  await writeModernConfig(s, false);
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* check legacy stack */
+  await run.matchAsync(/Babel\.compile/, false, true);
+  await run.matchAsync(/safeWatcher\.watchLegacy/, false, true);
+  await run.matchAsync(/_findSources for web\.browser.legacy/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+  
+  await writeModernConfig(s, true);
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* check modern stack */
+  await run.matchAsync(/SWC\.compile/, false, true);
+  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
+  await run.matchAsync(/_findSources for web\.browser/, false, true);
+
+  run.forbid(/Babel\.compile/, false, true);
+  run.forbid(/_findSources for web\.browser\.legacy/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack - disable transpiler", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+
+  await writeModernConfig(s, { transpiler: false });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* disable transpiler */
+  run.forbid(/SWC\.compile/, false, true);
+  await run.matchAsync(/Babel\.compile/, false, true);
+
+  /* Keep rest of modern build stack */
+  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
+  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  run.forbid(/_findSources for web\.browser\.legacy/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack - disable watcher", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+
+  await writeModernConfig(s, { watcher: false });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* disable watcher */
+  run.forbid(/safeWatcher\.watchModern/, false, true);
+  await run.matchAsync(/safeWatcher\.watchLegacy/, false, true);
+
+  /* Keep rest of modern build stack */
+  await run.matchAsync(/SWC\.compile/, false, true);
+  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  run.forbid(/_findSources for web\.browser\.legacy/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack - disable webArchOnly", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+
+  await writeModernConfig(s, { webArchOnly: false });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* disable webArchOnly */
+  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  await run.matchAsync(/_findSources for web\.browser\.legacy/, false, true);
+
+  /* Keep rest of modern build stack */
+  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
+  await run.matchAsync(/SWC\.compile/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack - transpiler boolean-like options", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  process.env.METEOR_DISABLE_COLORS = true;
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+    },
+  });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* check transpiler options */
+  await run.matchAsync(/\[Transpiler] Used SWC.*\(app\)/, false, true);
+  await run.matchAsync(/\[Transpiler] Used SWC.*\(package\)/, false, true);
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+      excludeApp: true,
+    },
+  });
+  await run.matchAsync(/\[Transpiler] Used Babel.*\(app\)/, false, true);
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+      excludePackages: true,
+    },
+  });
+  await run.matchAsync(/\[Transpiler] Used Babel.*\(package\)/, false, true);
+
+  await run.stop();
+});
+
+selftest.define("modern build stack - transpiler string-like options", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  process.env.METEOR_DISABLE_COLORS = true;
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+    },
+  });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* check transpiler options */
+  await run.matchAsync(/\[Transpiler] Used SWC.*\(app\)/, false, true);
+  await run.matchAsync(/\[Transpiler] Used SWC.*\(package\)/, false, true);
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+      excludeApp: ['main.js'],
+    },
+  });
+  await run.matchAsync(/\[Transpiler] Used Babel.*\(app\)/, false, true);
+
+  await writeModernConfig(s, {
+    transpiler: {
+      verbose: true,
+      excludePackages: ['ejson'],
+    },
+  });
+  await run.matchAsync(/\[Transpiler] Used Babel.*\(package\)/, false, true);
+
+  await run.stop();
+});
diff --git a/tools/tool-testing/run.js b/tools/tool-testing/run.js
index b15df2db70..65488ff93a 100644
--- a/tools/tool-testing/run.js
+++ b/tools/tool-testing/run.js
@@ -194,6 +194,20 @@ export default class Run {
     return this.stdoutMatcher.match(pattern, timeout, _strict);
   }
 
+  async matchAsync(pattern, _strict, fullBuffer) {
+    this._ensureStarted();
+
+    let timeout = this.baseTimeout + this.extraTime;
+    timeout *= timeoutScaleFactor;
+    this.extraTime = 0;
+    Console.simpleDebug('matchAsync', pattern);
+    return this.stdoutMatcher.matchAsync(pattern, {
+      timeout,
+      strict: _strict,
+      matchFullBuffer: fullBuffer,
+    });
+  }
+
   getMatcherFullBuffer() {
     return this.stdoutMatcher.getFullBuffer();
   }

From a286d1cca16ee2d4812e24f0fbc619db14eba02b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 5 May 2025 15:05:58 +0200
Subject: [PATCH 172/264] adjust waitToStart

---
 tools/tests/modern.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index e5960e449e..a928b23ae1 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -1,7 +1,8 @@
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
 
-const waitToStart = 10;
+// No need for a high value since the asserts already wait long enough to pass tests
+const waitToStart = 5;
 
 async function writeModernConfig(s, modernConfig) {
   const json = JSON.parse(s.read("package.json"));

From c957ae5e669e488763ed0f89fb2d1ee9778dbee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 5 May 2025 16:23:57 +0200
Subject: [PATCH 173/264] refactor

---
 tools/tests/modern.js     | 48 +++++++++++++++++++--------------------
 tools/tool-testing/run.js | 23 +++++++------------
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index a928b23ae1..c49ef97294 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -33,9 +33,9 @@ selftest.define("legacy build stack", async function () {
   await run.match("App running at");
 
   /* check legacy stack */
-  await run.matchAsync(/Babel\.compile/, false, true);
-  await run.matchAsync(/safeWatcher\.watchLegacy/, false, true);
-  await run.matchAsync(/_findSources for web\.browser.legacy/, false, true);
+  await run.match(/Babel\.compile/, false, true);
+  await run.match(/safeWatcher\.watchLegacy/, false, true);
+  await run.match(/_findSources for web\.browser.legacy/, false, true);
 
   await run.stop();
 });
@@ -57,9 +57,9 @@ selftest.define("modern build stack", async function () {
   await run.match("App running at");
 
   /* check modern stack */
-  await run.matchAsync(/SWC\.compile/, false, true);
-  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
-  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  await run.match(/SWC\.compile/, false, true);
+  await run.match(/safeWatcher\.watchModern/, false, true);
+  await run.match(/_findSources for web\.browser/, false, true);
 
   run.forbid(/Babel\.compile/, false, true);
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
@@ -85,11 +85,11 @@ selftest.define("modern build stack - disable transpiler", async function () {
 
   /* disable transpiler */
   run.forbid(/SWC\.compile/, false, true);
-  await run.matchAsync(/Babel\.compile/, false, true);
+  await run.match(/Babel\.compile/, false, true);
 
   /* Keep rest of modern build stack */
-  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
-  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  await run.match(/safeWatcher\.watchModern/, false, true);
+  await run.match(/_findSources for web\.browser/, false, true);
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
 
   await run.stop();
@@ -113,11 +113,11 @@ selftest.define("modern build stack - disable watcher", async function () {
 
   /* disable watcher */
   run.forbid(/safeWatcher\.watchModern/, false, true);
-  await run.matchAsync(/safeWatcher\.watchLegacy/, false, true);
+  await run.match(/safeWatcher\.watchLegacy/, false, true);
 
   /* Keep rest of modern build stack */
-  await run.matchAsync(/SWC\.compile/, false, true);
-  await run.matchAsync(/_findSources for web\.browser/, false, true);
+  await run.match(/SWC\.compile/, false, true);
+  await run.match(/_findSources for web\.browser/, false, true);
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
 
   await run.stop();
@@ -140,12 +140,12 @@ selftest.define("modern build stack - disable webArchOnly", async function () {
   await run.match("App running at");
 
   /* disable webArchOnly */
-  await run.matchAsync(/_findSources for web\.browser/, false, true);
-  await run.matchAsync(/_findSources for web\.browser\.legacy/, false, true);
+  await run.match(/_findSources for web\.browser/, false, true);
+  await run.match(/_findSources for web\.browser\.legacy/, false, true);
 
   /* Keep rest of modern build stack */
-  await run.matchAsync(/safeWatcher\.watchModern/, false, true);
-  await run.matchAsync(/SWC\.compile/, false, true);
+  await run.match(/safeWatcher\.watchModern/, false, true);
+  await run.match(/SWC\.compile/, false, true);
 
   await run.stop();
 });
@@ -171,8 +171,8 @@ selftest.define("modern build stack - transpiler boolean-like options", async fu
   await run.match("App running at");
 
   /* check transpiler options */
-  await run.matchAsync(/\[Transpiler] Used SWC.*\(app\)/, false, true);
-  await run.matchAsync(/\[Transpiler] Used SWC.*\(package\)/, false, true);
+  await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
+  await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);
 
   await writeModernConfig(s, {
     transpiler: {
@@ -180,7 +180,7 @@ selftest.define("modern build stack - transpiler boolean-like options", async fu
       excludeApp: true,
     },
   });
-  await run.matchAsync(/\[Transpiler] Used Babel.*\(app\)/, false, true);
+  await run.match(/\[Transpiler] Used Babel.*\(app\)/, false, true);
 
   await writeModernConfig(s, {
     transpiler: {
@@ -188,7 +188,7 @@ selftest.define("modern build stack - transpiler boolean-like options", async fu
       excludePackages: true,
     },
   });
-  await run.matchAsync(/\[Transpiler] Used Babel.*\(package\)/, false, true);
+  await run.match(/\[Transpiler] Used Babel.*\(package\)/, false, true);
 
   await run.stop();
 });
@@ -214,8 +214,8 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   await run.match("App running at");
 
   /* check transpiler options */
-  await run.matchAsync(/\[Transpiler] Used SWC.*\(app\)/, false, true);
-  await run.matchAsync(/\[Transpiler] Used SWC.*\(package\)/, false, true);
+  await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
+  await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);
 
   await writeModernConfig(s, {
     transpiler: {
@@ -223,7 +223,7 @@ selftest.define("modern build stack - transpiler string-like options", async fun
       excludeApp: ['main.js'],
     },
   });
-  await run.matchAsync(/\[Transpiler] Used Babel.*\(app\)/, false, true);
+  await run.match(/\[Transpiler] Used Babel.*\(app\)/, false, true);
 
   await writeModernConfig(s, {
     transpiler: {
@@ -231,7 +231,7 @@ selftest.define("modern build stack - transpiler string-like options", async fun
       excludePackages: ['ejson'],
     },
   });
-  await run.matchAsync(/\[Transpiler] Used Babel.*\(package\)/, false, true);
+  await run.match(/\[Transpiler] Used Babel.*\(package\)/, false, true);
 
   await run.stop();
 });
diff --git a/tools/tool-testing/run.js b/tools/tool-testing/run.js
index 65488ff93a..3d05b1001d 100644
--- a/tools/tool-testing/run.js
+++ b/tools/tool-testing/run.js
@@ -184,30 +184,23 @@ export default class Run {
   // may be a regular expression or a string. Consume stdout up to
   // that point. If this pattern does not appear after a timeout (or
   // the program exits before emitting the pattern), fail.
-  match(pattern, _strict) {
+  match(pattern, _strict, fullBuffer) {
     this._ensureStarted();
 
     let timeout = this.baseTimeout + this.extraTime;
     timeout *= timeoutScaleFactor;
     this.extraTime = 0;
     Console.simpleDebug('match', pattern);
+    if (fullBuffer) {
+      return this.stdoutMatcher.matchAsync(pattern, {
+        timeout,
+        strict: _strict,
+        matchFullBuffer: fullBuffer,
+      });
+    }
     return this.stdoutMatcher.match(pattern, timeout, _strict);
   }
 
-  async matchAsync(pattern, _strict, fullBuffer) {
-    this._ensureStarted();
-
-    let timeout = this.baseTimeout + this.extraTime;
-    timeout *= timeoutScaleFactor;
-    this.extraTime = 0;
-    Console.simpleDebug('matchAsync', pattern);
-    return this.stdoutMatcher.matchAsync(pattern, {
-      timeout,
-      strict: _strict,
-      matchFullBuffer: fullBuffer,
-    });
-  }
-
   getMatcherFullBuffer() {
     return this.stdoutMatcher.getFullBuffer();
   }

From 03080cfb23e6117ea59a226cb5254e8620e68a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 5 May 2025 16:32:21 +0200
Subject: [PATCH 174/264] resolve custom baseUrl to an absolute path pointing
 to the project root

---
 packages/babel-compiler/babel-compiler.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index aaec42177c..9824821746 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -153,6 +153,11 @@ BCp.initializeMeteorAppSwcrc = function () {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
     lastModifiedSwcConfig = getMeteorAppSwcrc();
 
+    // Resolve custom baseUrl to an absolute path pointing to the project root
+    if (lastModifiedSwcConfig.jsc && lastModifiedSwcConfig.jsc.baseUrl) {
+      lastModifiedSwcConfig.jsc.baseUrl = path.resolve(process.cwd(), lastModifiedSwcConfig.jsc.baseUrl);
+    }
+
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('SWC Config', lastModifiedSwcConfig);
     }

From e2ed9426f220ecb94ffd70b4bd8b3c3a44334157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 16:25:06 +0200
Subject: [PATCH 175/264] test debug scenario on legacy and modern build stack

---
 tools/tests/apps/modern/server/main.js | 7 +++++++
 tools/tests/modern.js                  | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/tools/tests/apps/modern/server/main.js b/tools/tests/apps/modern/server/main.js
index 3ce3d20aab..12ffcf4012 100644
--- a/tools/tests/apps/modern/server/main.js
+++ b/tools/tests/apps/modern/server/main.js
@@ -1,3 +1,10 @@
 import { Meteor } from "meteor/meteor";
 
 Meteor.startup(() => {});
+
+try {
+  const errorStack = new Error().stack;
+  console.log(errorStack);
+} catch (e) {
+  console.log(e);
+}
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index c49ef97294..189b1d01df 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -37,6 +37,9 @@ selftest.define("legacy build stack", async function () {
   await run.match(/safeWatcher\.watchLegacy/, false, true);
   await run.match(/_findSources for web\.browser.legacy/, false, true);
 
+  /* check debug stack */
+  await run.match(/server\/main\.js:6:22/, false, true);
+
   await run.stop();
 });
 
@@ -64,6 +67,9 @@ selftest.define("modern build stack", async function () {
   run.forbid(/Babel\.compile/, false, true);
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
 
+  /* check debug stack */
+  await run.match(/server\/main\.js:6:22/, false, true);
+
   await run.stop();
 });
 

From 452f6c01e3cfe2eda3cefd3884192b28462d80aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 16:55:17 +0200
Subject: [PATCH 176/264] test custom .swcrc and aliases

---
 tools/tests/apps/modern/.swcrc           |  8 +++++
 tools/tests/apps/modern/server/alias.js  |  1 +
 tools/tests/apps/modern/swcAlias/main.js |  1 +
 tools/tests/modern.js                    | 43 ++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 tools/tests/apps/modern/.swcrc
 create mode 100644 tools/tests/apps/modern/server/alias.js
 create mode 100644 tools/tests/apps/modern/swcAlias/main.js

diff --git a/tools/tests/apps/modern/.swcrc b/tools/tests/apps/modern/.swcrc
new file mode 100644
index 0000000000..e859928b67
--- /dev/null
+++ b/tools/tests/apps/modern/.swcrc
@@ -0,0 +1,8 @@
+{
+    "jsc": {
+        "baseUrl": "./",
+        "paths": {
+            "@swcAlias/*": ["swcAlias/*"]
+        }
+    }
+}
diff --git a/tools/tests/apps/modern/server/alias.js b/tools/tests/apps/modern/server/alias.js
new file mode 100644
index 0000000000..acf0a92d2a
--- /dev/null
+++ b/tools/tests/apps/modern/server/alias.js
@@ -0,0 +1 @@
+import '@swcAlias/main';
diff --git a/tools/tests/apps/modern/swcAlias/main.js b/tools/tests/apps/modern/swcAlias/main.js
new file mode 100644
index 0000000000..65ebe218b3
--- /dev/null
+++ b/tools/tests/apps/modern/swcAlias/main.js
@@ -0,0 +1 @@
+console.log('swcAlias/main.js alias resolved');
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 189b1d01df..6781d9cf85 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -70,6 +70,9 @@ selftest.define("modern build stack", async function () {
   /* check debug stack */
   await run.match(/server\/main\.js:6:22/, false, true);
 
+  // /* custom .swcrc and alias resolution */
+  // await run.match(/alias resolved/, false, true);
+
   await run.stop();
 });
 
@@ -219,6 +222,9 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   run.waitSecs(waitToStart);
   await run.match("App running at");
 
+  /* custom .swcrc and alias resolution */
+  await run.match(/alias resolved/, false, true);
+
   /* check transpiler options */
   await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
   await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);
@@ -241,3 +247,40 @@ selftest.define("modern build stack - transpiler string-like options", async fun
 
   await run.stop();
 });
+
+async function writConfig(s, config) {
+  const json = JSON.parse(s.read("package.json"));
+
+  json.meteor = {
+    ...json.meteor,
+    ...config,
+  };
+
+  s.write("package.json", JSON.stringify(json, null, 2) + "\n");
+}
+
+selftest.define("modern build stack - transpiler custom .swcrc", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/alias.js',
+    },
+  });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* custom .swcrc and alias resolution */
+  await run.match(/alias resolved/, false, true);
+
+  await run.stop();
+});

From 8afbc06b52fd00beb81330eef058eb40b894f1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 16:58:45 +0200
Subject: [PATCH 177/264] test custom .swcrc and aliases

---
 tools/tests/modern.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 6781d9cf85..2e92abb335 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -70,9 +70,6 @@ selftest.define("modern build stack", async function () {
   /* check debug stack */
   await run.match(/server\/main\.js:6:22/, false, true);
 
-  // /* custom .swcrc and alias resolution */
-  // await run.match(/alias resolved/, false, true);
-
   await run.stop();
 });
 
@@ -222,9 +219,6 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   run.waitSecs(waitToStart);
   await run.match("App running at");
 
-  /* custom .swcrc and alias resolution */
-  await run.match(/alias resolved/, false, true);
-
   /* check transpiler options */
   await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
   await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);

From 10d2232886a7c6585b5d94195fa447453c8694cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 17:20:38 +0200
Subject: [PATCH 178/264] test custom .swcrc with component and raw files

---
 .../apps/modern/server/custom-component.js    |  5 ++
 .../modern/server/javascript-component.jsx    |  5 ++
 tools/tests/apps/modern/server/javascript.js  |  3 +
 .../modern/server/typescript-component.tsx    |  5 ++
 tools/tests/apps/modern/server/typescript.ts  |  3 +
 tools/tests/modern.js                         | 79 +++++++++++++++++++
 6 files changed, 100 insertions(+)
 create mode 100644 tools/tests/apps/modern/server/custom-component.js
 create mode 100644 tools/tests/apps/modern/server/javascript-component.jsx
 create mode 100644 tools/tests/apps/modern/server/javascript.js
 create mode 100644 tools/tests/apps/modern/server/typescript-component.tsx
 create mode 100644 tools/tests/apps/modern/server/typescript.ts

diff --git a/tools/tests/apps/modern/server/custom-component.js b/tools/tests/apps/modern/server/custom-component.js
new file mode 100644
index 0000000000..ac52d8c243
--- /dev/null
+++ b/tools/tests/apps/modern/server/custom-component.js
@@ -0,0 +1,5 @@
+import React from 'react';
+
+console.log('custom-component.js');
+
+export default <></>;
diff --git a/tools/tests/apps/modern/server/javascript-component.jsx b/tools/tests/apps/modern/server/javascript-component.jsx
new file mode 100644
index 0000000000..6b3976b857
--- /dev/null
+++ b/tools/tests/apps/modern/server/javascript-component.jsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+console.log('javascript-component.jsx');
+
+export default <></>;
diff --git a/tools/tests/apps/modern/server/javascript.js b/tools/tests/apps/modern/server/javascript.js
new file mode 100644
index 0000000000..23fb2816d6
--- /dev/null
+++ b/tools/tests/apps/modern/server/javascript.js
@@ -0,0 +1,3 @@
+console.log('javascript.js');
+
+export default {};
diff --git a/tools/tests/apps/modern/server/typescript-component.tsx b/tools/tests/apps/modern/server/typescript-component.tsx
new file mode 100644
index 0000000000..9535cc475d
--- /dev/null
+++ b/tools/tests/apps/modern/server/typescript-component.tsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+console.log('typescript-component.tsx');
+
+export default <></>;
diff --git a/tools/tests/apps/modern/server/typescript.ts b/tools/tests/apps/modern/server/typescript.ts
new file mode 100644
index 0000000000..05ed0e8932
--- /dev/null
+++ b/tools/tests/apps/modern/server/typescript.ts
@@ -0,0 +1,3 @@
+console.log('typescript.ts');
+
+export default {};
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 2e92abb335..4958fbca34 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -253,6 +253,15 @@ async function writConfig(s, config) {
   s.write("package.json", JSON.stringify(json, null, 2) + "\n");
 }
 
+async function writeSwcrcConfig(s, config) {
+  let json = JSON.parse(s.read("package.json"));
+  json = {
+    ...json,
+    ...config,
+  };
+  s.write(".swcrc", JSON.stringify(json, null, 2) + "\n");
+}
+
 selftest.define("modern build stack - transpiler custom .swcrc", async function () {
   const s = new Sandbox();
   await s.init();
@@ -278,3 +287,73 @@ selftest.define("modern build stack - transpiler custom .swcrc", async function
 
   await run.stop();
 });
+
+selftest.define("modern build stack - transpiler files", async function () {
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/javascript.js',
+    },
+  });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  await run.match(/javascript\.js/, false, true);
+
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/javascript-component.jsx',
+    },
+  });
+  await run.match(/javascript-component\.jsx/, false, true);
+
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/typescript.ts',
+    },
+  });
+  await run.match(/typescript\.ts/, false, true);
+
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/typescript-component.tsx',
+    },
+  });
+  await run.match(/typescript-component\.tsx/, false, true);
+
+  await writeSwcrcConfig(s, {
+    jsc: {
+      parser: {
+        syntax: 'typescript',
+        tsx: true,
+        jsx: true,
+      },
+    },
+  });
+  await writConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/custom-component.js',
+    },
+  });
+  await run.match(/custom-component\.js/, false, true);
+
+  await run.stop();
+});

From 71a7bfe29aee4451fa888c9ea5f5091986c47d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 17:38:40 +0200
Subject: [PATCH 179/264] change the legacy test name to run it on CI in a
 different group

---
 tools/tests/modern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 4958fbca34..946215ec84 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -16,7 +16,7 @@ async function writeModernConfig(s, modernConfig) {
 
 }
 
-selftest.define("legacy build stack", async function () {
+selftest.define("modern build stack - legacy", async function () {
   const s = new Sandbox();
   await s.init();
 

From 58f7c78682ac3a80be8f3455d6eddddf3a0a1deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 18:10:43 +0200
Subject: [PATCH 180/264] test modern build stack as part of windows

---
 scripts/windows/ci/test.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/windows/ci/test.ps1 b/scripts/windows/ci/test.ps1
index fb813d33fa..63510c2754 100644
--- a/scripts/windows/ci/test.ps1
+++ b/scripts/windows/ci/test.ps1
@@ -2,6 +2,7 @@
 $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml'
 
 $tests = @(
+  'modern build stack'
   '^assets'
   '^autoupdate'
   '^dynamic import.*development'
@@ -27,4 +28,4 @@ If ($selfTestExitCode -eq 0) {
 
 If ($selfTestExitCode -ne 0) {
   Exit $selfTestExitCode
-}
\ No newline at end of file
+}

From 344423ab6e1fe8e760b2fd0529e850fcdeb60821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 6 May 2025 18:30:49 +0200
Subject: [PATCH 181/264] Revert "test modern build stack as part of windows"

This reverts commit 58f7c78682ac3a80be8f3455d6eddddf3a0a1deb.
---
 scripts/windows/ci/test.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/windows/ci/test.ps1 b/scripts/windows/ci/test.ps1
index 63510c2754..fb813d33fa 100644
--- a/scripts/windows/ci/test.ps1
+++ b/scripts/windows/ci/test.ps1
@@ -2,7 +2,6 @@
 $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml'
 
 $tests = @(
-  'modern build stack'
   '^assets'
   '^autoupdate'
   '^dynamic import.*development'
@@ -28,4 +27,4 @@ If ($selfTestExitCode -eq 0) {
 
 If ($selfTestExitCode -ne 0) {
   Exit $selfTestExitCode
-}
+}
\ No newline at end of file

From e16440ceb59325b80ecff077113e14561d8c4ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 05:57:24 +0200
Subject: [PATCH 182/264] Update 3.3.0.md

---
 v3-docs/docs/generators/changelog/versions/3.3.0.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 9dc6052aea..11ae95ed9a 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -2,7 +2,7 @@
 
 ### Highlights
 
-- Support SWC transpiler for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657)
+- Support SWC transpiler and minifier for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657),  [PR#13715](https://github.com/meteor/meteor/pull/13715)
 - Use `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
 - Default to modern architecture, skip legacy processing [PR#13665](https://github.com/meteor/meteor/pull/13665), [PR#13698](https://github.com/meteor/meteor/pull/13698)
 - Optimize SQLite for faster startup and better performance [PR#13702](https://github.com/meteor/meteor/pull/13702)
@@ -21,7 +21,7 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 
 #### Breaking Changes
 
-- File watching strategy switched to @parcel/watcher
+- File watching strategy switched to `@parcel/watcher`
     - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
     - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
     - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.

From 86fc826b9379c86c51ef1334c5d679b12c60150a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 14:20:23 +0200
Subject: [PATCH 183/264] Revert "Bump mongodb dependency to version 6.16.0 in
 npm-mongo package (#13710)"

This reverts commit 43af635d1b1355d7fb76c950cc9138b6a3dfd982.
---
 packages/npm-mongo/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index fad1d65554..8b45db0032 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,7 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "6.16.0"
+  mongodb: "6.9.0"
 });
 
 Package.onUse(function (api) {

From 3cbeccb9e77f7641b8ea9b61bd2d10ab13ebaeb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 14:46:35 +0200
Subject: [PATCH 184/264] re-run checks


From 1e0b46ca657c48438256da47a935674b9d6680bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 15:52:07 +0200
Subject: [PATCH 185/264] improve docs to include new minifier

---
 v3-docs/docs/about/modern-build-stack.md      | 10 +++-
 .../modern-build-stack/modern-bundler.md      | 44 ++++++++---------
 .../modern-build-stack/modern-dev-server.md   | 47 +++++++++++++++++++
 .../modern-transpiler-swc.md                  |  4 +-
 4 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 v3-docs/docs/about/modern-build-stack/modern-dev-server.md

diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index 7c5d0bc9ce..1f3db4507d 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -10,7 +10,7 @@ To improve the development and deployment experience for all Meteor projects, we
 
 - **Modern Transpiler**: Meteor is adopting **SWC** as a faster alternative to Babel.
 - **Modern Bundler**: A new bundler will handle only your app’s code, supporting tree-shaking, popular plugins, and better features for both development and production. Meanwhile, Meteor’s core bundler will continue handling Meteor-specific tasks, such as compiling Atmosphere packages, with optimized workflows.
-- **Dev Server Enhancements**: The dev server remains a core part of Meteor, now with ongoing improvements in performance and developer features.
+- **Modern Dev Server**: The dev server remains a core part of Meteor, now with ongoing improvements in performance and developer features. A new bundler will complement the dev server, providing additional enhancements.
 
 ## Quick start
 
@@ -22,4 +22,10 @@ Start using the new build stack by creating a Meteor app, or add this to your `p
 }
 ```
 
-Learn more about these settings in the [Modern Transpiler](modern-build-stack/modern-transpiler-swc.md) and [Modern Bundler](modern-build-stack/modern-bundler.md) guides.
+With this configuration, you enable all improvements from the modern build stack in your Meteor app.
+
+See the following sections to learn about each component and its settings:
+
+- [Modern Transpiler](modern-build-stack/modern-transpiler-swc.md)
+- [Modern Bundler](modern-build-stack/modern-bundler.md)
+- [Modern Dev Server](modern-build-stack/modern-dev-server.md)
diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index c30263bf62..eefcd7b05c 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -1,16 +1,18 @@
 # Modern Bundler
 
+Meteor handles linking all project files into the final bundle. While we'd like to offload more of this to a modern bundler, we're still focused on keeping what's left in the Meteor context as fast as possible.
+
+Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
+
+## Modern Web Archs
+
 :::info
 Starting with Meteor 3.3
 :::
 
-Meteor handles watching and linking all project files into the final bundle. While we'd like to offload more of this to modern bundlers, we're still focused on keeping what's left in the Meteor context as fast as possible.
+> Web archs are the builds Meteor generates for modern browsers, legacy browsers, and Cordova.
 
-Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
-
-## Modern builds
-
-Starting with Meteor 3.3, new apps skip `web.browser.legacy` and `web.cordova` by default in development mode (unless developing for native). This results on getting a faster build process on development mode.
+New apps skip `web.browser.legacy` and `web.cordova` by default in development mode (unless developing for native). This results on getting a faster build process on development mode.
 
 For existing apps, enable this by adding to `package.json`:
 
@@ -22,7 +24,7 @@ For existing apps, enable this by adding to `package.json`:
 
 This works like using `--exclude-archs web.browser.legacy,web.cordova` with `meteor run`.
 
-By default, `"modern": true` enables all build stack upgrades: new transpiler, web arch-only compilation, watcher and more. To opt out of web arch-only compilation, set `"webArchOnly": false` in your `package.json`.
+By default, `"modern": true` enables all build stack upgrades. To opt out of web arch-only compilation, set `"webArchOnly": false` in your `package.json`.
 
 ```json
 "meteor": {
@@ -32,9 +34,15 @@ By default, `"modern": true` enables all build stack upgrades: new transpiler, w
 }
 ```
 
-## Modern watcher
+## Modern Minifier
 
-Starting with Meteor 3.3, new apps use a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
+:::info
+Starting with Meteor 3.3
+:::
+
+> The minifier reduces and obfuscates your app’s production bundle for security and efficiency.
+
+New apps use an SWC-based minifier, replacing the legacy [Terser](https://github.com/terser/terser) minifier. This speeds up production builds and deployments.
 
 For existing apps, enable this by adding to `package.json`:
 
@@ -44,26 +52,12 @@ For existing apps, enable this by adding to `package.json`:
 }
 ```
 
-If you run into issues with the new watcher, you can revert to the previous implementation for better file change detection. To disable the new watcher, set `"watcher": false` in your package.json.
+By default, `"modern": true` enables all build stack upgrades. To opt out of the new minifier, set `"minifier": false` in your `package.json`.
 
 ```json
 "meteor": {
   "modern": {
-    "watcher": false
+    "minifier": false
   }
 }
 ```
-
-The modern watcher uses the OS's native file watching with a performance-first approach. Both modern and legacy watchers support environment variables for polling, useful in edge cases like WSL with host, volumes, or remote setups.
-
-To enable polling, run your Meteor app with:
-
-```shell
-# enable polling
-METEOR_WATCH_FORCE_POLLING=true meteor run
-
-# set polling interval (in ms)
-METEOR_WATCH_POLLING_INTERVAL_MS=1000 METEOR_WATCH_FORCE_POLLING=true meteor run
-```
-
-> Polling uses more CPU and RAM, but it's the most reliable option in some environments.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-dev-server.md b/v3-docs/docs/about/modern-build-stack/modern-dev-server.md
new file mode 100644
index 0000000000..95e272f200
--- /dev/null
+++ b/v3-docs/docs/about/modern-build-stack/modern-dev-server.md
@@ -0,0 +1,47 @@
+# Modern Dev Server
+
+Meteor Dev Server provides real-time file watching during development, with fast feedback through HMR, bundle visualizers, debug tools, Mongo built-in instance, CLI tools and more. At runtime, it offers a complete server environment supporting SSR and modern Express-based APIs.
+
+As part of the modern build stack, we update each component for improved performance, smarter tooling, and better bundle observability and debugging. While Meteor Dev Server remains at the core, we’ll integrate modern tools and a new bundler to enhance your app development.
+
+## Modern Watcher
+
+:::info
+Starting with Meteor 3.3
+:::
+
+> The watcher listens for changes in your app’s code files and triggers quick recompilations.
+
+New apps use a modern, cross-platform watcher: [`@parcel/watcher`](https://github.com/parcel-bundler/watcher). It responds quickly to file changes using native file watching. Symbolic link changes and all traversed files are supported via polling.
+
+For existing apps, enable this by adding to `package.json`:
+
+```json
+"meteor": {
+  "modern": true
+}
+```
+
+If you run into issues with the new watcher, you can revert to the previous implementation for better file change detection. To disable the new watcher, set `"watcher": false` in your package.json.
+
+```json
+"meteor": {
+  "modern": {
+    "watcher": false
+  }
+}
+```
+
+The modern watcher uses the OS's native file watching with a performance-first approach. Both modern and legacy watchers support environment variables for polling, useful in edge cases like WSL with host, volumes, or remote setups.
+
+To enable polling, run your Meteor app with:
+
+```shell
+# enable polling
+METEOR_WATCH_FORCE_POLLING=true meteor run
+
+# set polling interval (in ms)
+METEOR_WATCH_POLLING_INTERVAL_MS=1000 METEOR_WATCH_FORCE_POLLING=true meteor run
+```
+
+> Polling uses more CPU and RAM, but it's the most reliable option in some environments.
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index b800f99b74..2d15e43105 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -4,6 +4,8 @@
 Starting with Meteor 3.3
 :::
 
+> The transpiler converts modern JS syntax in all app code to a cross-browser compatible version.
+
 Meteor has long used Babel, a mature and still widely adopted transpiler. However, it lags behind newer tools like SWC in terms of speed. SWC and others are not only faster but are growing in use and features, reaching parity with Babel.
 
 Since transpilation is one of the slowest steps in development, Meteor now gives you the option to use SWC for your apps.
@@ -20,7 +22,7 @@ Add this to your app's `package.json`:
 
 When starting your app for web or native, SWC will handle all files: your app, npm packages, and Atmosphere packages. This also applies to production builds.
 
-By default, `"modern": true` enables all build stack upgrades: new transpiler, web arch-only compilation, watcher and more. To opt out of SWC, set `"transpiler": false` in your `package.json`.
+By default, `"modern": true` enables all build stack upgrades. To opt out of SWC transpiler, set `"transpiler": false` in your `package.json`.
 
 ```json
 "meteor": {

From 5d0b6ead6e742462a92777752e2d20fcd738f00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 16:01:00 +0200
Subject: [PATCH 186/264] update changelog

---
 .../docs/generators/changelog/versions/3.3.0.md  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 11ae95ed9a..d152d21f88 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -2,12 +2,12 @@
 
 ### Highlights
 
-- Support SWC transpiler and minifier for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657),  [PR#13715](https://github.com/meteor/meteor/pull/13715)
-- Use `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
+- Support SWC transpiler and minifier for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657),  [PR#13715](https://github.com/meteor/meteor/pull/13715)
+- Switch to `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
 - Default to modern architecture, skip legacy processing [PR#13665](https://github.com/meteor/meteor/pull/13665), [PR#13698](https://github.com/meteor/meteor/pull/13698)
 - Optimize SQLite for faster startup and better performance [PR#13702](https://github.com/meteor/meteor/pull/13702)
 - Support CPU profiling in Meteor 3 bundler [PR#13650](https://github.com/meteor/meteor/pull/13650)
-- Improve `meteor profile`: show rebuild steps and total, support `--build` [PR#16](https://github.com/meteor/performance/pull/16) and [PR#13694](https://github.com/meteor/meteor/pull/13694)
+- Improve `meteor profile`: show rebuild steps and total, support `--build` [PR#16](https://github.com/meteor/performance/pull/16), [PR#13694](https://github.com/meteor/meteor/pull/13694)
 - Improve `useFind` and `useSubscribe` React hooks
 - Add `replaceEmailAsync` helper to Accounts [PR#13677](https://github.com/meteor/meteor/pull/13677)
 - Fix user agent detection and oplog collection filtering
@@ -50,6 +50,16 @@ To apply react-meteor-data changes:
 meteor add react-meteor-data@4.0.0-beta.0
 ```
 
+**Add this to your `package.json` to enable the new modern build stack:**
+
+```json
+"meteor": {
+  "modern": true
+}
+```
+
+> These settings are on by default for new apps.
+
 #### Bumped Meteor Packages
 
 - accounts-base@3.1.1

From 2eee978295b9801d8f2a4efc5d48ce4bf85abc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 17:18:35 +0200
Subject: [PATCH 187/264] ensure meteor modern is disabled for legacy build
 stack test

---
 tools/tests/modern.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 946215ec84..d7ab01198d 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -17,6 +17,8 @@ async function writeModernConfig(s, modernConfig) {
 }
 
 selftest.define("modern build stack - legacy", async function () {
+  process.env.METEOR_MODERN = 'false';
+
   const s = new Sandbox();
   await s.init();
 

From 84f8cc74a5f26e902bbedd86ffa22d5e91bb3988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 18:10:42 +0200
Subject: [PATCH 188/264] ensure meteor modern is disabled for legacy build
 stack test

---
 tools/tests/modern.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index d7ab01198d..cb9658f35a 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -17,6 +17,7 @@ async function writeModernConfig(s, modernConfig) {
 }
 
 selftest.define("modern build stack - legacy", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
   process.env.METEOR_MODERN = 'false';
 
   const s = new Sandbox();
@@ -43,6 +44,8 @@ selftest.define("modern build stack - legacy", async function () {
   await run.match(/server\/main\.js:6:22/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack", async function () {

From d2954ffa9d087815228300cfb20879a7bfe21517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 18:16:41 +0200
Subject: [PATCH 189/264] ensure meteor mode disabled webArchOnly on necessary

---
 packages/babel-compiler/babel-compiler.js |  2 +-
 tools/cli/commands.js                     |  2 +-
 tools/tests/compiler-plugins.js           | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 8484b1486f..b0c3c96a98 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -116,7 +116,7 @@ const normalizeModern = (r = false) => Object.fromEntries(
     ]),
 );
 
-let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
+let modernForced = JSON.parse(process.env.METEOR_MODERN || "false");
 
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 625af43d98..d9efdf9d5c 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -281,7 +281,7 @@ const normalizeModern = (r = false) => Object.fromEntries(
 );
 
 
-let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
+let modernForced = JSON.parse(process.env.METEOR_MODERN || "false");
 let meteorConfig;
 
 function getMeteorConfig(appDir) {
diff --git a/tools/tests/compiler-plugins.js b/tools/tests/compiler-plugins.js
index 517f285546..bb2a79858f 100644
--- a/tools/tests/compiler-plugins.js
+++ b/tools/tests/compiler-plugins.js
@@ -22,6 +22,10 @@ async function startRun(sandbox) {
 
 // Tests the actual cache logic used by coffeescript.
 selftest.define("compiler plugin caching - coffee", async () => {
+  // Enable legacy builds for testing.
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '{ "webArchOnly": false }';
+
   var s = new Sandbox({ fakeMongo: true });
   await s.init();
 
@@ -134,6 +138,8 @@ selftest.define("compiler plugin caching - coffee", async () => {
   await run.match('Coffeescript X is 2 Y is edited FromPackage is 5');
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 // Tests the actual cache logic used by less and stylus.
@@ -142,6 +148,10 @@ selftest.define("compiler plugin caching - coffee", async () => {
   const hasCompileOneFileLaterSupport = packageName === "less";
 
   selftest.define("compiler plugin caching - " + packageName, async () => {
+    // Enable legacy builds for testing.
+    const currentMeteorModern = process.env.METEOR_MODERN;
+    process.env.METEOR_MODERN = '{ "webArchOnly": false }';
+
     var s = new Sandbox({ fakeMongo: true });
     await s.init();
 
@@ -319,6 +329,8 @@ selftest.define("compiler plugin caching - coffee", async () => {
     await run.match('Waiting for file change');
 
     await run.stop();
+
+    process.env.METEOR_MODERN = currentMeteorModern;
   });
 });
 

From 741b504d4f3b87e5f41a0b0c1d95030fb1a360ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 18:27:15 +0200
Subject: [PATCH 190/264] ensure meteor modules test for legacy and modern
 (avoid an app with a babel-specific plugin)

---
 tools/tests/apps/modules-modern/.gitignore    |    1 +
 .../.meteor/.finished-upgraders               |   20 +
 .../apps/modules-modern/.meteor/.gitignore    |    2 +
 tools/tests/apps/modules-modern/.meteor/.id   |    7 +
 .../apps/modules-modern/.meteor/packages      |   29 +
 .../apps/modules-modern/.meteor/platforms     |    2 +
 .../tests/apps/modules-modern/.meteor/release |    1 +
 tools/tests/apps/modules-modern/README.md     |   10 +
 .../client/compatibility/bare.js              |    5 +
 .../tests/apps/modules-modern/client/only.js  |    1 +
 .../apps/modules-modern/eager-coffee.coffee   |    2 +
 tools/tests/apps/modules-modern/eager-jsx.jsx |    3 +
 tools/tests/apps/modules-modern/eager.css     |    7 +
 .../apps/modules-modern/imports/.babelrc      |   14 +
 .../apps/modules-modern/imports/babel-env.js  |    8 +
 .../apps/modules-modern/imports/chaining.js   |    3 +
 .../apps/modules-modern/imports/dir/index.js  |    1 +
 .../modules-modern/imports/dir/package.json   |    5 +
 .../modules-modern/imports/imported.tests.js  |    9 +
 .../apps/modules-modern/imports/lazy.css      |    3 +
 .../apps/modules-modern/imports/lazy.html     |    7 +
 .../apps/modules-modern/imports/lazy1.js      |    9 +
 .../apps/modules-modern/imports/lazy2.js      |    9 +
 .../imports/links/acorn/.npmignore            |    3 +
 .../imports/links/acorn/CHANGELOG.md          |  580 +++
 .../imports/links/acorn/LICENSE               |   19 +
 .../imports/links/acorn/README.md             |  270 ++
 .../imports/links/acorn/package.json          |   29 +
 .../imports/links/acorn/src/.eslintrc         |   34 +
 .../imports/links/acorn/src/bin/.eslintrc     |    6 +
 .../imports/links/acorn/src/bin/acorn.js      |   62 +
 .../imports/links/acorn/src/expression.js     |  969 +++++
 .../imports/links/acorn/src/identifier.js     |   87 +
 .../imports/links/acorn/src/index.js          |  102 +
 .../imports/links/acorn/src/location.js       |   26 +
 .../imports/links/acorn/src/locutil.js        |   42 +
 .../imports/links/acorn/src/lval.js           |  239 ++
 .../imports/links/acorn/src/node.js           |   50 +
 .../imports/links/acorn/src/options.js        |  130 +
 .../imports/links/acorn/src/parseutil.js      |  151 +
 .../imports/links/acorn/src/regexp.js         | 1046 ++++++
 .../imports/links/acorn/src/scope.js          |   95 +
 .../imports/links/acorn/src/scopeflags.js     |   24 +
 .../imports/links/acorn/src/state.js          |  124 +
 .../imports/links/acorn/src/statement.js      |  877 +++++
 .../imports/links/acorn/src/tokencontext.js   |  149 +
 .../imports/links/acorn/src/tokenize.js       |  727 ++++
 .../imports/links/acorn/src/tokentype.js      |  148 +
 .../links/acorn/src/unicode-property-data.js  |   49 +
 .../imports/links/acorn/src/util.js           |   15 +
 .../imports/links/acorn/src/whitespace.js     |   13 +
 .../imports/links/immutable-tuple             |    1 +
 .../imports/links/jsx-import-test/child.jsx   |    2 +
 .../links/jsx-import-test/package.json        |    9 +
 .../imports/links/jsx-import-test/parent.js   |    1 +
 .../modules-modern/imports/links/lodash-es    |    1 +
 .../apps/modules-modern/imports/plain.es5.js  |    4 +
 .../apps/modules-modern/imports/return.js     |    3 +
 .../apps/modules-modern/imports/shared.js     |    3 +
 .../issue-9878-test-package/dir/normal.json   |    8 +
 .../issue-9878-test-package/dir/package.json  |    8 +
 .../issue-9878-test-package/main.js           |    6 +
 .../issue-9878-test-package/package.json      |    8 +
 tools/tests/apps/modules-modern/lazy-css.html |    6 +
 .../tests/apps/modules-modern/lib/a/index.js  |    1 +
 .../apps/modules-modern/lib/a/package.json    |    4 +
 .../apps/modules-modern/lib/b/package.json    |    4 +
 tools/tests/apps/modules-modern/lib/index.js  |    1 +
 .../apps/modules-modern/package-lock.json     | 3105 +++++++++++++++++
 tools/tests/apps/modules-modern/package.json  |   51 +
 .../packages/client-only-ecmascript/README.md |    1 +
 .../packages/client-only-ecmascript/client.js |    6 +
 .../client-only-ecmascript/imported.js        |    1 +
 .../client-only-ecmascript/package.js         |   13 +
 .../packages/client-only-ecmascript/server.js |    4 +
 .../packages/dummy-compiler/main.js           |    8 +
 .../packages/dummy-compiler/package.js        |   16 +
 .../packages/dummy-compiler/plugin.js         |   29 +
 .../packages/dummy-compiler/test.dummy        |    1 +
 .../import-local-json-module/data.json        |    3 +
 .../packages/import-local-json-module/main.js |    1 +
 .../import-local-json-module/package.js       |   11 +
 .../.npm/package/.gitignore                   |    1 +
 .../modules-test-package/.npm/package/README  |    7 +
 .../.npm/package/npm-shrinkwrap.json          |  182 +
 .../packages/modules-test-package/README.md   |    0
 .../packages/modules-test-package/client.js   |   17 +
 .../modules-test-package/client/where.js      |    1 +
 .../packages/modules-test-package/common.js   |   54 +
 .../modules-test-package/css/imported.css     |    7 +
 .../modules-test-package/css/not-imported.css |    3 +
 .../modules-test-package/illegal.html         |    1 +
 .../packages/modules-test-package/os-stub.js  |    2 +
 .../packages/modules-test-package/package.js  |   31 +
 .../packages/modules-test-package/server.js   |   12 +
 .../modules-test-package/server/where.js      |    2 +
 .../packages/modules-test-package/tests.js    |    9 +
 .../tests/apps/modules-modern/server/only.js  |   17 +
 tools/tests/apps/modules-modern/tests.js      |  761 ++++
 tools/tests/apps/modules-modern/typescript.ts |    3 +
 tools/tests/modules.js                        |   45 +-
 101 files changed, 10698 insertions(+), 1 deletion(-)
 create mode 100644 tools/tests/apps/modules-modern/.gitignore
 create mode 100644 tools/tests/apps/modules-modern/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/modules-modern/.meteor/.gitignore
 create mode 100644 tools/tests/apps/modules-modern/.meteor/.id
 create mode 100644 tools/tests/apps/modules-modern/.meteor/packages
 create mode 100644 tools/tests/apps/modules-modern/.meteor/platforms
 create mode 100644 tools/tests/apps/modules-modern/.meteor/release
 create mode 100644 tools/tests/apps/modules-modern/README.md
 create mode 100644 tools/tests/apps/modules-modern/client/compatibility/bare.js
 create mode 100644 tools/tests/apps/modules-modern/client/only.js
 create mode 100644 tools/tests/apps/modules-modern/eager-coffee.coffee
 create mode 100644 tools/tests/apps/modules-modern/eager-jsx.jsx
 create mode 100644 tools/tests/apps/modules-modern/eager.css
 create mode 100644 tools/tests/apps/modules-modern/imports/.babelrc
 create mode 100644 tools/tests/apps/modules-modern/imports/babel-env.js
 create mode 100644 tools/tests/apps/modules-modern/imports/chaining.js
 create mode 100644 tools/tests/apps/modules-modern/imports/dir/index.js
 create mode 100644 tools/tests/apps/modules-modern/imports/dir/package.json
 create mode 100644 tools/tests/apps/modules-modern/imports/imported.tests.js
 create mode 100644 tools/tests/apps/modules-modern/imports/lazy.css
 create mode 100644 tools/tests/apps/modules-modern/imports/lazy.html
 create mode 100644 tools/tests/apps/modules-modern/imports/lazy1.js
 create mode 100644 tools/tests/apps/modules-modern/imports/lazy2.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/.npmignore
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/CHANGELOG.md
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/LICENSE
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/README.md
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/package.json
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/.eslintrc
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/bin/.eslintrc
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/bin/acorn.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/expression.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/identifier.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/index.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/location.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/locutil.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/lval.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/node.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/options.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/parseutil.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/regexp.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/scope.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/scopeflags.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/state.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/statement.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/tokencontext.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/tokenize.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/tokentype.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/unicode-property-data.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/util.js
 create mode 100644 tools/tests/apps/modules-modern/imports/links/acorn/src/whitespace.js
 create mode 120000 tools/tests/apps/modules-modern/imports/links/immutable-tuple
 create mode 100644 tools/tests/apps/modules-modern/imports/links/jsx-import-test/child.jsx
 create mode 100644 tools/tests/apps/modules-modern/imports/links/jsx-import-test/package.json
 create mode 100644 tools/tests/apps/modules-modern/imports/links/jsx-import-test/parent.js
 create mode 120000 tools/tests/apps/modules-modern/imports/links/lodash-es
 create mode 100644 tools/tests/apps/modules-modern/imports/plain.es5.js
 create mode 100644 tools/tests/apps/modules-modern/imports/return.js
 create mode 100644 tools/tests/apps/modules-modern/imports/shared.js
 create mode 100644 tools/tests/apps/modules-modern/issue-9878-test-package/dir/normal.json
 create mode 100644 tools/tests/apps/modules-modern/issue-9878-test-package/dir/package.json
 create mode 100644 tools/tests/apps/modules-modern/issue-9878-test-package/main.js
 create mode 100644 tools/tests/apps/modules-modern/issue-9878-test-package/package.json
 create mode 100644 tools/tests/apps/modules-modern/lazy-css.html
 create mode 100644 tools/tests/apps/modules-modern/lib/a/index.js
 create mode 100644 tools/tests/apps/modules-modern/lib/a/package.json
 create mode 100644 tools/tests/apps/modules-modern/lib/b/package.json
 create mode 100644 tools/tests/apps/modules-modern/lib/index.js
 create mode 100644 tools/tests/apps/modules-modern/package-lock.json
 create mode 100644 tools/tests/apps/modules-modern/package.json
 create mode 100644 tools/tests/apps/modules-modern/packages/client-only-ecmascript/README.md
 create mode 100644 tools/tests/apps/modules-modern/packages/client-only-ecmascript/client.js
 create mode 100644 tools/tests/apps/modules-modern/packages/client-only-ecmascript/imported.js
 create mode 100644 tools/tests/apps/modules-modern/packages/client-only-ecmascript/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/client-only-ecmascript/server.js
 create mode 100644 tools/tests/apps/modules-modern/packages/dummy-compiler/main.js
 create mode 100644 tools/tests/apps/modules-modern/packages/dummy-compiler/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/dummy-compiler/plugin.js
 create mode 100644 tools/tests/apps/modules-modern/packages/dummy-compiler/test.dummy
 create mode 100644 tools/tests/apps/modules-modern/packages/import-local-json-module/data.json
 create mode 100644 tools/tests/apps/modules-modern/packages/import-local-json-module/main.js
 create mode 100644 tools/tests/apps/modules-modern/packages/import-local-json-module/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/.gitignore
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/README
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/npm-shrinkwrap.json
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/README.md
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/client.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/client/where.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/common.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/css/imported.css
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/css/not-imported.css
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/illegal.html
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/os-stub.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/server.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/server/where.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-package/tests.js
 create mode 100644 tools/tests/apps/modules-modern/server/only.js
 create mode 100644 tools/tests/apps/modules-modern/tests.js
 create mode 100644 tools/tests/apps/modules-modern/typescript.ts

diff --git a/tools/tests/apps/modules-modern/.gitignore b/tools/tests/apps/modules-modern/.gitignore
new file mode 100644
index 0000000000..07e6e472cc
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/tools/tests/apps/modules-modern/.meteor/.finished-upgraders b/tools/tests/apps/modules-modern/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..bc5b50f7cd
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/.finished-upgraders
@@ -0,0 +1,20 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.3.5-remove-old-dev-bundle-link
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/tools/tests/apps/modules-modern/.meteor/.gitignore b/tools/tests/apps/modules-modern/.meteor/.gitignore
new file mode 100644
index 0000000000..501f92e4b5
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/.gitignore
@@ -0,0 +1,2 @@
+dev_bundle
+local
diff --git a/tools/tests/apps/modules-modern/.meteor/.id b/tools/tests/apps/modules-modern/.meteor/.id
new file mode 100644
index 0000000000..be64c639e9
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+dpey3716n44ug18al7gu
diff --git a/tools/tests/apps/modules-modern/.meteor/packages b/tools/tests/apps/modules-modern/.meteor/packages
new file mode 100644
index 0000000000..bcccad6a5f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/packages
@@ -0,0 +1,29 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base@1.5.2-beta300.6             # Packages every Meteor app needs to have
+mobile-experience@1.1.1-beta300.6       # Packages for a great mobile UX
+mongo@2.0.0-beta300.6                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+session@1.2.2-beta300.6               # Client-side reactive dictionary for your app
+jquery                        # Helpful client-side library
+tracker@1.3.3-beta300.6             # Meteor's client-side reactive programming library
+
+es5-shim@4.8.1-beta300.6                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.16.8-beta300.6              # Enable ECMAScript2015+ syntax in app code
+
+coffeescript
+modules-test-package
+standard-minifier-css@1.9.3-beta300.6
+standard-minifier-js@3.0.0-beta300.6
+client-only-ecmascript
+shell-server@0.6.0-beta300.6
+dynamic-import@0.7.4-beta300.6
+import-local-json-module
+dummy-compiler
+typescript@5.3.3-beta300.6
+meteortesting:mocha@3.0.0
+meteortesting:mocha-core@8.2.0
diff --git a/tools/tests/apps/modules-modern/.meteor/platforms b/tools/tests/apps/modules-modern/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/modules-modern/.meteor/release b/tools/tests/apps/modules-modern/.meteor/release
new file mode 100644
index 0000000000..ecc41d1d5a
--- /dev/null
+++ b/tools/tests/apps/modules-modern/.meteor/release
@@ -0,0 +1 @@
+METEOR@3.0-beta.6
diff --git a/tools/tests/apps/modules-modern/README.md b/tools/tests/apps/modules-modern/README.md
new file mode 100644
index 0000000000..323c3fb58b
--- /dev/null
+++ b/tools/tests/apps/modules-modern/README.md
@@ -0,0 +1,10 @@
+# modules
+
+To run the tests, first install the npm dependencies, then run the app:
+
+```sh
+npm install
+npm test # just does `meteor run`
+```
+
+then visit [localhost:3000](//localhost:3000) in your browser.
diff --git a/tools/tests/apps/modules-modern/client/compatibility/bare.js b/tools/tests/apps/modules-modern/client/compatibility/bare.js
new file mode 100644
index 0000000000..f8ac4fa752
--- /dev/null
+++ b/tools/tests/apps/modules-modern/client/compatibility/bare.js
@@ -0,0 +1,5 @@
+// Because this file is contained by a client/compatibility directory, it
+// should be evaluated as a bare file instead of as a module, so this
+// variable declaration should take effect in the scope of the app, and
+// thus be visible to other modules in the app.
+var topLevelVariable = 1234;
diff --git a/tools/tests/apps/modules-modern/client/only.js b/tools/tests/apps/modules-modern/client/only.js
new file mode 100644
index 0000000000..3e3d4356d3
--- /dev/null
+++ b/tools/tests/apps/modules-modern/client/only.js
@@ -0,0 +1 @@
+export default module.id;
diff --git a/tools/tests/apps/modules-modern/eager-coffee.coffee b/tools/tests/apps/modules-modern/eager-coffee.coffee
new file mode 100644
index 0000000000..2dfecc17ed
--- /dev/null
+++ b/tools/tests/apps/modules-modern/eager-coffee.coffee
@@ -0,0 +1,2 @@
+exports.extension = ".coffee";
+require("./imports/shared").default[module.id] = "eager coffee";
diff --git a/tools/tests/apps/modules-modern/eager-jsx.jsx b/tools/tests/apps/modules-modern/eager-jsx.jsx
new file mode 100644
index 0000000000..45e2dfa842
--- /dev/null
+++ b/tools/tests/apps/modules-modern/eager-jsx.jsx
@@ -0,0 +1,3 @@
+import shared from "./imports/shared";
+export const extension = ".jsx";
+shared[module.id] = "eager jsx";
diff --git a/tools/tests/apps/modules-modern/eager.css b/tools/tests/apps/modules-modern/eager.css
new file mode 100644
index 0000000000..3295fdf0cf
--- /dev/null
+++ b/tools/tests/apps/modules-modern/eager.css
@@ -0,0 +1,7 @@
+.app-eager-css {
+  display: none;
+}
+
+.app-lazy-css {
+  padding: 0;
+}
diff --git a/tools/tests/apps/modules-modern/imports/.babelrc b/tools/tests/apps/modules-modern/imports/.babelrc
new file mode 100644
index 0000000000..b18c977ecb
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/.babelrc
@@ -0,0 +1,14 @@
+{
+  "env": {
+    "development": {
+      "plugins": [
+        "proposal-do-expressions",
+      ]
+    },
+    "production": {
+      "plugins": [
+        "proposal-do-expressions",
+      ]
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/babel-env.js b/tools/tests/apps/modules-modern/imports/babel-env.js
new file mode 100644
index 0000000000..834320ebb4
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/babel-env.js
@@ -0,0 +1,8 @@
+export function check(y) {
+  // If the transform-do-expressions plugin is loaded correctly, there
+  // will be no errors during the compilation of this file. Without the
+  // plugin, the error will be: "SyntaxError: Unexpected token do".
+  return do {
+    y + y;
+  };
+}
diff --git a/tools/tests/apps/modules-modern/imports/chaining.js b/tools/tests/apps/modules-modern/imports/chaining.js
new file mode 100644
index 0000000000..5f0073997a
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/chaining.js
@@ -0,0 +1,3 @@
+export function check(obj) {
+  return obj?.foo?.bar?.baz.qux;
+}
diff --git a/tools/tests/apps/modules-modern/imports/dir/index.js b/tools/tests/apps/modules-modern/imports/dir/index.js
new file mode 100644
index 0000000000..e90dd19200
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/dir/index.js
@@ -0,0 +1 @@
+exports.fellBackTo = module.id;
diff --git a/tools/tests/apps/modules-modern/imports/dir/package.json b/tools/tests/apps/modules-modern/imports/dir/package.json
new file mode 100644
index 0000000000..9c9f954a06
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/dir/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "package-json-with-no-main",
+  "version": "1.2.3",
+  "description": "https://github.com/meteor/meteor/issues/6589"
+}
diff --git a/tools/tests/apps/modules-modern/imports/imported.tests.js b/tools/tests/apps/modules-modern/imports/imported.tests.js
new file mode 100644
index 0000000000..5db10f22c0
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/imported.tests.js
@@ -0,0 +1,9 @@
+import assert from "assert";
+
+export const name = module.id.split("/").pop();
+
+describe(name, () => {
+  it("should be imported", () => {
+    assert.strictEqual(name, "imported.tests.js");
+  });
+});
diff --git a/tools/tests/apps/modules-modern/imports/lazy.css b/tools/tests/apps/modules-modern/imports/lazy.css
new file mode 100644
index 0000000000..f59e326e70
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/lazy.css
@@ -0,0 +1,3 @@
+.app-lazy-css {
+  padding: 10px;
+}
diff --git a/tools/tests/apps/modules-modern/imports/lazy.html b/tools/tests/apps/modules-modern/imports/lazy.html
new file mode 100644
index 0000000000..df3233bbc2
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/lazy.html
@@ -0,0 +1,7 @@
+<body>
+  {{> lazy}}
+</body>
+
+<template name="lazy">
+  lazy
+</template>
diff --git a/tools/tests/apps/modules-modern/imports/lazy1.js b/tools/tests/apps/modules-modern/imports/lazy1.js
new file mode 100644
index 0000000000..2f9b2be9cf
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/lazy1.js
@@ -0,0 +1,9 @@
+import shared from "./shared";
+import "./lazy2";
+
+shared[module.id] = 1;
+
+export function reset() {
+  delete shared[module.id];
+  delete module.exports;
+}
diff --git a/tools/tests/apps/modules-modern/imports/lazy2.js b/tools/tests/apps/modules-modern/imports/lazy2.js
new file mode 100644
index 0000000000..68e5d569f6
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/lazy2.js
@@ -0,0 +1,9 @@
+import shared from "../imports/shared";
+import "./lazy1";
+
+shared[module.id] = 2;
+
+export function reset() {
+  delete shared[module.id];
+  delete module.exports;
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/.npmignore b/tools/tests/apps/modules-modern/imports/links/acorn/.npmignore
new file mode 100644
index 0000000000..0e574439e0
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/.npmignore
@@ -0,0 +1,3 @@
+.tern-*
+/rollup.config.*
+/src
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/CHANGELOG.md b/tools/tests/apps/modules-modern/imports/links/acorn/CHANGELOG.md
new file mode 100644
index 0000000000..93837a91a1
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/CHANGELOG.md
@@ -0,0 +1,580 @@
+## 6.4.1 (2020-03-09)
+
+### Bug fixes
+
+More carefully check for valid UTF16 surrogate pairs in regexp validator.
+
+## 7.1.1 (2020-03-01)
+
+### Bug fixes
+
+Treat `\8` and `\9` as invalid escapes in template strings.
+
+Allow unicode escapes in property names that are keywords.
+
+Don't error on an exponential operator expression as argument to `await`.
+
+More carefully check for valid UTF16 surrogate pairs in regexp validator.
+
+## 7.1.0 (2019-09-24)
+
+### Bug fixes
+
+Disallow trailing object literal commas when ecmaVersion is less than 5.
+
+### New features
+
+Add a static `acorn` property to the `Parser` class that contains the entire module interface, to allow plugins to access the instance of the library that they are acting on.
+
+## 7.0.0 (2019-08-13)
+
+### Breaking changes
+
+Changes the node format for dynamic imports to use the `ImportExpression` node type, as defined in [ESTree](https://github.com/estree/estree/blob/master/es2020.md#importexpression).
+
+Makes 10 (ES2019) the default value for the `ecmaVersion` option.
+
+## 6.3.0 (2019-08-12)
+
+### New features
+
+`sourceType: "module"` can now be used even when `ecmaVersion` is less than 6, to parse module-style code that otherwise conforms to an older standard.
+
+## 6.2.1 (2019-07-21)
+
+### Bug fixes
+
+Fix bug causing Acorn to treat some characters as identifier characters that shouldn't be treated as such.
+
+Fix issue where setting the `allowReserved` option to `"never"` allowed reserved words in some circumstances.
+
+## 6.2.0 (2019-07-04)
+
+### Bug fixes
+
+Improve valid assignment checking in `for`/`in` and `for`/`of` loops.
+
+Disallow binding `let` in patterns.
+
+### New features
+
+Support bigint syntax with `ecmaVersion` >= 11.
+
+Support dynamic `import` syntax with `ecmaVersion` >= 11.
+
+Upgrade to Unicode version 12.
+
+## 6.1.1 (2019-02-27)
+
+### Bug fixes
+
+Fix bug that caused parsing default exports of with names to fail.
+
+## 6.1.0 (2019-02-08)
+
+### Bug fixes
+
+Fix scope checking when redefining a `var` as a lexical binding.
+
+### New features
+
+Split up `parseSubscripts` to use an internal `parseSubscript` method to make it easier to extend with plugins.
+
+## 6.0.7 (2019-02-04)
+
+### Bug fixes
+
+Check that exported bindings are defined.
+
+Don't treat `\u180e` as a whitespace character.
+
+Check for duplicate parameter names in methods.
+
+Don't allow shorthand properties when they are generators or async methods.
+
+Forbid binding `await` in async arrow function's parameter list.
+
+## 6.0.6 (2019-01-30)
+
+### Bug fixes
+
+The content of class declarations and expressions is now always parsed in strict mode.
+
+Don't allow `let` or `const` to bind the variable name `let`.
+
+Treat class declarations as lexical.
+
+Don't allow a generator function declaration as the sole body of an `if` or `else`.
+
+Ignore `"use strict"` when after an empty statement.
+
+Allow string line continuations with special line terminator characters.
+
+Treat `for` bodies as part of the `for` scope when checking for conflicting bindings.
+
+Fix bug with parsing `yield` in a `for` loop initializer.
+
+Implement special cases around scope checking for functions.
+
+## 6.0.5 (2019-01-02)
+
+### Bug fixes
+
+Fix TypeScript type for `Parser.extend` and add `allowAwaitOutsideFunction` to options type.
+
+Don't treat `let` as a keyword when the next token is `{` on the next line.
+
+Fix bug that broke checking for parentheses around an object pattern in a destructuring assignment when `preserveParens` was on.
+
+## 6.0.4 (2018-11-05)
+
+### Bug fixes
+
+Further improvements to tokenizing regular expressions in corner cases.
+
+## 6.0.3 (2018-11-04)
+
+### Bug fixes
+
+Fix bug in tokenizing an expression-less return followed by a function followed by a regular expression.
+
+Remove stray symlink in the package tarball.
+
+## 6.0.2 (2018-09-26)
+
+### Bug fixes
+
+Fix bug where default expressions could fail to parse inside an object destructuring assignment expression.
+
+## 6.0.1 (2018-09-14)
+
+### Bug fixes
+
+Fix wrong value in `version` export.
+
+## 6.0.0 (2018-09-14)
+
+### Bug fixes
+
+Better handle variable-redefinition checks for catch bindings and functions directly under if statements.
+
+Forbid `new.target` in top-level arrow functions.
+
+Fix issue with parsing a regexp after `yield` in some contexts.
+
+### New features
+
+The package now comes with TypeScript definitions.
+
+### Breaking changes
+
+The default value of the `ecmaVersion` option is now 9 (2018).
+
+Plugins work differently, and will have to be rewritten to work with this version.
+
+The loose parser and walker have been moved into separate packages (`acorn-loose` and `acorn-walk`).
+
+## 5.7.3 (2018-09-10)
+
+### Bug fixes
+
+Fix failure to tokenize regexps after expressions like `x.of`.
+
+Better error message for unterminated template literals.
+
+## 5.7.2 (2018-08-24)
+
+### Bug fixes
+
+Properly handle `allowAwaitOutsideFunction` in for statements.
+
+Treat function declarations at the top level of modules like let bindings.
+
+Don't allow async function declarations as the only statement under a label.
+
+## 5.7.0 (2018-06-15)
+
+### New features
+
+Upgraded to Unicode 11.
+
+## 5.6.0 (2018-05-31)
+
+### New features
+
+Allow U+2028 and U+2029 in string when ECMAVersion >= 10.
+
+Allow binding-less catch statements when ECMAVersion >= 10.
+
+Add `allowAwaitOutsideFunction` option for parsing top-level `await`.
+
+## 5.5.3 (2018-03-08)
+
+### Bug fixes
+
+A _second_ republish of the code in 5.5.1, this time with yarn, to hopefully get valid timestamps.
+
+## 5.5.2 (2018-03-08)
+
+### Bug fixes
+
+A republish of the code in 5.5.1 in an attempt to solve an issue with the file timestamps in the npm package being 0.
+
+## 5.5.1 (2018-03-06)
+
+### Bug fixes
+
+Fix misleading error message for octal escapes in template strings.
+
+## 5.5.0 (2018-02-27)
+
+### New features
+
+The identifier character categorization is now based on Unicode version 10.
+
+Acorn will now validate the content of regular expressions, including new ES9 features.
+
+## 5.4.0 (2018-02-01)
+
+### Bug fixes
+
+Disallow duplicate or escaped flags on regular expressions.
+
+Disallow octal escapes in strings in strict mode.
+
+### New features
+
+Add support for async iteration.
+
+Add support for object spread and rest.
+
+## 5.3.0 (2017-12-28)
+
+### Bug fixes
+
+Fix parsing of floating point literals with leading zeroes in loose mode.
+
+Allow duplicate property names in object patterns.
+
+Don't allow static class methods named `prototype`.
+
+Disallow async functions directly under `if` or `else`.
+
+Parse right-hand-side of `for`/`of` as an assignment expression.
+
+Stricter parsing of `for`/`in`.
+
+Don't allow unicode escapes in contextual keywords.
+
+### New features
+
+Parsing class members was factored into smaller methods to allow plugins to hook into it.
+
+## 5.2.1 (2017-10-30)
+
+### Bug fixes
+
+Fix a token context corruption bug.
+
+## 5.2.0 (2017-10-30)
+
+### Bug fixes
+
+Fix token context tracking for `class` and `function` in property-name position.
+
+Make sure `%*` isn't parsed as a valid operator.
+
+Allow shorthand properties `get` and `set` to be followed by default values.
+
+Disallow `super` when not in callee or object position.
+
+### New features
+
+Support [`directive` property](https://github.com/estree/estree/compare/b3de58c9997504d6fba04b72f76e6dd1619ee4eb...1da8e603237144f44710360f8feb7a9977e905e0) on directive expression statements.
+
+## 5.1.2 (2017-09-04)
+
+### Bug fixes
+
+Disable parsing of legacy HTML-style comments in modules.
+
+Fix parsing of async methods whose names are keywords.
+
+## 5.1.1 (2017-07-06)
+
+### Bug fixes
+
+Fix problem with disambiguating regexp and division after a class.
+
+## 5.1.0 (2017-07-05)
+
+### Bug fixes
+
+Fix tokenizing of regexps in an object-desctructuring `for`/`of` loop and after `yield`.
+
+Parse zero-prefixed numbers with non-octal digits as decimal.
+
+Allow object/array patterns in rest parameters.
+
+Don't error when `yield` is used as a property name.
+
+Allow `async` as a shorthand object property.
+
+### New features
+
+Implement the [template literal revision proposal](https://github.com/tc39/proposal-template-literal-revision) for ES9.
+
+## 5.0.3 (2017-04-01)
+
+### Bug fixes
+
+Fix spurious duplicate variable definition errors for named functions.
+
+## 5.0.2 (2017-03-30)
+
+### Bug fixes
+
+A binary operator after a parenthesized arrow expression is no longer incorrectly treated as an error.
+
+## 5.0.0 (2017-03-28)
+
+### Bug fixes
+
+Raise an error for duplicated lexical bindings.
+
+Fix spurious error when an assignement expression occurred after a spread expression.
+
+Accept regular expressions after `of` (in `for`/`of`), `yield` (in a generator), and braced arrow functions.
+
+Allow labels in front or `var` declarations, even in strict mode.
+
+### Breaking changes
+
+Parse declarations following `export default` as declaration nodes, not expressions. This means that class and function declarations nodes can now have `null` as their `id`.
+
+## 4.0.11 (2017-02-07)
+
+### Bug fixes
+
+Allow all forms of member expressions to be parenthesized as lvalue.
+
+## 4.0.10 (2017-02-07)
+
+### Bug fixes
+
+Don't expect semicolons after default-exported functions or classes, even when they are expressions.
+
+Check for use of `'use strict'` directives in non-simple parameter functions, even when already in strict mode.
+
+## 4.0.9 (2017-02-06)
+
+### Bug fixes
+
+Fix incorrect error raised for parenthesized simple assignment targets, so that `(x) = 1` parses again.
+
+## 4.0.8 (2017-02-03)
+
+### Bug fixes
+
+Solve spurious parenthesized pattern errors by temporarily erring on the side of accepting programs that our delayed errors don't handle correctly yet.
+
+## 4.0.7 (2017-02-02)
+
+### Bug fixes
+
+Accept invalidly rejected code like `(x).y = 2` again.
+
+Don't raise an error when a function _inside_ strict code has a non-simple parameter list.
+
+## 4.0.6 (2017-02-02)
+
+### Bug fixes
+
+Fix exponential behavior (manifesting itself as a complete hang for even relatively small source files) introduced by the new 'use strict' check.
+
+## 4.0.5 (2017-02-02)
+
+### Bug fixes
+
+Disallow parenthesized pattern expressions.
+
+Allow keywords as export names.
+
+Don't allow the `async` keyword to be parenthesized.
+
+Properly raise an error when a keyword contains a character escape.
+
+Allow `"use strict"` to appear after other string literal expressions.
+
+Disallow labeled declarations.
+
+## 4.0.4 (2016-12-19)
+
+### Bug fixes
+
+Fix crash when `export` was followed by a keyword that can't be
+exported.
+
+## 4.0.3 (2016-08-16)
+
+### Bug fixes
+
+Allow regular function declarations inside single-statement `if` branches in loose mode. Forbid them entirely in strict mode.
+
+Properly parse properties named `async` in ES2017 mode.
+
+Fix bug where reserved words were broken in ES2017 mode.
+
+## 4.0.2 (2016-08-11)
+
+### Bug fixes
+
+Don't ignore period or 'e' characters after octal numbers.
+
+Fix broken parsing for call expressions in default parameter values of arrow functions.
+
+## 4.0.1 (2016-08-08)
+
+### Bug fixes
+
+Fix false positives in duplicated export name errors.
+
+## 4.0.0 (2016-08-07)
+
+### Breaking changes
+
+The default `ecmaVersion` option value is now 7.
+
+A number of internal method signatures changed, so plugins might need to be updated.
+
+### Bug fixes
+
+The parser now raises errors on duplicated export names.
+
+`arguments` and `eval` can now be used in shorthand properties.
+
+Duplicate parameter names in non-simple argument lists now always produce an error.
+
+### New features
+
+The `ecmaVersion` option now also accepts year-style version numbers
+(2015, etc).
+
+Support for `async`/`await` syntax when `ecmaVersion` is >= 8.
+
+Support for trailing commas in call expressions when `ecmaVersion` is >= 8.
+
+## 3.3.0 (2016-07-25)
+
+### Bug fixes
+
+Fix bug in tokenizing of regexp operator after a function declaration.
+
+Fix parser crash when parsing an array pattern with a hole.
+
+### New features
+
+Implement check against complex argument lists in functions that enable strict mode in ES7.
+
+## 3.2.0 (2016-06-07)
+
+### Bug fixes
+
+Improve handling of lack of unicode regexp support in host
+environment.
+
+Properly reject shorthand properties whose name is a keyword.
+
+### New features
+
+Visitors created with `visit.make` now have their base as _prototype_, rather than copying properties into a fresh object.
+
+## 3.1.0 (2016-04-18)
+
+### Bug fixes
+
+Properly tokenize the division operator directly after a function expression.
+
+Allow trailing comma in destructuring arrays.
+
+## 3.0.4 (2016-02-25)
+
+### Fixes
+
+Allow update expressions as left-hand-side of the ES7 exponential operator.
+
+## 3.0.2 (2016-02-10)
+
+### Fixes
+
+Fix bug that accidentally made `undefined` a reserved word when parsing ES7.
+
+## 3.0.0 (2016-02-10)
+
+### Breaking changes
+
+The default value of the `ecmaVersion` option is now 6 (used to be 5).
+
+Support for comprehension syntax (which was dropped from the draft spec) has been removed.
+
+### Fixes
+
+`let` and `yield` are now “contextual keywords”, meaning you can mostly use them as identifiers in ES5 non-strict code.
+
+A parenthesized class or function expression after `export default` is now parsed correctly.
+
+### New features
+
+When `ecmaVersion` is set to 7, Acorn will parse the exponentiation operator (`**`).
+
+The identifier character ranges are now based on Unicode 8.0.0.
+
+Plugins can now override the `raiseRecoverable` method to override the way non-critical errors are handled.
+
+## 2.7.0 (2016-01-04)
+
+### Fixes
+
+Stop allowing rest parameters in setters.
+
+Disallow `y` rexexp flag in ES5.
+
+Disallow `\00` and `\000` escapes in strict mode.
+
+Raise an error when an import name is a reserved word.
+
+## 2.6.2 (2015-11-10)
+
+### Fixes
+
+Don't crash when no options object is passed.
+
+## 2.6.0 (2015-11-09)
+
+### Fixes
+
+Add `await` as a reserved word in module sources.
+
+Disallow `yield` in a parameter default value for a generator.
+
+Forbid using a comma after a rest pattern in an array destructuring.
+
+### New features
+
+Support parsing stdin in command-line tool.
+
+## 2.5.0 (2015-10-27)
+
+### Fixes
+
+Fix tokenizer support in the command-line tool.
+
+Stop allowing `new.target` outside of functions.
+
+Remove legacy `guard` and `guardedHandler` properties from try nodes.
+
+Stop allowing multiple `__proto__` properties on an object literal in strict mode.
+
+Don't allow rest parameters to be non-identifier patterns.
+
+Check for duplicate paramter names in arrow functions.
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/LICENSE b/tools/tests/apps/modules-modern/imports/links/acorn/LICENSE
new file mode 100644
index 0000000000..2c0632b6a7
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2012-2018 by various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/README.md b/tools/tests/apps/modules-modern/imports/links/acorn/README.md
new file mode 100644
index 0000000000..585f2736fc
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/README.md
@@ -0,0 +1,270 @@
+# Acorn
+
+A tiny, fast JavaScript parser written in JavaScript.
+
+## Community
+
+Acorn is open source software released under an
+[MIT license](https://github.com/acornjs/acorn/blob/master/acorn/LICENSE).
+
+You are welcome to
+[report bugs](https://github.com/acornjs/acorn/issues) or create pull
+requests on [github](https://github.com/acornjs/acorn). For questions
+and discussion, please use the
+[Tern discussion forum](https://discuss.ternjs.net).
+
+## Installation
+
+The easiest way to install acorn is from [`npm`](https://www.npmjs.com/):
+
+```sh
+npm install acorn
+```
+
+Alternately, you can download the source and build acorn yourself:
+
+```sh
+git clone https://github.com/acornjs/acorn.git
+cd acorn
+npm install
+```
+
+## Interface
+
+**parse**`(input, options)` is the main interface to the library. The
+`input` parameter is a string, `options` can be undefined or an object
+setting some of the options listed below. The return value will be an
+abstract syntax tree object as specified by the [ESTree
+spec](https://github.com/estree/estree).
+
+```javascript
+let acorn = require("acorn");
+console.log(acorn.parse("1 + 1"));
+```
+
+When encountering a syntax error, the parser will raise a
+`SyntaxError` object with a meaningful message. The error object will
+have a `pos` property that indicates the string offset at which the
+error occurred, and a `loc` object that contains a `{line, column}`
+object referring to that same position.
+
+Options can be provided by passing a second argument, which should be
+an object containing any of these fields:
+
+- **ecmaVersion**: Indicates the ECMAScript version to parse. Must be
+  either 3, 5, 6 (2015), 7 (2016), 8 (2017), 9 (2018), 10 (2019) or 11
+  (2020, partial support). This influences support for strict mode,
+  the set of reserved words, and support for new syntax features.
+  Default is 10.
+
+  **NOTE**: Only 'stage 4' (finalized) ECMAScript features are being
+  implemented by Acorn. Other proposed new features can be implemented
+  through plugins.
+
+- **sourceType**: Indicate the mode the code should be parsed in. Can be
+  either `"script"` or `"module"`. This influences global strict mode
+  and parsing of `import` and `export` declarations.
+
+  **NOTE**: If set to `"module"`, then static `import` / `export` syntax
+  will be valid, even if `ecmaVersion` is less than 6.
+
+- **onInsertedSemicolon**: If given a callback, that callback will be
+  called whenever a missing semicolon is inserted by the parser. The
+  callback will be given the character offset of the point where the
+  semicolon is inserted as argument, and if `locations` is on, also a
+  `{line, column}` object representing this position.
+
+- **onTrailingComma**: Like `onInsertedSemicolon`, but for trailing
+  commas.
+
+- **allowReserved**: If `false`, using a reserved word will generate
+  an error. Defaults to `true` for `ecmaVersion` 3, `false` for higher
+  versions. When given the value `"never"`, reserved words and
+  keywords can also not be used as property names (as in Internet
+  Explorer's old parser).
+
+- **allowReturnOutsideFunction**: By default, a return statement at
+  the top level raises an error. Set this to `true` to accept such
+  code.
+
+- **allowImportExportEverywhere**: By default, `import` and `export`
+  declarations can only appear at a program's top level. Setting this
+  option to `true` allows them anywhere where a statement is allowed.
+  
+- **allowAwaitOutsideFunction**: By default, `await` expressions can
+  only appear inside `async` functions. Setting this option to
+  `true` allows to have top-level `await` expressions. They are
+  still not allowed in non-`async` functions, though.
+
+- **allowHashBang**: When this is enabled (off by default), if the
+  code starts with the characters `#!` (as in a shellscript), the
+  first line will be treated as a comment.
+
+- **locations**: When `true`, each node has a `loc` object attached
+  with `start` and `end` subobjects, each of which contains the
+  one-based line and zero-based column numbers in `{line, column}`
+  form. Default is `false`.
+
+- **onToken**: If a function is passed for this option, each found
+  token will be passed in same format as tokens returned from
+  `tokenizer().getToken()`.
+
+  If array is passed, each found token is pushed to it.
+
+  Note that you are not allowed to call the parser from the
+  callback—that will corrupt its internal state.
+
+- **onComment**: If a function is passed for this option, whenever a
+  comment is encountered the function will be called with the
+  following parameters:
+
+  - `block`: `true` if the comment is a block comment, false if it
+    is a line comment.
+  - `text`: The content of the comment.
+  - `start`: Character offset of the start of the comment.
+  - `end`: Character offset of the end of the comment.
+
+  When the `locations` options is on, the `{line, column}` locations
+  of the comment’s start and end are passed as two additional
+  parameters.
+
+  If array is passed for this option, each found comment is pushed
+  to it as object in Esprima format:
+
+  ```javascript
+  {
+    "type": "Line" | "Block",
+    "value": "comment text",
+    "start": Number,
+    "end": Number,
+    // If `locations` option is on:
+    "loc": {
+      "start": {line: Number, column: Number}
+      "end": {line: Number, column: Number}
+    },
+    // If `ranges` option is on:
+    "range": [Number, Number]
+  }
+  ```
+
+  Note that you are not allowed to call the parser from the
+  callback—that will corrupt its internal state.
+
+- **ranges**: Nodes have their start and end characters offsets
+  recorded in `start` and `end` properties (directly on the node,
+  rather than the `loc` object, which holds line/column data. To also
+  add a
+  [semi-standardized](https://bugzilla.mozilla.org/show_bug.cgi?id=745678)
+  `range` property holding a `[start, end]` array with the same
+  numbers, set the `ranges` option to `true`.
+
+- **program**: It is possible to parse multiple files into a single
+  AST by passing the tree produced by parsing the first file as the
+  `program` option in subsequent parses. This will add the toplevel
+  forms of the parsed file to the "Program" (top) node of an existing
+  parse tree.
+
+- **sourceFile**: When the `locations` option is `true`, you can pass
+  this option to add a `source` attribute in every node’s `loc`
+  object. Note that the contents of this option are not examined or
+  processed in any way; you are free to use whatever format you
+  choose.
+
+- **directSourceFile**: Like `sourceFile`, but a `sourceFile` property
+  will be added (regardless of the `location` option) directly to the
+  nodes, rather than the `loc` object.
+
+- **preserveParens**: If this option is `true`, parenthesized expressions
+  are represented by (non-standard) `ParenthesizedExpression` nodes
+  that have a single `expression` property containing the expression
+  inside parentheses.
+
+**parseExpressionAt**`(input, offset, options)` will parse a single
+expression in a string, and return its AST. It will not complain if
+there is more of the string left after the expression.
+
+**tokenizer**`(input, options)` returns an object with a `getToken`
+method that can be called repeatedly to get the next token, a `{start,
+end, type, value}` object (with added `loc` property when the
+`locations` option is enabled and `range` property when the `ranges`
+option is enabled). When the token's type is `tokTypes.eof`, you
+should stop calling the method, since it will keep returning that same
+token forever.
+
+In ES6 environment, returned result can be used as any other
+protocol-compliant iterable:
+
+```javascript
+for (let token of acorn.tokenizer(str)) {
+  // iterate over the tokens
+}
+
+// transform code to array of tokens:
+var tokens = [...acorn.tokenizer(str)];
+```
+
+**tokTypes** holds an object mapping names to the token type objects
+that end up in the `type` properties of tokens.
+
+**getLineInfo**`(input, offset)` can be used to get a `{line,
+column}` object for a given program string and offset.
+
+### The `Parser` class
+
+Instances of the **`Parser`** class contain all the state and logic
+that drives a parse. It has static methods `parse`,
+`parseExpressionAt`, and `tokenizer` that match the top-level
+functions by the same name.
+
+When extending the parser with plugins, you need to call these methods
+on the extended version of the class. To extend a parser with plugins,
+you can use its static `extend` method.
+
+```javascript
+var acorn = require("acorn");
+var jsx = require("acorn-jsx");
+var JSXParser = acorn.Parser.extend(jsx());
+JSXParser.parse("foo(<bar/>)");
+```
+
+The `extend` method takes any number of plugin values, and returns a
+new `Parser` class that includes the extra parser logic provided by
+the plugins.
+
+## Command line interface
+
+The `bin/acorn` utility can be used to parse a file from the command
+line. It accepts as arguments its input file and the following
+options:
+
+- `--ecma3|--ecma5|--ecma6|--ecma7|--ecma8|--ecma9|--ecma10`: Sets the ECMAScript version
+  to parse. Default is version 9.
+
+- `--module`: Sets the parsing mode to `"module"`. Is set to `"script"` otherwise.
+
+- `--locations`: Attaches a "loc" object to each node with "start" and
+  "end" subobjects, each of which contains the one-based line and
+  zero-based column numbers in `{line, column}` form.
+
+- `--allow-hash-bang`: If the code starts with the characters #! (as
+  in a shellscript), the first line will be treated as a comment.
+
+- `--compact`: No whitespace is used in the AST output.
+
+- `--silent`: Do not output the AST, just return the exit status.
+
+- `--help`: Print the usage information and quit.
+
+The utility spits out the syntax tree as JSON data.
+
+## Existing plugins
+
+ - [`acorn-jsx`](https://github.com/RReverser/acorn-jsx): Parse [Facebook JSX syntax extensions](https://github.com/facebook/jsx)
+ 
+Plugins for ECMAScript proposals:
+ 
+ - [`acorn-stage3`](https://github.com/acornjs/acorn-stage3): Parse most stage 3 proposals, bundling:
+   - [`acorn-class-fields`](https://github.com/acornjs/acorn-class-fields): Parse [class fields proposal](https://github.com/tc39/proposal-class-fields)
+   - [`acorn-import-meta`](https://github.com/acornjs/acorn-import-meta): Parse [import.meta proposal](https://github.com/tc39/proposal-import-meta)
+   - [`acorn-numeric-separator`](https://github.com/acornjs/acorn-numeric-separator): Parse [numeric separator proposal](https://github.com/tc39/proposal-numeric-separator)
+   - [`acorn-private-methods`](https://github.com/acornjs/acorn-private-methods): parse [private methods, getters and setters proposal](https://github.com/tc39/proposal-private-methods)n
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/package.json b/tools/tests/apps/modules-modern/imports/links/acorn/package.json
new file mode 100644
index 0000000000..ad2b4564c2
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "acorn",
+  "description": "ECMAScript parser",
+  "homepage": "https://github.com/acornjs/acorn",
+  "module": "src/index.js",
+  "version": "7.1.1",
+  "engines": {"node": ">=0.4.0"},
+  "maintainers": [
+    {
+      "name": "Marijn Haverbeke",
+      "email": "marijnh@gmail.com",
+      "web": "https://marijnhaverbeke.nl"
+    },
+    {
+      "name": "Ingvar Stepanyan",
+      "email": "me@rreverser.com",
+      "web": "https://rreverser.com/"
+    },
+    {
+      "name": "Adrian Heine",
+      "web": "http://adrianheine.de"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/acornjs/acorn.git"
+  },
+  "license": "MIT"
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/.eslintrc b/tools/tests/apps/modules-modern/imports/links/acorn/src/.eslintrc
new file mode 100644
index 0000000000..181c1b3692
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/.eslintrc
@@ -0,0 +1,34 @@
+{
+    "extends": [
+        "eslint:recommended",
+        "standard",
+        "plugin:import/errors",
+        "plugin:import/warnings"
+    ],
+    "rules": {
+        "curly": "off",
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
+        "indent": ["error", 2, { "SwitchCase": 0, "VariableDeclarator": 2, "CallExpression": { "arguments": "off" } }],
+        "new-parens": "off",
+        "no-case-declarations": "off",
+        "no-cond-assign": "off",
+        "no-fallthrough": "off",
+        "no-labels": "off",
+        "no-mixed-operators": "off",
+        "no-return-assign": "off",
+        "no-unused-labels": "error",
+        "no-var": "error",
+        "object-curly-spacing": ["error", "never"],
+        "one-var": "off",
+        "quotes": ["error", "double"],
+        "semi-spacing": "off",
+        "space-before-function-paren": ["error", "never"]
+    },
+    "globals": {
+        "Packages": false,
+        "BigInt": false
+    },
+    "plugins": [
+        "import"
+    ]
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/.eslintrc b/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/.eslintrc
new file mode 100644
index 0000000000..2598b25f5f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "extends": "../.eslintrc",
+    "rules": {
+        "no-console": "off"
+    }
+}
\ No newline at end of file
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/acorn.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/acorn.js
new file mode 100644
index 0000000000..9a6712c874
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/bin/acorn.js
@@ -0,0 +1,62 @@
+import {basename} from "path"
+import {readFileSync as readFile} from "fs"
+import * as acorn from "acorn"
+
+let infile, forceFile, silent = false, compact = false, tokenize = false
+const options = {}
+
+function help(status) {
+  const print = (status === 0) ? console.log : console.error
+  print("usage: " + basename(process.argv[1]) + " [--ecma3|--ecma5|--ecma6|--ecma7|--ecma8|--ecma9|...|--ecma2015|--ecma2016|--ecma2017|--ecma2018|...]")
+  print("        [--tokenize] [--locations] [---allow-hash-bang] [--compact] [--silent] [--module] [--help] [--] [infile]")
+  process.exit(status)
+}
+
+for (let i = 2; i < process.argv.length; ++i) {
+  const arg = process.argv[i]
+  if ((arg === "-" || arg[0] !== "-") && !infile) infile = arg
+  else if (arg === "--" && !infile && i + 2 === process.argv.length) forceFile = infile = process.argv[++i]
+  else if (arg === "--locations") options.locations = true
+  else if (arg === "--allow-hash-bang") options.allowHashBang = true
+  else if (arg === "--silent") silent = true
+  else if (arg === "--compact") compact = true
+  else if (arg === "--help") help(0)
+  else if (arg === "--tokenize") tokenize = true
+  else if (arg === "--module") options.sourceType = "module"
+  else {
+    let match = arg.match(/^--ecma(\d+)$/)
+    if (match)
+      options.ecmaVersion = +match[1]
+    else
+      help(1)
+  }
+}
+
+function run(code) {
+  let result
+  try {
+    if (!tokenize) {
+      result = acorn.parse(code, options)
+    } else {
+      result = []
+      let tokenizer = acorn.tokenizer(code, options), token
+      do {
+        token = tokenizer.getToken()
+        result.push(token)
+      } while (token.type !== acorn.tokTypes.eof)
+    }
+  } catch (e) {
+    console.error(infile && infile !== "-" ? e.message.replace(/\(\d+:\d+\)$/, m => m.slice(0, 1) + infile + " " + m.slice(1)) : e.message)
+    process.exit(1)
+  }
+  if (!silent) console.log(JSON.stringify(result, null, compact ? null : 2))
+}
+
+if (forceFile || infile && infile !== "-") {
+  run(readFile(infile, "utf8"))
+} else {
+  let code = ""
+  process.stdin.resume()
+  process.stdin.on("data", chunk => code += chunk)
+  process.stdin.on("end", () => run(code))
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/expression.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/expression.js
new file mode 100644
index 0000000000..a50ea7531e
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/expression.js
@@ -0,0 +1,969 @@
+// A recursive descent parser operates by defining functions for all
+// syntactic elements, and recursively calling those, each function
+// advancing the input stream and returning an AST node. Precedence
+// of constructs (for example, the fact that `!x[1]` means `!(x[1])`
+// instead of `(!x)[1]` is handled by the fact that the parser
+// function that parses unary prefix operators is called first, and
+// in turn calls the function that parses `[]` subscripts — that
+// way, it'll receive the node for `x[1]` already parsed, and wraps
+// *that* in the unary operator node.
+//
+// Acorn uses an [operator precedence parser][opp] to handle binary
+// operator precedence, because it is much more compact than using
+// the technique outlined above, which uses different, nesting
+// functions to specify precedence, for all of the ten binary
+// precedence levels that JavaScript defines.
+//
+// [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
+
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {DestructuringErrors} from "./parseutil"
+import {lineBreak} from "./whitespace"
+import {functionFlags, SCOPE_ARROW, SCOPE_SUPER, SCOPE_DIRECT_SUPER, BIND_OUTSIDE, BIND_VAR} from "./scopeflags"
+
+const pp = Parser.prototype
+
+// Check if property name clashes with already added.
+// Object/class getters and setters are not allowed to clash —
+// either with each other or with an init property — and in
+// strict mode, init properties are also not allowed to be repeated.
+
+pp.checkPropClash = function(prop, propHash, refDestructuringErrors) {
+  if (this.options.ecmaVersion >= 9 && prop.type === "SpreadElement")
+    return
+  if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand))
+    return
+  let {key} = prop, name
+  switch (key.type) {
+  case "Identifier": name = key.name; break
+  case "Literal": name = String(key.value); break
+  default: return
+  }
+  let {kind} = prop
+  if (this.options.ecmaVersion >= 6) {
+    if (name === "__proto__" && kind === "init") {
+      if (propHash.proto) {
+        if (refDestructuringErrors) {
+          if (refDestructuringErrors.doubleProto < 0)
+            refDestructuringErrors.doubleProto = key.start
+          // Backwards-compat kludge. Can be removed in version 6.0
+        } else this.raiseRecoverable(key.start, "Redefinition of __proto__ property")
+      }
+      propHash.proto = true
+    }
+    return
+  }
+  name = "$" + name
+  let other = propHash[name]
+  if (other) {
+    let redefinition
+    if (kind === "init") {
+      redefinition = this.strict && other.init || other.get || other.set
+    } else {
+      redefinition = other.init || other[kind]
+    }
+    if (redefinition)
+      this.raiseRecoverable(key.start, "Redefinition of property")
+  } else {
+    other = propHash[name] = {
+      init: false,
+      get: false,
+      set: false
+    }
+  }
+  other[kind] = true
+}
+
+// ### Expression parsing
+
+// These nest, from the most general expression type at the top to
+// 'atomic', nondivisible expression types at the bottom. Most of
+// the functions will simply let the function(s) below them parse,
+// and, *if* the syntactic construct they handle is present, wrap
+// the AST node that the inner parser gave them in another node.
+
+// Parse a full expression. The optional arguments are used to
+// forbid the `in` operator (in for loops initalization expressions)
+// and provide reference for storing '=' operator inside shorthand
+// property assignment in contexts where both object expression
+// and object pattern might appear (so it's possible to raise
+// delayed syntax error at correct position).
+
+pp.parseExpression = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseMaybeAssign(noIn, refDestructuringErrors)
+  if (this.type === tt.comma) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.expressions = [expr]
+    while (this.eat(tt.comma)) node.expressions.push(this.parseMaybeAssign(noIn, refDestructuringErrors))
+    return this.finishNode(node, "SequenceExpression")
+  }
+  return expr
+}
+
+// Parse an assignment expression. This includes applications of
+// operators like `+=`.
+
+pp.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) {
+  if (this.isContextual("yield")) {
+    if (this.inGenerator) return this.parseYield(noIn)
+    // The tokenizer will assume an expression is allowed after
+    // `yield`, but this isn't that kind of yield
+    else this.exprAllowed = false
+  }
+
+  let ownDestructuringErrors = false, oldParenAssign = -1, oldTrailingComma = -1
+  if (refDestructuringErrors) {
+    oldParenAssign = refDestructuringErrors.parenthesizedAssign
+    oldTrailingComma = refDestructuringErrors.trailingComma
+    refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = -1
+  } else {
+    refDestructuringErrors = new DestructuringErrors
+    ownDestructuringErrors = true
+  }
+
+  let startPos = this.start, startLoc = this.startLoc
+  if (this.type === tt.parenL || this.type === tt.name)
+    this.potentialArrowAt = this.start
+  let left = this.parseMaybeConditional(noIn, refDestructuringErrors)
+  if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc)
+  if (this.type.isAssign) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.operator = this.value
+    node.left = this.type === tt.eq ? this.toAssignable(left, false, refDestructuringErrors) : left
+    if (!ownDestructuringErrors) {
+      refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = refDestructuringErrors.doubleProto = -1
+    }
+    if (refDestructuringErrors.shorthandAssign >= node.left.start)
+      refDestructuringErrors.shorthandAssign = -1 // reset because shorthand default was used correctly
+    this.checkLVal(left)
+    this.next()
+    node.right = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "AssignmentExpression")
+  } else {
+    if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  if (oldParenAssign > -1) refDestructuringErrors.parenthesizedAssign = oldParenAssign
+  if (oldTrailingComma > -1) refDestructuringErrors.trailingComma = oldTrailingComma
+  return left
+}
+
+// Parse a ternary conditional (`?:`) operator.
+
+pp.parseMaybeConditional = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseExprOps(noIn, refDestructuringErrors)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  if (this.eat(tt.question)) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.test = expr
+    node.consequent = this.parseMaybeAssign()
+    this.expect(tt.colon)
+    node.alternate = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "ConditionalExpression")
+  }
+  return expr
+}
+
+// Start the precedence parser.
+
+pp.parseExprOps = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseMaybeUnary(refDestructuringErrors, false)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  return expr.start === startPos && expr.type === "ArrowFunctionExpression" ? expr : this.parseExprOp(expr, startPos, startLoc, -1, noIn)
+}
+
+// Parse binary operators with the operator precedence parsing
+// algorithm. `left` is the left-hand side of the operator.
+// `minPrec` provides context that allows the function to stop and
+// defer further parser to one of its callers when it encounters an
+// operator that has a lower precedence than the set it is parsing.
+
+pp.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {
+  let prec = this.type.binop
+  if (prec != null && (!noIn || this.type !== tt._in)) {
+    if (prec > minPrec) {
+      let logical = this.type === tt.logicalOR || this.type === tt.logicalAND
+      let op = this.value
+      this.next()
+      let startPos = this.start, startLoc = this.startLoc
+      let right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn)
+      let node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical)
+      return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn)
+    }
+  }
+  return left
+}
+
+pp.buildBinary = function(startPos, startLoc, left, right, op, logical) {
+  let node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.operator = op
+  node.right = right
+  return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression")
+}
+
+// Parse unary operators, both prefix and postfix.
+
+pp.parseMaybeUnary = function(refDestructuringErrors, sawUnary) {
+  let startPos = this.start, startLoc = this.startLoc, expr
+  if (this.isContextual("await") && (this.inAsync || (!this.inFunction && this.options.allowAwaitOutsideFunction))) {
+    expr = this.parseAwait()
+    sawUnary = true
+  } else if (this.type.prefix) {
+    let node = this.startNode(), update = this.type === tt.incDec
+    node.operator = this.value
+    node.prefix = true
+    this.next()
+    node.argument = this.parseMaybeUnary(null, true)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    if (update) this.checkLVal(node.argument)
+    else if (this.strict && node.operator === "delete" &&
+             node.argument.type === "Identifier")
+      this.raiseRecoverable(node.start, "Deleting local variable in strict mode")
+    else sawUnary = true
+    expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+  } else {
+    expr = this.parseExprSubscripts(refDestructuringErrors)
+    if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+    while (this.type.postfix && !this.canInsertSemicolon()) {
+      let node = this.startNodeAt(startPos, startLoc)
+      node.operator = this.value
+      node.prefix = false
+      node.argument = expr
+      this.checkLVal(expr)
+      this.next()
+      expr = this.finishNode(node, "UpdateExpression")
+    }
+  }
+
+  if (!sawUnary && this.eat(tt.starstar))
+    return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false)
+  else
+    return expr
+}
+
+// Parse call, dot, and `[]`-subscript expressions.
+
+pp.parseExprSubscripts = function(refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseExprAtom(refDestructuringErrors)
+  if (expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")")
+    return expr
+  let result = this.parseSubscripts(expr, startPos, startLoc)
+  if (refDestructuringErrors && result.type === "MemberExpression") {
+    if (refDestructuringErrors.parenthesizedAssign >= result.start) refDestructuringErrors.parenthesizedAssign = -1
+    if (refDestructuringErrors.parenthesizedBind >= result.start) refDestructuringErrors.parenthesizedBind = -1
+  }
+  return result
+}
+
+pp.parseSubscripts = function(base, startPos, startLoc, noCalls) {
+  let maybeAsyncArrow = this.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" &&
+      this.lastTokEnd === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 &&
+      this.potentialArrowAt === base.start
+  while (true) {
+    let element = this.parseSubscript(base, startPos, startLoc, noCalls, maybeAsyncArrow)
+    if (element === base || element.type === "ArrowFunctionExpression") return element
+    base = element
+  }
+}
+
+pp.parseSubscript = function(base, startPos, startLoc, noCalls, maybeAsyncArrow) {
+  let computed = this.eat(tt.bracketL)
+  if (computed || this.eat(tt.dot)) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.object = base
+    node.property = computed ? this.parseExpression() : this.parseIdent(this.options.allowReserved !== "never")
+    node.computed = !!computed
+    if (computed) this.expect(tt.bracketR)
+    base = this.finishNode(node, "MemberExpression")
+  } else if (!noCalls && this.eat(tt.parenL)) {
+    let refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos
+    this.yieldPos = 0
+    this.awaitPos = 0
+    this.awaitIdentPos = 0
+    let exprList = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false, refDestructuringErrors)
+    if (maybeAsyncArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+      this.checkPatternErrors(refDestructuringErrors, false)
+      this.checkYieldAwaitInDefaultParams()
+      if (this.awaitIdentPos > 0)
+        this.raise(this.awaitIdentPos, "Cannot use 'await' as identifier inside an async function")
+      this.yieldPos = oldYieldPos
+      this.awaitPos = oldAwaitPos
+      this.awaitIdentPos = oldAwaitIdentPos
+      return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, true)
+    }
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    this.yieldPos = oldYieldPos || this.yieldPos
+    this.awaitPos = oldAwaitPos || this.awaitPos
+    this.awaitIdentPos = oldAwaitIdentPos || this.awaitIdentPos
+    let node = this.startNodeAt(startPos, startLoc)
+    node.callee = base
+    node.arguments = exprList
+    base = this.finishNode(node, "CallExpression")
+  } else if (this.type === tt.backQuote) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.tag = base
+    node.quasi = this.parseTemplate({isTagged: true})
+    base = this.finishNode(node, "TaggedTemplateExpression")
+  }
+  return base
+}
+
+// Parse an atomic expression — either a single token that is an
+// expression, an expression started by a keyword like `function` or
+// `new`, or an expression wrapped in punctuation like `()`, `[]`,
+// or `{}`.
+
+pp.parseExprAtom = function(refDestructuringErrors) {
+  // If a division operator appears in an expression position, the
+  // tokenizer got confused, and we force it to read a regexp instead.
+  if (this.type === tt.slash) this.readRegexp()
+
+  let node, canBeArrow = this.potentialArrowAt === this.start
+  switch (this.type) {
+  case tt._super:
+    if (!this.allowSuper)
+      this.raise(this.start, "'super' keyword outside a method")
+    node = this.startNode()
+    this.next()
+    if (this.type === tt.parenL && !this.allowDirectSuper)
+      this.raise(node.start, "super() call outside constructor of a subclass")
+    // The `super` keyword can appear at below:
+    // SuperProperty:
+    //     super [ Expression ]
+    //     super . IdentifierName
+    // SuperCall:
+    //     super ( Arguments )
+    if (this.type !== tt.dot && this.type !== tt.bracketL && this.type !== tt.parenL)
+      this.unexpected()
+    return this.finishNode(node, "Super")
+
+  case tt._this:
+    node = this.startNode()
+    this.next()
+    return this.finishNode(node, "ThisExpression")
+
+  case tt.name:
+    let startPos = this.start, startLoc = this.startLoc, containsEsc = this.containsEsc
+    let id = this.parseIdent(false)
+    if (this.options.ecmaVersion >= 8 && !containsEsc && id.name === "async" && !this.canInsertSemicolon() && this.eat(tt._function))
+      return this.parseFunction(this.startNodeAt(startPos, startLoc), 0, false, true)
+    if (canBeArrow && !this.canInsertSemicolon()) {
+      if (this.eat(tt.arrow))
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false)
+      if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === tt.name && !containsEsc) {
+        id = this.parseIdent(false)
+        if (this.canInsertSemicolon() || !this.eat(tt.arrow))
+          this.unexpected()
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true)
+      }
+    }
+    return id
+
+  case tt.regexp:
+    let value = this.value
+    node = this.parseLiteral(value.value)
+    node.regex = {pattern: value.pattern, flags: value.flags}
+    return node
+
+  case tt.num: case tt.string:
+    return this.parseLiteral(this.value)
+
+  case tt._null: case tt._true: case tt._false:
+    node = this.startNode()
+    node.value = this.type === tt._null ? null : this.type === tt._true
+    node.raw = this.type.keyword
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt.parenL:
+    let start = this.start, expr = this.parseParenAndDistinguishExpression(canBeArrow)
+    if (refDestructuringErrors) {
+      if (refDestructuringErrors.parenthesizedAssign < 0 && !this.isSimpleAssignTarget(expr))
+        refDestructuringErrors.parenthesizedAssign = start
+      if (refDestructuringErrors.parenthesizedBind < 0)
+        refDestructuringErrors.parenthesizedBind = start
+    }
+    return expr
+
+  case tt.bracketL:
+    node = this.startNode()
+    this.next()
+    node.elements = this.parseExprList(tt.bracketR, true, true, refDestructuringErrors)
+    return this.finishNode(node, "ArrayExpression")
+
+  case tt.braceL:
+    return this.parseObj(false, refDestructuringErrors)
+
+  case tt._function:
+    node = this.startNode()
+    this.next()
+    return this.parseFunction(node, 0)
+
+  case tt._class:
+    return this.parseClass(this.startNode(), false)
+
+  case tt._new:
+    return this.parseNew()
+
+  case tt.backQuote:
+    return this.parseTemplate()
+
+  case tt._import:
+    if (this.options.ecmaVersion >= 11) {
+      return this.parseExprImport()
+    } else {
+      return this.unexpected()
+    }
+
+  default:
+    this.unexpected()
+  }
+}
+
+pp.parseExprImport = function() {
+  const node = this.startNode()
+  this.next() // skip `import`
+  switch (this.type) {
+  case tt.parenL:
+    return this.parseDynamicImport(node)
+  default:
+    this.unexpected()
+  }
+}
+
+pp.parseDynamicImport = function(node) {
+  this.next() // skip `(`
+
+  // Parse node.source.
+  node.source = this.parseMaybeAssign()
+
+  // Verify ending.
+  if (!this.eat(tt.parenR)) {
+    const errorPos = this.start
+    if (this.eat(tt.comma) && this.eat(tt.parenR)) {
+      this.raiseRecoverable(errorPos, "Trailing comma is not allowed in import()")
+    } else {
+      this.unexpected(errorPos)
+    }
+  }
+
+  return this.finishNode(node, "ImportExpression")
+}
+
+pp.parseLiteral = function(value) {
+  let node = this.startNode()
+  node.value = value
+  node.raw = this.input.slice(this.start, this.end)
+  if (node.raw.charCodeAt(node.raw.length - 1) === 110) node.bigint = node.raw.slice(0, -1)
+  this.next()
+  return this.finishNode(node, "Literal")
+}
+
+pp.parseParenExpression = function() {
+  this.expect(tt.parenL)
+  let val = this.parseExpression()
+  this.expect(tt.parenR)
+  return val
+}
+
+pp.parseParenAndDistinguishExpression = function(canBeArrow) {
+  let startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8
+  if (this.options.ecmaVersion >= 6) {
+    this.next()
+
+    let innerStartPos = this.start, innerStartLoc = this.startLoc
+    let exprList = [], first = true, lastIsComma = false
+    let refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart
+    this.yieldPos = 0
+    this.awaitPos = 0
+    // Do not save awaitIdentPos to allow checking awaits nested in parameters
+    while (this.type !== tt.parenR) {
+      first ? first = false : this.expect(tt.comma)
+      if (allowTrailingComma && this.afterTrailingComma(tt.parenR, true)) {
+        lastIsComma = true
+        break
+      } else if (this.type === tt.ellipsis) {
+        spreadStart = this.start
+        exprList.push(this.parseParenItem(this.parseRestBinding()))
+        if (this.type === tt.comma) this.raise(this.start, "Comma is not permitted after the rest element")
+        break
+      } else {
+        exprList.push(this.parseMaybeAssign(false, refDestructuringErrors, this.parseParenItem))
+      }
+    }
+    let innerEndPos = this.start, innerEndLoc = this.startLoc
+    this.expect(tt.parenR)
+
+    if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+      this.checkPatternErrors(refDestructuringErrors, false)
+      this.checkYieldAwaitInDefaultParams()
+      this.yieldPos = oldYieldPos
+      this.awaitPos = oldAwaitPos
+      return this.parseParenArrowList(startPos, startLoc, exprList)
+    }
+
+    if (!exprList.length || lastIsComma) this.unexpected(this.lastTokStart)
+    if (spreadStart) this.unexpected(spreadStart)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    this.yieldPos = oldYieldPos || this.yieldPos
+    this.awaitPos = oldAwaitPos || this.awaitPos
+
+    if (exprList.length > 1) {
+      val = this.startNodeAt(innerStartPos, innerStartLoc)
+      val.expressions = exprList
+      this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc)
+    } else {
+      val = exprList[0]
+    }
+  } else {
+    val = this.parseParenExpression()
+  }
+
+  if (this.options.preserveParens) {
+    let par = this.startNodeAt(startPos, startLoc)
+    par.expression = val
+    return this.finishNode(par, "ParenthesizedExpression")
+  } else {
+    return val
+  }
+}
+
+pp.parseParenItem = function(item) {
+  return item
+}
+
+pp.parseParenArrowList = function(startPos, startLoc, exprList) {
+  return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList)
+}
+
+// New's precedence is slightly tricky. It must allow its argument to
+// be a `[]` or dot subscript expression, but not a call — at least,
+// not without wrapping it in parentheses. Thus, it uses the noCalls
+// argument to parseSubscripts to prevent it from consuming the
+// argument list.
+
+const empty = []
+
+pp.parseNew = function() {
+  if (this.containsEsc) this.raiseRecoverable(this.start, "Escape sequence in keyword new")
+  let node = this.startNode()
+  let meta = this.parseIdent(true)
+  if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) {
+    node.meta = meta
+    let containsEsc = this.containsEsc
+    node.property = this.parseIdent(true)
+    if (node.property.name !== "target" || containsEsc)
+      this.raiseRecoverable(node.property.start, "The only valid meta property for new is new.target")
+    if (!this.inNonArrowFunction())
+      this.raiseRecoverable(node.start, "new.target can only be used in functions")
+    return this.finishNode(node, "MetaProperty")
+  }
+  let startPos = this.start, startLoc = this.startLoc, isImport = this.type === tt._import
+  node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true)
+  if (isImport && node.callee.type === "ImportExpression") {
+    this.raise(startPos, "Cannot use new with import()")
+  }
+  if (this.eat(tt.parenL)) node.arguments = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false)
+  else node.arguments = empty
+  return this.finishNode(node, "NewExpression")
+}
+
+// Parse template expression.
+
+pp.parseTemplateElement = function({isTagged}) {
+  let elem = this.startNode()
+  if (this.type === tt.invalidTemplate) {
+    if (!isTagged) {
+      this.raiseRecoverable(this.start, "Bad escape sequence in untagged template literal")
+    }
+    elem.value = {
+      raw: this.value,
+      cooked: null
+    }
+  } else {
+    elem.value = {
+      raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"),
+      cooked: this.value
+    }
+  }
+  this.next()
+  elem.tail = this.type === tt.backQuote
+  return this.finishNode(elem, "TemplateElement")
+}
+
+pp.parseTemplate = function({isTagged = false} = {}) {
+  let node = this.startNode()
+  this.next()
+  node.expressions = []
+  let curElt = this.parseTemplateElement({isTagged})
+  node.quasis = [curElt]
+  while (!curElt.tail) {
+    if (this.type === tt.eof) this.raise(this.pos, "Unterminated template literal")
+    this.expect(tt.dollarBraceL)
+    node.expressions.push(this.parseExpression())
+    this.expect(tt.braceR)
+    node.quasis.push(curElt = this.parseTemplateElement({isTagged}))
+  }
+  this.next()
+  return this.finishNode(node, "TemplateLiteral")
+}
+
+pp.isAsyncProp = function(prop) {
+  return !prop.computed && prop.key.type === "Identifier" && prop.key.name === "async" &&
+    (this.type === tt.name || this.type === tt.num || this.type === tt.string || this.type === tt.bracketL || this.type.keyword || (this.options.ecmaVersion >= 9 && this.type === tt.star)) &&
+    !lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+}
+
+// Parse an object literal or binding pattern.
+
+pp.parseObj = function(isPattern, refDestructuringErrors) {
+  let node = this.startNode(), first = true, propHash = {}
+  node.properties = []
+  this.next()
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.options.ecmaVersion >= 5 && this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    const prop = this.parseProperty(isPattern, refDestructuringErrors)
+    if (!isPattern) this.checkPropClash(prop, propHash, refDestructuringErrors)
+    node.properties.push(prop)
+  }
+  return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression")
+}
+
+pp.parseProperty = function(isPattern, refDestructuringErrors) {
+  let prop = this.startNode(), isGenerator, isAsync, startPos, startLoc
+  if (this.options.ecmaVersion >= 9 && this.eat(tt.ellipsis)) {
+    if (isPattern) {
+      prop.argument = this.parseIdent(false)
+      if (this.type === tt.comma) {
+        this.raise(this.start, "Comma is not permitted after the rest element")
+      }
+      return this.finishNode(prop, "RestElement")
+    }
+    // To disallow parenthesized identifier via `this.toAssignable()`.
+    if (this.type === tt.parenL && refDestructuringErrors) {
+      if (refDestructuringErrors.parenthesizedAssign < 0) {
+        refDestructuringErrors.parenthesizedAssign = this.start
+      }
+      if (refDestructuringErrors.parenthesizedBind < 0) {
+        refDestructuringErrors.parenthesizedBind = this.start
+      }
+    }
+    // Parse argument.
+    prop.argument = this.parseMaybeAssign(false, refDestructuringErrors)
+    // To disallow trailing comma via `this.toAssignable()`.
+    if (this.type === tt.comma && refDestructuringErrors && refDestructuringErrors.trailingComma < 0) {
+      refDestructuringErrors.trailingComma = this.start
+    }
+    // Finish
+    return this.finishNode(prop, "SpreadElement")
+  }
+  if (this.options.ecmaVersion >= 6) {
+    prop.method = false
+    prop.shorthand = false
+    if (isPattern || refDestructuringErrors) {
+      startPos = this.start
+      startLoc = this.startLoc
+    }
+    if (!isPattern)
+      isGenerator = this.eat(tt.star)
+  }
+  let containsEsc = this.containsEsc
+  this.parsePropertyName(prop)
+  if (!isPattern && !containsEsc && this.options.ecmaVersion >= 8 && !isGenerator && this.isAsyncProp(prop)) {
+    isAsync = true
+    isGenerator = this.options.ecmaVersion >= 9 && this.eat(tt.star)
+    this.parsePropertyName(prop, refDestructuringErrors)
+  } else {
+    isAsync = false
+  }
+  this.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc)
+  return this.finishNode(prop, "Property")
+}
+
+pp.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc) {
+  if ((isGenerator || isAsync) && this.type === tt.colon)
+    this.unexpected()
+
+  if (this.eat(tt.colon)) {
+    prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors)
+    prop.kind = "init"
+  } else if (this.options.ecmaVersion >= 6 && this.type === tt.parenL) {
+    if (isPattern) this.unexpected()
+    prop.kind = "init"
+    prop.method = true
+    prop.value = this.parseMethod(isGenerator, isAsync)
+  } else if (!isPattern && !containsEsc &&
+             this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" &&
+             (prop.key.name === "get" || prop.key.name === "set") &&
+             (this.type !== tt.comma && this.type !== tt.braceR)) {
+    if (isGenerator || isAsync) this.unexpected()
+    prop.kind = prop.key.name
+    this.parsePropertyName(prop)
+    prop.value = this.parseMethod(false)
+    let paramCount = prop.kind === "get" ? 0 : 1
+    if (prop.value.params.length !== paramCount) {
+      let start = prop.value.start
+      if (prop.kind === "get")
+        this.raiseRecoverable(start, "getter should have no params")
+      else
+        this.raiseRecoverable(start, "setter should have exactly one param")
+    } else {
+      if (prop.kind === "set" && prop.value.params[0].type === "RestElement")
+        this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params")
+    }
+  } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
+    if (isGenerator || isAsync) this.unexpected()
+    this.checkUnreserved(prop.key)
+    if (prop.key.name === "await" && !this.awaitIdentPos)
+      this.awaitIdentPos = startPos
+    prop.kind = "init"
+    if (isPattern) {
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else if (this.type === tt.eq && refDestructuringErrors) {
+      if (refDestructuringErrors.shorthandAssign < 0)
+        refDestructuringErrors.shorthandAssign = this.start
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else {
+      prop.value = prop.key
+    }
+    prop.shorthand = true
+  } else this.unexpected()
+}
+
+pp.parsePropertyName = function(prop) {
+  if (this.options.ecmaVersion >= 6) {
+    if (this.eat(tt.bracketL)) {
+      prop.computed = true
+      prop.key = this.parseMaybeAssign()
+      this.expect(tt.bracketR)
+      return prop.key
+    } else {
+      prop.computed = false
+    }
+  }
+  return prop.key = this.type === tt.num || this.type === tt.string ? this.parseExprAtom() : this.parseIdent(this.options.allowReserved !== "never")
+}
+
+// Initialize empty function node.
+
+pp.initFunction = function(node) {
+  node.id = null
+  if (this.options.ecmaVersion >= 6) node.generator = node.expression = false
+  if (this.options.ecmaVersion >= 8) node.async = false
+}
+
+// Parse object or class method.
+
+pp.parseMethod = function(isGenerator, isAsync, allowDirectSuper) {
+  let node = this.startNode(), oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos
+
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6)
+    node.generator = isGenerator
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  this.yieldPos = 0
+  this.awaitPos = 0
+  this.awaitIdentPos = 0
+  this.enterScope(functionFlags(isAsync, node.generator) | SCOPE_SUPER | (allowDirectSuper ? SCOPE_DIRECT_SUPER : 0))
+
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8)
+  this.checkYieldAwaitInDefaultParams()
+  this.parseFunctionBody(node, false, true)
+
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  this.awaitIdentPos = oldAwaitIdentPos
+  return this.finishNode(node, "FunctionExpression")
+}
+
+// Parse arrow function expression with given parameters.
+
+pp.parseArrowExpression = function(node, params, isAsync) {
+  let oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos
+
+  this.enterScope(functionFlags(isAsync, false) | SCOPE_ARROW)
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 8) node.async = !!isAsync
+
+  this.yieldPos = 0
+  this.awaitPos = 0
+  this.awaitIdentPos = 0
+
+  node.params = this.toAssignableList(params, true)
+  this.parseFunctionBody(node, true, false)
+
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  this.awaitIdentPos = oldAwaitIdentPos
+  return this.finishNode(node, "ArrowFunctionExpression")
+}
+
+// Parse function body and check parameters.
+
+pp.parseFunctionBody = function(node, isArrowFunction, isMethod) {
+  let isExpression = isArrowFunction && this.type !== tt.braceL
+  let oldStrict = this.strict, useStrict = false
+
+  if (isExpression) {
+    node.body = this.parseMaybeAssign()
+    node.expression = true
+    this.checkParams(node, false)
+  } else {
+    let nonSimple = this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params)
+    if (!oldStrict || nonSimple) {
+      useStrict = this.strictDirective(this.end)
+      // If this is a strict mode function, verify that argument names
+      // are not repeated, and it does not try to bind the words `eval`
+      // or `arguments`.
+      if (useStrict && nonSimple)
+        this.raiseRecoverable(node.start, "Illegal 'use strict' directive in function with non-simple parameter list")
+    }
+    // Start a new scope with regard to labels and the `inFunction`
+    // flag (restore them to their old value afterwards).
+    let oldLabels = this.labels
+    this.labels = []
+    if (useStrict) this.strict = true
+
+    // Add the params to varDeclaredNames to ensure that an error is thrown
+    // if a let/const declaration in the function clashes with one of the params.
+    this.checkParams(node, !oldStrict && !useStrict && !isArrowFunction && !isMethod && this.isSimpleParamList(node.params))
+    // Ensure the function name isn't a forbidden identifier in strict mode, e.g. 'eval'
+    if (this.strict && node.id) this.checkLVal(node.id, BIND_OUTSIDE)
+    node.body = this.parseBlock(false, undefined, useStrict && !oldStrict)
+    node.expression = false
+    this.adaptDirectivePrologue(node.body.body)
+    this.labels = oldLabels
+  }
+  this.exitScope()
+}
+
+pp.isSimpleParamList = function(params) {
+  for (let param of params)
+    if (param.type !== "Identifier") return false
+  return true
+}
+
+// Checks function params for various disallowed patterns such as using "eval"
+// or "arguments" and duplicate parameters.
+
+pp.checkParams = function(node, allowDuplicates) {
+  let nameHash = {}
+  for (let param of node.params)
+    this.checkLVal(param, BIND_VAR, allowDuplicates ? null : nameHash)
+}
+
+// Parses a comma-separated list of expressions, and returns them as
+// an array. `close` is the token type that ends the list, and
+// `allowEmpty` can be turned on to allow subsequent commas with
+// nothing in between them to be parsed as `null` (which is needed
+// for array literals).
+
+pp.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) {
+  let elts = [], first = true
+  while (!this.eat(close)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (allowTrailingComma && this.afterTrailingComma(close)) break
+    } else first = false
+
+    let elt
+    if (allowEmpty && this.type === tt.comma)
+      elt = null
+    else if (this.type === tt.ellipsis) {
+      elt = this.parseSpread(refDestructuringErrors)
+      if (refDestructuringErrors && this.type === tt.comma && refDestructuringErrors.trailingComma < 0)
+        refDestructuringErrors.trailingComma = this.start
+    } else {
+      elt = this.parseMaybeAssign(false, refDestructuringErrors)
+    }
+    elts.push(elt)
+  }
+  return elts
+}
+
+pp.checkUnreserved = function({start, end, name}) {
+  if (this.inGenerator && name === "yield")
+    this.raiseRecoverable(start, "Cannot use 'yield' as identifier inside a generator")
+  if (this.inAsync && name === "await")
+    this.raiseRecoverable(start, "Cannot use 'await' as identifier inside an async function")
+  if (this.keywords.test(name))
+    this.raise(start, `Unexpected keyword '${name}'`)
+  if (this.options.ecmaVersion < 6 &&
+    this.input.slice(start, end).indexOf("\\") !== -1) return
+  const re = this.strict ? this.reservedWordsStrict : this.reservedWords
+  if (re.test(name)) {
+    if (!this.inAsync && name === "await")
+      this.raiseRecoverable(start, "Cannot use keyword 'await' outside an async function")
+    this.raiseRecoverable(start, `The keyword '${name}' is reserved`)
+  }
+}
+
+// Parse the next token as an identifier. If `liberal` is true (used
+// when parsing properties), it will also convert keywords into
+// identifiers.
+
+pp.parseIdent = function(liberal, isBinding) {
+  let node = this.startNode()
+  if (this.type === tt.name) {
+    node.name = this.value
+  } else if (this.type.keyword) {
+    node.name = this.type.keyword
+
+    // To fix https://github.com/acornjs/acorn/issues/575
+    // `class` and `function` keywords push new context into this.context.
+    // But there is no chance to pop the context if the keyword is consumed as an identifier such as a property name.
+    // If the previous token is a dot, this does not apply because the context-managing code already ignored the keyword
+    if ((node.name === "class" || node.name === "function") &&
+        (this.lastTokEnd !== this.lastTokStart + 1 || this.input.charCodeAt(this.lastTokStart) !== 46)) {
+      this.context.pop()
+    }
+  } else {
+    this.unexpected()
+  }
+  this.next(!!liberal)
+  this.finishNode(node, "Identifier")
+  if (!liberal) {
+    this.checkUnreserved(node)
+    if (node.name === "await" && !this.awaitIdentPos)
+      this.awaitIdentPos = node.start
+  }
+  return node
+}
+
+// Parses yield expression inside generator.
+
+pp.parseYield = function(noIn) {
+  if (!this.yieldPos) this.yieldPos = this.start
+
+  let node = this.startNode()
+  this.next()
+  if (this.type === tt.semi || this.canInsertSemicolon() || (this.type !== tt.star && !this.type.startsExpr)) {
+    node.delegate = false
+    node.argument = null
+  } else {
+    node.delegate = this.eat(tt.star)
+    node.argument = this.parseMaybeAssign(noIn)
+  }
+  return this.finishNode(node, "YieldExpression")
+}
+
+pp.parseAwait = function() {
+  if (!this.awaitPos) this.awaitPos = this.start
+
+  let node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeUnary(null, false)
+  return this.finishNode(node, "AwaitExpression")
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/identifier.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/identifier.js
new file mode 100644
index 0000000000..0d7c3d1364
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/identifier.js
@@ -0,0 +1,87 @@
+// Reserved word lists for various dialects of the language
+
+export const reservedWords = {
+  3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile",
+  5: "class enum extends super const export import",
+  6: "enum",
+  strict: "implements interface let package private protected public static yield",
+  strictBind: "eval arguments"
+}
+
+// And the keywords
+
+const ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"
+
+export const keywords = {
+  5: ecma5AndLessKeywords,
+  "5module": ecma5AndLessKeywords + " export import",
+  6: ecma5AndLessKeywords + " const class extends export import super"
+}
+
+export const keywordRelationalOperator = /^in(stanceof)?$/
+
+// ## Character categories
+
+// Big ugly regular expressions that match characters in the
+// whitespace, identifier, and identifier-start categories. These
+// are only applied when a character is found to actually have a
+// code point above 128.
+// Generated by `bin/generate-identifier-regex.js`.
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08c7\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\u9ffc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7ca\ua7f5-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf\u1ac0\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"
+
+const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]")
+const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]")
+
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null
+
+// These are a run-length and offset encoded representation of the
+// >0xffff code points that are a valid part of identifiers. The
+// offset starts at 0x10000, and each pair of numbers represents an
+// offset to the next range, and then a size of the range. They were
+// generated by bin/generate-identifier-regex.js
+
+// eslint-disable-next-line comma-spacing
+const astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,14,29,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,28,43,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,14,35,349,41,7,1,79,28,11,0,9,21,107,20,28,22,13,52,76,44,33,24,27,35,30,0,3,0,9,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,21,2,31,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,14,0,72,26,230,43,117,63,32,7,3,0,3,7,2,1,2,23,16,0,2,0,95,7,3,38,17,0,2,0,29,0,11,39,8,0,22,0,12,45,20,0,35,56,264,8,2,36,18,0,50,29,113,6,2,1,2,37,22,0,26,5,2,1,2,31,15,0,328,18,190,0,80,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,689,63,129,74,6,0,67,12,65,1,2,0,29,6135,9,1237,43,8,8952,286,50,2,18,3,9,395,2309,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,2357,44,11,6,17,0,370,43,1301,196,60,67,8,0,1205,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42717,35,4148,12,221,3,5761,15,7472,3104,541,1507,4938]
+
+// eslint-disable-next-line comma-spacing
+const astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,574,3,9,9,370,1,154,10,176,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,6,1,45,0,13,2,49,13,9,3,2,11,83,11,7,0,161,11,6,9,7,3,56,1,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,5,0,82,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,243,14,166,9,71,5,2,1,3,3,2,0,2,1,13,9,120,6,3,6,4,0,29,9,41,6,2,3,9,0,10,10,47,15,406,7,2,7,17,9,57,21,2,13,123,5,4,0,2,1,2,6,2,0,9,9,49,4,2,1,2,4,9,9,330,3,19306,9,135,4,60,6,26,9,1014,0,2,54,8,3,82,0,12,1,19628,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,262,6,10,9,419,13,1495,6,110,6,6,9,4759,9,787719,239]
+
+// This has a complexity linear to the value of the code. The
+// assumption is that looking up astral identifier characters is
+// rare.
+function isInAstralSet(code, set) {
+  let pos = 0x10000
+  for (let i = 0; i < set.length; i += 2) {
+    pos += set[i]
+    if (pos > code) return false
+    pos += set[i + 1]
+    if (pos >= code) return true
+  }
+}
+
+// Test whether a given character code starts an identifier.
+
+export function isIdentifierStart(code, astral) {
+  if (code < 65) return code === 36
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes)
+}
+
+// Test whether a given character is part of an identifier.
+
+export function isIdentifierChar(code, astral) {
+  if (code < 48) return code === 36
+  if (code < 58) return true
+  if (code < 65) return false
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes)
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/index.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/index.js
new file mode 100644
index 0000000000..f466a3b9fc
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/index.js
@@ -0,0 +1,102 @@
+// Acorn is a tiny, fast JavaScript parser written in JavaScript.
+//
+// Acorn was written by Marijn Haverbeke, Ingvar Stepanyan, and
+// various contributors and released under an MIT license.
+//
+// Git repositories for Acorn are available at
+//
+//     http://marijnhaverbeke.nl/git/acorn
+//     https://github.com/acornjs/acorn.git
+//
+// Please use the [github bug tracker][ghbt] to report issues.
+//
+// [ghbt]: https://github.com/acornjs/acorn/issues
+//
+// [walk]: util/walk.js
+
+import {Parser} from "./state"
+import "./parseutil"
+import "./statement"
+import "./lval"
+import "./expression"
+import "./location"
+import "./scope"
+
+import {defaultOptions} from "./options"
+import {Position, SourceLocation, getLineInfo} from "./locutil"
+import {Node} from "./node"
+import {TokenType, types as tokTypes, keywords as keywordTypes} from "./tokentype"
+import {TokContext, types as tokContexts} from "./tokencontext"
+import {isIdentifierChar, isIdentifierStart} from "./identifier"
+import {Token} from "./tokenize"
+import {isNewLine, lineBreak, lineBreakG, nonASCIIwhitespace} from "./whitespace"
+
+export const version = "7.1.0"
+export {
+  Parser,
+  defaultOptions,
+  Position,
+  SourceLocation,
+  getLineInfo,
+  Node,
+  TokenType,
+  tokTypes,
+  keywordTypes,
+  TokContext,
+  tokContexts,
+  isIdentifierChar,
+  isIdentifierStart,
+  Token,
+  isNewLine,
+  lineBreak,
+  lineBreakG,
+  nonASCIIwhitespace
+}
+
+Parser.acorn = {
+  Parser,
+  version,
+  defaultOptions,
+  Position,
+  SourceLocation,
+  getLineInfo,
+  Node,
+  TokenType,
+  tokTypes,
+  keywordTypes,
+  TokContext,
+  tokContexts,
+  isIdentifierChar,
+  isIdentifierStart,
+  Token,
+  isNewLine,
+  lineBreak,
+  lineBreakG,
+  nonASCIIwhitespace
+}
+
+// The main exported interface (under `self.acorn` when in the
+// browser) is a `parse` function that takes a code string and
+// returns an abstract syntax tree as specified by [Mozilla parser
+// API][api].
+//
+// [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+
+export function parse(input, options) {
+  return Parser.parse(input, options)
+}
+
+// This function tries to parse a single expression at a given
+// offset in a string. Useful for parsing mixed-language formats
+// that embed JavaScript expressions.
+
+export function parseExpressionAt(input, pos, options) {
+  return Parser.parseExpressionAt(input, pos, options)
+}
+
+// Acorn is organized as a tokenizer and a recursive-descent parser.
+// The `tokenizer` export provides an interface to the tokenizer.
+
+export function tokenizer(input, options) {
+  return Parser.tokenizer(input, options)
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/location.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/location.js
new file mode 100644
index 0000000000..99e71234cc
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/location.js
@@ -0,0 +1,26 @@
+import {Parser} from "./state"
+import {Position, getLineInfo} from "./locutil"
+
+const pp = Parser.prototype
+
+// This function is used to raise exceptions on parse errors. It
+// takes an offset integer (into the current `input`) to indicate
+// the location of the error, attaches the position to the end
+// of the error message, and then raises a `SyntaxError` with that
+// message.
+
+pp.raise = function(pos, message) {
+  let loc = getLineInfo(this.input, pos)
+  message += " (" + loc.line + ":" + loc.column + ")"
+  let err = new SyntaxError(message)
+  err.pos = pos; err.loc = loc; err.raisedAt = this.pos
+  throw err
+}
+
+pp.raiseRecoverable = pp.raise
+
+pp.curPosition = function() {
+  if (this.options.locations) {
+    return new Position(this.curLine, this.pos - this.lineStart)
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/locutil.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/locutil.js
new file mode 100644
index 0000000000..5a9465e017
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/locutil.js
@@ -0,0 +1,42 @@
+import {lineBreakG} from "./whitespace"
+
+// These are used when `options.locations` is on, for the
+// `startLoc` and `endLoc` properties.
+
+export class Position {
+  constructor(line, col) {
+    this.line = line
+    this.column = col
+  }
+
+  offset(n) {
+    return new Position(this.line, this.column + n)
+  }
+}
+
+export class SourceLocation {
+  constructor(p, start, end) {
+    this.start = start
+    this.end = end
+    if (p.sourceFile !== null) this.source = p.sourceFile
+  }
+}
+
+// The `getLineInfo` function is mostly useful when the
+// `locations` option is off (for performance reasons) and you
+// want to find the line/column position for a given character
+// offset. `input` should be the code string that the offset refers
+// into.
+
+export function getLineInfo(input, offset) {
+  for (let line = 1, cur = 0;;) {
+    lineBreakG.lastIndex = cur
+    let match = lineBreakG.exec(input)
+    if (match && match.index < offset) {
+      ++line
+      cur = match.index + match[0].length
+    } else {
+      return new Position(line, offset - cur)
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/lval.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/lval.js
new file mode 100644
index 0000000000..8ad4b26390
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/lval.js
@@ -0,0 +1,239 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {has} from "./util"
+import {BIND_NONE, BIND_OUTSIDE, BIND_LEXICAL} from "./scopeflags"
+
+const pp = Parser.prototype
+
+// Convert existing expression atom to assignable pattern
+// if possible.
+
+pp.toAssignable = function(node, isBinding, refDestructuringErrors) {
+  if (this.options.ecmaVersion >= 6 && node) {
+    switch (node.type) {
+    case "Identifier":
+      if (this.inAsync && node.name === "await")
+        this.raise(node.start, "Cannot use 'await' as identifier inside an async function")
+      break
+
+    case "ObjectPattern":
+    case "ArrayPattern":
+    case "RestElement":
+      break
+
+    case "ObjectExpression":
+      node.type = "ObjectPattern"
+      if (refDestructuringErrors) this.checkPatternErrors(refDestructuringErrors, true)
+      for (let prop of node.properties) {
+        this.toAssignable(prop, isBinding)
+        // Early error:
+        //   AssignmentRestProperty[Yield, Await] :
+        //     `...` DestructuringAssignmentTarget[Yield, Await]
+        //
+        //   It is a Syntax Error if |DestructuringAssignmentTarget| is an |ArrayLiteral| or an |ObjectLiteral|.
+        if (
+          prop.type === "RestElement" &&
+          (prop.argument.type === "ArrayPattern" || prop.argument.type === "ObjectPattern")
+        ) {
+          this.raise(prop.argument.start, "Unexpected token")
+        }
+      }
+      break
+
+    case "Property":
+      // AssignmentProperty has type === "Property"
+      if (node.kind !== "init") this.raise(node.key.start, "Object pattern can't contain getter or setter")
+      this.toAssignable(node.value, isBinding)
+      break
+
+    case "ArrayExpression":
+      node.type = "ArrayPattern"
+      if (refDestructuringErrors) this.checkPatternErrors(refDestructuringErrors, true)
+      this.toAssignableList(node.elements, isBinding)
+      break
+
+    case "SpreadElement":
+      node.type = "RestElement"
+      this.toAssignable(node.argument, isBinding)
+      if (node.argument.type === "AssignmentPattern")
+        this.raise(node.argument.start, "Rest elements cannot have a default value")
+      break
+
+    case "AssignmentExpression":
+      if (node.operator !== "=") this.raise(node.left.end, "Only '=' operator can be used for specifying default value.")
+      node.type = "AssignmentPattern"
+      delete node.operator
+      this.toAssignable(node.left, isBinding)
+      // falls through to AssignmentPattern
+
+    case "AssignmentPattern":
+      break
+
+    case "ParenthesizedExpression":
+      this.toAssignable(node.expression, isBinding, refDestructuringErrors)
+      break
+
+    case "MemberExpression":
+      if (!isBinding) break
+
+    default:
+      this.raise(node.start, "Assigning to rvalue")
+    }
+  } else if (refDestructuringErrors) this.checkPatternErrors(refDestructuringErrors, true)
+  return node
+}
+
+// Convert list of expression atoms to binding list.
+
+pp.toAssignableList = function(exprList, isBinding) {
+  let end = exprList.length
+  for (let i = 0; i < end; i++) {
+    let elt = exprList[i]
+    if (elt) this.toAssignable(elt, isBinding)
+  }
+  if (end) {
+    let last = exprList[end - 1]
+    if (this.options.ecmaVersion === 6 && isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
+      this.unexpected(last.argument.start)
+  }
+  return exprList
+}
+
+// Parses spread element.
+
+pp.parseSpread = function(refDestructuringErrors) {
+  let node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeAssign(false, refDestructuringErrors)
+  return this.finishNode(node, "SpreadElement")
+}
+
+pp.parseRestBinding = function() {
+  let node = this.startNode()
+  this.next()
+
+  // RestElement inside of a function parameter must be an identifier
+  if (this.options.ecmaVersion === 6 && this.type !== tt.name)
+    this.unexpected()
+
+  node.argument = this.parseBindingAtom()
+
+  return this.finishNode(node, "RestElement")
+}
+
+// Parses lvalue (assignable) atom.
+
+pp.parseBindingAtom = function() {
+  if (this.options.ecmaVersion >= 6) {
+    switch (this.type) {
+    case tt.bracketL:
+      let node = this.startNode()
+      this.next()
+      node.elements = this.parseBindingList(tt.bracketR, true, true)
+      return this.finishNode(node, "ArrayPattern")
+
+    case tt.braceL:
+      return this.parseObj(true)
+    }
+  }
+  return this.parseIdent()
+}
+
+pp.parseBindingList = function(close, allowEmpty, allowTrailingComma) {
+  let elts = [], first = true
+  while (!this.eat(close)) {
+    if (first) first = false
+    else this.expect(tt.comma)
+    if (allowEmpty && this.type === tt.comma) {
+      elts.push(null)
+    } else if (allowTrailingComma && this.afterTrailingComma(close)) {
+      break
+    } else if (this.type === tt.ellipsis) {
+      let rest = this.parseRestBinding()
+      this.parseBindingListItem(rest)
+      elts.push(rest)
+      if (this.type === tt.comma) this.raise(this.start, "Comma is not permitted after the rest element")
+      this.expect(close)
+      break
+    } else {
+      let elem = this.parseMaybeDefault(this.start, this.startLoc)
+      this.parseBindingListItem(elem)
+      elts.push(elem)
+    }
+  }
+  return elts
+}
+
+pp.parseBindingListItem = function(param) {
+  return param
+}
+
+// Parses assignment pattern around given atom if possible.
+
+pp.parseMaybeDefault = function(startPos, startLoc, left) {
+  left = left || this.parseBindingAtom()
+  if (this.options.ecmaVersion < 6 || !this.eat(tt.eq)) return left
+  let node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.right = this.parseMaybeAssign()
+  return this.finishNode(node, "AssignmentPattern")
+}
+
+// Verify that a node is an lval — something that can be assigned
+// to.
+// bindingType can be either:
+// 'var' indicating that the lval creates a 'var' binding
+// 'let' indicating that the lval creates a lexical ('let' or 'const') binding
+// 'none' indicating that the binding should be checked for illegal identifiers, but not for duplicate references
+
+pp.checkLVal = function(expr, bindingType = BIND_NONE, checkClashes) {
+  switch (expr.type) {
+  case "Identifier":
+    if (bindingType === BIND_LEXICAL && expr.name === "let")
+      this.raiseRecoverable(expr.start, "let is disallowed as a lexically bound name")
+    if (this.strict && this.reservedWordsStrictBind.test(expr.name))
+      this.raiseRecoverable(expr.start, (bindingType ? "Binding " : "Assigning to ") + expr.name + " in strict mode")
+    if (checkClashes) {
+      if (has(checkClashes, expr.name))
+        this.raiseRecoverable(expr.start, "Argument name clash")
+      checkClashes[expr.name] = true
+    }
+    if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) this.declareName(expr.name, bindingType, expr.start)
+    break
+
+  case "MemberExpression":
+    if (bindingType) this.raiseRecoverable(expr.start, "Binding member expression")
+    break
+
+  case "ObjectPattern":
+    for (let prop of expr.properties)
+      this.checkLVal(prop, bindingType, checkClashes)
+    break
+
+  case "Property":
+    // AssignmentProperty has type === "Property"
+    this.checkLVal(expr.value, bindingType, checkClashes)
+    break
+
+  case "ArrayPattern":
+    for (let elem of expr.elements) {
+      if (elem) this.checkLVal(elem, bindingType, checkClashes)
+    }
+    break
+
+  case "AssignmentPattern":
+    this.checkLVal(expr.left, bindingType, checkClashes)
+    break
+
+  case "RestElement":
+    this.checkLVal(expr.argument, bindingType, checkClashes)
+    break
+
+  case "ParenthesizedExpression":
+    this.checkLVal(expr.expression, bindingType, checkClashes)
+    break
+
+  default:
+    this.raise(expr.start, (bindingType ? "Binding" : "Assigning to") + " rvalue")
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/node.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/node.js
new file mode 100644
index 0000000000..76b5b09825
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/node.js
@@ -0,0 +1,50 @@
+import {Parser} from "./state"
+import {SourceLocation} from "./locutil"
+
+export class Node {
+  constructor(parser, pos, loc) {
+    this.type = ""
+    this.start = pos
+    this.end = 0
+    if (parser.options.locations)
+      this.loc = new SourceLocation(parser, loc)
+    if (parser.options.directSourceFile)
+      this.sourceFile = parser.options.directSourceFile
+    if (parser.options.ranges)
+      this.range = [pos, 0]
+  }
+}
+
+// Start an AST node, attaching a start offset.
+
+const pp = Parser.prototype
+
+pp.startNode = function() {
+  return new Node(this, this.start, this.startLoc)
+}
+
+pp.startNodeAt = function(pos, loc) {
+  return new Node(this, pos, loc)
+}
+
+// Finish an AST node, adding `type` and `end` properties.
+
+function finishNodeAt(node, type, pos, loc) {
+  node.type = type
+  node.end = pos
+  if (this.options.locations)
+    node.loc.end = loc
+  if (this.options.ranges)
+    node.range[1] = pos
+  return node
+}
+
+pp.finishNode = function(node, type) {
+  return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc)
+}
+
+// Finish node at given position
+
+pp.finishNodeAt = function(node, type, pos, loc) {
+  return finishNodeAt.call(this, node, type, pos, loc)
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/options.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/options.js
new file mode 100644
index 0000000000..807251fdfd
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/options.js
@@ -0,0 +1,130 @@
+import {has, isArray} from "./util"
+import {SourceLocation} from "./locutil"
+
+// A second optional argument can be given to further configure
+// the parser process. These options are recognized:
+
+export const defaultOptions = {
+  // `ecmaVersion` indicates the ECMAScript version to parse. Must be
+  // either 3, 5, 6 (2015), 7 (2016), 8 (2017), 9 (2018), or 10
+  // (2019). This influences support for strict mode, the set of
+  // reserved words, and support for new syntax features. The default
+  // is 10.
+  ecmaVersion: 10,
+  // `sourceType` indicates the mode the code should be parsed in.
+  // Can be either `"script"` or `"module"`. This influences global
+  // strict mode and parsing of `import` and `export` declarations.
+  sourceType: "script",
+  // `onInsertedSemicolon` can be a callback that will be called
+  // when a semicolon is automatically inserted. It will be passed
+  // the position of the comma as an offset, and if `locations` is
+  // enabled, it is given the location as a `{line, column}` object
+  // as second argument.
+  onInsertedSemicolon: null,
+  // `onTrailingComma` is similar to `onInsertedSemicolon`, but for
+  // trailing commas.
+  onTrailingComma: null,
+  // By default, reserved words are only enforced if ecmaVersion >= 5.
+  // Set `allowReserved` to a boolean value to explicitly turn this on
+  // an off. When this option has the value "never", reserved words
+  // and keywords can also not be used as property names.
+  allowReserved: null,
+  // When enabled, a return at the top level is not considered an
+  // error.
+  allowReturnOutsideFunction: false,
+  // When enabled, import/export statements are not constrained to
+  // appearing at the top of the program.
+  allowImportExportEverywhere: false,
+  // When enabled, await identifiers are allowed to appear at the top-level scope,
+  // but they are still not allowed in non-async functions.
+  allowAwaitOutsideFunction: false,
+  // When enabled, hashbang directive in the beginning of file
+  // is allowed and treated as a line comment.
+  allowHashBang: false,
+  // When `locations` is on, `loc` properties holding objects with
+  // `start` and `end` properties in `{line, column}` form (with
+  // line being 1-based and column 0-based) will be attached to the
+  // nodes.
+  locations: false,
+  // A function can be passed as `onToken` option, which will
+  // cause Acorn to call that function with object in the same
+  // format as tokens returned from `tokenizer().getToken()`. Note
+  // that you are not allowed to call the parser from the
+  // callback—that will corrupt its internal state.
+  onToken: null,
+  // A function can be passed as `onComment` option, which will
+  // cause Acorn to call that function with `(block, text, start,
+  // end)` parameters whenever a comment is skipped. `block` is a
+  // boolean indicating whether this is a block (`/* */`) comment,
+  // `text` is the content of the comment, and `start` and `end` are
+  // character offsets that denote the start and end of the comment.
+  // When the `locations` option is on, two more parameters are
+  // passed, the full `{line, column}` locations of the start and
+  // end of the comments. Note that you are not allowed to call the
+  // parser from the callback—that will corrupt its internal state.
+  onComment: null,
+  // Nodes have their start and end characters offsets recorded in
+  // `start` and `end` properties (directly on the node, rather than
+  // the `loc` object, which holds line/column data. To also add a
+  // [semi-standardized][range] `range` property holding a `[start,
+  // end]` array with the same numbers, set the `ranges` option to
+  // `true`.
+  //
+  // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+  ranges: false,
+  // It is possible to parse multiple files into a single AST by
+  // passing the tree produced by parsing the first file as
+  // `program` option in subsequent parses. This will add the
+  // toplevel forms of the parsed file to the `Program` (top) node
+  // of an existing parse tree.
+  program: null,
+  // When `locations` is on, you can pass this to record the source
+  // file in every node's `loc` object.
+  sourceFile: null,
+  // This value, if given, is stored in every node, whether
+  // `locations` is on or off.
+  directSourceFile: null,
+  // When enabled, parenthesized expressions are represented by
+  // (non-standard) ParenthesizedExpression nodes
+  preserveParens: false
+}
+
+// Interpret and default an options object
+
+export function getOptions(opts) {
+  let options = {}
+
+  for (let opt in defaultOptions)
+    options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt]
+
+  if (options.ecmaVersion >= 2015)
+    options.ecmaVersion -= 2009
+
+  if (options.allowReserved == null)
+    options.allowReserved = options.ecmaVersion < 5
+
+  if (isArray(options.onToken)) {
+    let tokens = options.onToken
+    options.onToken = (token) => tokens.push(token)
+  }
+  if (isArray(options.onComment))
+    options.onComment = pushComment(options, options.onComment)
+
+  return options
+}
+
+function pushComment(options, array) {
+  return function(block, text, start, end, startLoc, endLoc) {
+    let comment = {
+      type: block ? "Block" : "Line",
+      value: text,
+      start: start,
+      end: end
+    }
+    if (options.locations)
+      comment.loc = new SourceLocation(this, startLoc, endLoc)
+    if (options.ranges)
+      comment.range = [start, end]
+    array.push(comment)
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/parseutil.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/parseutil.js
new file mode 100644
index 0000000000..98e35237f5
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/parseutil.js
@@ -0,0 +1,151 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {lineBreak, skipWhiteSpace} from "./whitespace"
+
+const pp = Parser.prototype
+
+// ## Parser utilities
+
+const literal = /^(?:'((?:\\.|[^'])*?)'|"((?:\\.|[^"])*?)")/
+pp.strictDirective = function(start) {
+  for (;;) {
+    // Try to find string literal.
+    skipWhiteSpace.lastIndex = start
+    start += skipWhiteSpace.exec(this.input)[0].length
+    let match = literal.exec(this.input.slice(start))
+    if (!match) return false
+    if ((match[1] || match[2]) === "use strict") {
+      skipWhiteSpace.lastIndex = start + match[0].length
+      let spaceAfter = skipWhiteSpace.exec(this.input), end = spaceAfter.index + spaceAfter[0].length
+      let next = this.input.charAt(end)
+      return next === ";" || next === "}" ||
+        (lineBreak.test(spaceAfter[0]) &&
+         !(/[(`.[+\-/*%<>=,?^&]/.test(next) || next === "!" && this.input.charAt(end + 1) === "="))
+    }
+    start += match[0].length
+
+    // Skip semicolon, if any.
+    skipWhiteSpace.lastIndex = start
+    start += skipWhiteSpace.exec(this.input)[0].length
+    if (this.input[start] === ";")
+      start++
+  }
+}
+
+// Predicate that tests whether the next token is of the given
+// type, and if yes, consumes it as a side effect.
+
+pp.eat = function(type) {
+  if (this.type === type) {
+    this.next()
+    return true
+  } else {
+    return false
+  }
+}
+
+// Tests whether parsed token is a contextual keyword.
+
+pp.isContextual = function(name) {
+  return this.type === tt.name && this.value === name && !this.containsEsc
+}
+
+// Consumes contextual keyword if possible.
+
+pp.eatContextual = function(name) {
+  if (!this.isContextual(name)) return false
+  this.next()
+  return true
+}
+
+// Asserts that following token is given contextual keyword.
+
+pp.expectContextual = function(name) {
+  if (!this.eatContextual(name)) this.unexpected()
+}
+
+// Test whether a semicolon can be inserted at the current position.
+
+pp.canInsertSemicolon = function() {
+  return this.type === tt.eof ||
+    this.type === tt.braceR ||
+    lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+}
+
+pp.insertSemicolon = function() {
+  if (this.canInsertSemicolon()) {
+    if (this.options.onInsertedSemicolon)
+      this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc)
+    return true
+  }
+}
+
+// Consume a semicolon, or, failing that, see if we are allowed to
+// pretend that there is a semicolon at this position.
+
+pp.semicolon = function() {
+  if (!this.eat(tt.semi) && !this.insertSemicolon()) this.unexpected()
+}
+
+pp.afterTrailingComma = function(tokType, notNext) {
+  if (this.type === tokType) {
+    if (this.options.onTrailingComma)
+      this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc)
+    if (!notNext)
+      this.next()
+    return true
+  }
+}
+
+// Expect a token of a given type. If found, consume it, otherwise,
+// raise an unexpected token error.
+
+pp.expect = function(type) {
+  this.eat(type) || this.unexpected()
+}
+
+// Raise an unexpected token error.
+
+pp.unexpected = function(pos) {
+  this.raise(pos != null ? pos : this.start, "Unexpected token")
+}
+
+export function DestructuringErrors() {
+  this.shorthandAssign =
+  this.trailingComma =
+  this.parenthesizedAssign =
+  this.parenthesizedBind =
+  this.doubleProto =
+    -1
+}
+
+pp.checkPatternErrors = function(refDestructuringErrors, isAssign) {
+  if (!refDestructuringErrors) return
+  if (refDestructuringErrors.trailingComma > -1)
+    this.raiseRecoverable(refDestructuringErrors.trailingComma, "Comma is not permitted after the rest element")
+  let parens = isAssign ? refDestructuringErrors.parenthesizedAssign : refDestructuringErrors.parenthesizedBind
+  if (parens > -1) this.raiseRecoverable(parens, "Parenthesized pattern")
+}
+
+pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) {
+  if (!refDestructuringErrors) return false
+  let {shorthandAssign, doubleProto} = refDestructuringErrors
+  if (!andThrow) return shorthandAssign >= 0 || doubleProto >= 0
+  if (shorthandAssign >= 0)
+    this.raise(shorthandAssign, "Shorthand property assignments are valid only in destructuring patterns")
+  if (doubleProto >= 0)
+    this.raiseRecoverable(doubleProto, "Redefinition of __proto__ property")
+}
+
+pp.checkYieldAwaitInDefaultParams = function() {
+  if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos))
+    this.raise(this.yieldPos, "Yield expression cannot be a default value")
+  if (this.awaitPos)
+    this.raise(this.awaitPos, "Await expression cannot be a default value")
+}
+
+pp.isSimpleAssignTarget = function(expr) {
+  if (expr.type === "ParenthesizedExpression")
+    return this.isSimpleAssignTarget(expr.expression)
+  return expr.type === "Identifier" || expr.type === "MemberExpression"
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/regexp.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/regexp.js
new file mode 100644
index 0000000000..605bce5203
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/regexp.js
@@ -0,0 +1,1046 @@
+import {isIdentifierStart, isIdentifierChar} from "./identifier.js"
+import {Parser} from "./state.js"
+import UNICODE_PROPERTY_VALUES from "./unicode-property-data.js"
+import {has} from "./util.js"
+
+const pp = Parser.prototype
+
+export class RegExpValidationState {
+  constructor(parser) {
+    this.parser = parser
+    this.validFlags = `gim${parser.options.ecmaVersion >= 6 ? "uy" : ""}${parser.options.ecmaVersion >= 9 ? "s" : ""}`
+    this.unicodeProperties = UNICODE_PROPERTY_VALUES[parser.options.ecmaVersion >= 11 ? 11 : parser.options.ecmaVersion]
+    this.source = ""
+    this.flags = ""
+    this.start = 0
+    this.switchU = false
+    this.switchN = false
+    this.pos = 0
+    this.lastIntValue = 0
+    this.lastStringValue = ""
+    this.lastAssertionIsQuantifiable = false
+    this.numCapturingParens = 0
+    this.maxBackReference = 0
+    this.groupNames = []
+    this.backReferenceNames = []
+  }
+
+  reset(start, pattern, flags) {
+    const unicode = flags.indexOf("u") !== -1
+    this.start = start | 0
+    this.source = pattern + ""
+    this.flags = flags
+    this.switchU = unicode && this.parser.options.ecmaVersion >= 6
+    this.switchN = unicode && this.parser.options.ecmaVersion >= 9
+  }
+
+  raise(message) {
+    this.parser.raiseRecoverable(this.start, `Invalid regular expression: /${this.source}/: ${message}`)
+  }
+
+  // If u flag is given, this returns the code point at the index (it combines a surrogate pair).
+  // Otherwise, this returns the code unit of the index (can be a part of a surrogate pair).
+  at(i) {
+    const s = this.source
+    const l = s.length
+    if (i >= l) {
+      return -1
+    }
+    const c = s.charCodeAt(i)
+    if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) {
+      return c
+    }
+    const next = s.charCodeAt(i + 1)
+    return next >= 0xDC00 && next <= 0xDFFF ? (c << 10) + next - 0x35FDC00 : c
+  }
+
+  nextIndex(i) {
+    const s = this.source
+    const l = s.length
+    if (i >= l) {
+      return l
+    }
+    let c = s.charCodeAt(i), next
+    if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l ||
+        (next = s.charCodeAt(i + 1)) < 0xDC00 || next > 0xDFFF) {
+      return i + 1
+    }
+    return i + 2
+  }
+
+  current() {
+    return this.at(this.pos)
+  }
+
+  lookahead() {
+    return this.at(this.nextIndex(this.pos))
+  }
+
+  advance() {
+    this.pos = this.nextIndex(this.pos)
+  }
+
+  eat(ch) {
+    if (this.current() === ch) {
+      this.advance()
+      return true
+    }
+    return false
+  }
+}
+
+function codePointToString(ch) {
+  if (ch <= 0xFFFF) return String.fromCharCode(ch)
+  ch -= 0x10000
+  return String.fromCharCode((ch >> 10) + 0xD800, (ch & 0x03FF) + 0xDC00)
+}
+
+/**
+ * Validate the flags part of a given RegExpLiteral.
+ *
+ * @param {RegExpValidationState} state The state to validate RegExp.
+ * @returns {void}
+ */
+pp.validateRegExpFlags = function(state) {
+  const validFlags = state.validFlags
+  const flags = state.flags
+
+  for (let i = 0; i < flags.length; i++) {
+    const flag = flags.charAt(i)
+    if (validFlags.indexOf(flag) === -1) {
+      this.raise(state.start, "Invalid regular expression flag")
+    }
+    if (flags.indexOf(flag, i + 1) > -1) {
+      this.raise(state.start, "Duplicate regular expression flag")
+    }
+  }
+}
+
+/**
+ * Validate the pattern part of a given RegExpLiteral.
+ *
+ * @param {RegExpValidationState} state The state to validate RegExp.
+ * @returns {void}
+ */
+pp.validateRegExpPattern = function(state) {
+  this.regexp_pattern(state)
+
+  // The goal symbol for the parse is |Pattern[~U, ~N]|. If the result of
+  // parsing contains a |GroupName|, reparse with the goal symbol
+  // |Pattern[~U, +N]| and use this result instead. Throw a *SyntaxError*
+  // exception if _P_ did not conform to the grammar, if any elements of _P_
+  // were not matched by the parse, or if any Early Error conditions exist.
+  if (!state.switchN && this.options.ecmaVersion >= 9 && state.groupNames.length > 0) {
+    state.switchN = true
+    this.regexp_pattern(state)
+  }
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Pattern
+pp.regexp_pattern = function(state) {
+  state.pos = 0
+  state.lastIntValue = 0
+  state.lastStringValue = ""
+  state.lastAssertionIsQuantifiable = false
+  state.numCapturingParens = 0
+  state.maxBackReference = 0
+  state.groupNames.length = 0
+  state.backReferenceNames.length = 0
+
+  this.regexp_disjunction(state)
+
+  if (state.pos !== state.source.length) {
+    // Make the same messages as V8.
+    if (state.eat(0x29 /* ) */)) {
+      state.raise("Unmatched ')'")
+    }
+    if (state.eat(0x5D /* ] */) || state.eat(0x7D /* } */)) {
+      state.raise("Lone quantifier brackets")
+    }
+  }
+  if (state.maxBackReference > state.numCapturingParens) {
+    state.raise("Invalid escape")
+  }
+  for (const name of state.backReferenceNames) {
+    if (state.groupNames.indexOf(name) === -1) {
+      state.raise("Invalid named capture referenced")
+    }
+  }
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Disjunction
+pp.regexp_disjunction = function(state) {
+  this.regexp_alternative(state)
+  while (state.eat(0x7C /* | */)) {
+    this.regexp_alternative(state)
+  }
+
+  // Make the same message as V8.
+  if (this.regexp_eatQuantifier(state, true)) {
+    state.raise("Nothing to repeat")
+  }
+  if (state.eat(0x7B /* { */)) {
+    state.raise("Lone quantifier brackets")
+  }
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Alternative
+pp.regexp_alternative = function(state) {
+  while (state.pos < state.source.length && this.regexp_eatTerm(state))
+    ;
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Term
+pp.regexp_eatTerm = function(state) {
+  if (this.regexp_eatAssertion(state)) {
+    // Handle `QuantifiableAssertion Quantifier` alternative.
+    // `state.lastAssertionIsQuantifiable` is true if the last eaten Assertion
+    // is a QuantifiableAssertion.
+    if (state.lastAssertionIsQuantifiable && this.regexp_eatQuantifier(state)) {
+      // Make the same message as V8.
+      if (state.switchU) {
+        state.raise("Invalid quantifier")
+      }
+    }
+    return true
+  }
+
+  if (state.switchU ? this.regexp_eatAtom(state) : this.regexp_eatExtendedAtom(state)) {
+    this.regexp_eatQuantifier(state)
+    return true
+  }
+
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Assertion
+pp.regexp_eatAssertion = function(state) {
+  const start = state.pos
+  state.lastAssertionIsQuantifiable = false
+
+  // ^, $
+  if (state.eat(0x5E /* ^ */) || state.eat(0x24 /* $ */)) {
+    return true
+  }
+
+  // \b \B
+  if (state.eat(0x5C /* \ */)) {
+    if (state.eat(0x42 /* B */) || state.eat(0x62 /* b */)) {
+      return true
+    }
+    state.pos = start
+  }
+
+  // Lookahead / Lookbehind
+  if (state.eat(0x28 /* ( */) && state.eat(0x3F /* ? */)) {
+    let lookbehind = false
+    if (this.options.ecmaVersion >= 9) {
+      lookbehind = state.eat(0x3C /* < */)
+    }
+    if (state.eat(0x3D /* = */) || state.eat(0x21 /* ! */)) {
+      this.regexp_disjunction(state)
+      if (!state.eat(0x29 /* ) */)) {
+        state.raise("Unterminated group")
+      }
+      state.lastAssertionIsQuantifiable = !lookbehind
+      return true
+    }
+  }
+
+  state.pos = start
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Quantifier
+pp.regexp_eatQuantifier = function(state, noError = false) {
+  if (this.regexp_eatQuantifierPrefix(state, noError)) {
+    state.eat(0x3F /* ? */)
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-QuantifierPrefix
+pp.regexp_eatQuantifierPrefix = function(state, noError) {
+  return (
+    state.eat(0x2A /* * */) ||
+    state.eat(0x2B /* + */) ||
+    state.eat(0x3F /* ? */) ||
+    this.regexp_eatBracedQuantifier(state, noError)
+  )
+}
+pp.regexp_eatBracedQuantifier = function(state, noError) {
+  const start = state.pos
+  if (state.eat(0x7B /* { */)) {
+    let min = 0, max = -1
+    if (this.regexp_eatDecimalDigits(state)) {
+      min = state.lastIntValue
+      if (state.eat(0x2C /* , */) && this.regexp_eatDecimalDigits(state)) {
+        max = state.lastIntValue
+      }
+      if (state.eat(0x7D /* } */)) {
+        // SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-term
+        if (max !== -1 && max < min && !noError) {
+          state.raise("numbers out of order in {} quantifier")
+        }
+        return true
+      }
+    }
+    if (state.switchU && !noError) {
+      state.raise("Incomplete quantifier")
+    }
+    state.pos = start
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Atom
+pp.regexp_eatAtom = function(state) {
+  return (
+    this.regexp_eatPatternCharacters(state) ||
+    state.eat(0x2E /* . */) ||
+    this.regexp_eatReverseSolidusAtomEscape(state) ||
+    this.regexp_eatCharacterClass(state) ||
+    this.regexp_eatUncapturingGroup(state) ||
+    this.regexp_eatCapturingGroup(state)
+  )
+}
+pp.regexp_eatReverseSolidusAtomEscape = function(state) {
+  const start = state.pos
+  if (state.eat(0x5C /* \ */)) {
+    if (this.regexp_eatAtomEscape(state)) {
+      return true
+    }
+    state.pos = start
+  }
+  return false
+}
+pp.regexp_eatUncapturingGroup = function(state) {
+  const start = state.pos
+  if (state.eat(0x28 /* ( */)) {
+    if (state.eat(0x3F /* ? */) && state.eat(0x3A /* : */)) {
+      this.regexp_disjunction(state)
+      if (state.eat(0x29 /* ) */)) {
+        return true
+      }
+      state.raise("Unterminated group")
+    }
+    state.pos = start
+  }
+  return false
+}
+pp.regexp_eatCapturingGroup = function(state) {
+  if (state.eat(0x28 /* ( */)) {
+    if (this.options.ecmaVersion >= 9) {
+      this.regexp_groupSpecifier(state)
+    } else if (state.current() === 0x3F /* ? */) {
+      state.raise("Invalid group")
+    }
+    this.regexp_disjunction(state)
+    if (state.eat(0x29 /* ) */)) {
+      state.numCapturingParens += 1
+      return true
+    }
+    state.raise("Unterminated group")
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedAtom
+pp.regexp_eatExtendedAtom = function(state) {
+  return (
+    state.eat(0x2E /* . */) ||
+    this.regexp_eatReverseSolidusAtomEscape(state) ||
+    this.regexp_eatCharacterClass(state) ||
+    this.regexp_eatUncapturingGroup(state) ||
+    this.regexp_eatCapturingGroup(state) ||
+    this.regexp_eatInvalidBracedQuantifier(state) ||
+    this.regexp_eatExtendedPatternCharacter(state)
+  )
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-InvalidBracedQuantifier
+pp.regexp_eatInvalidBracedQuantifier = function(state) {
+  if (this.regexp_eatBracedQuantifier(state, true)) {
+    state.raise("Nothing to repeat")
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-SyntaxCharacter
+pp.regexp_eatSyntaxCharacter = function(state) {
+  const ch = state.current()
+  if (isSyntaxCharacter(ch)) {
+    state.lastIntValue = ch
+    state.advance()
+    return true
+  }
+  return false
+}
+function isSyntaxCharacter(ch) {
+  return (
+    ch === 0x24 /* $ */ ||
+    ch >= 0x28 /* ( */ && ch <= 0x2B /* + */ ||
+    ch === 0x2E /* . */ ||
+    ch === 0x3F /* ? */ ||
+    ch >= 0x5B /* [ */ && ch <= 0x5E /* ^ */ ||
+    ch >= 0x7B /* { */ && ch <= 0x7D /* } */
+  )
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-PatternCharacter
+// But eat eager.
+pp.regexp_eatPatternCharacters = function(state) {
+  const start = state.pos
+  let ch = 0
+  while ((ch = state.current()) !== -1 && !isSyntaxCharacter(ch)) {
+    state.advance()
+  }
+  return state.pos !== start
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedPatternCharacter
+pp.regexp_eatExtendedPatternCharacter = function(state) {
+  const ch = state.current()
+  if (
+    ch !== -1 &&
+    ch !== 0x24 /* $ */ &&
+    !(ch >= 0x28 /* ( */ && ch <= 0x2B /* + */) &&
+    ch !== 0x2E /* . */ &&
+    ch !== 0x3F /* ? */ &&
+    ch !== 0x5B /* [ */ &&
+    ch !== 0x5E /* ^ */ &&
+    ch !== 0x7C /* | */
+  ) {
+    state.advance()
+    return true
+  }
+  return false
+}
+
+// GroupSpecifier[U] ::
+//   [empty]
+//   `?` GroupName[?U]
+pp.regexp_groupSpecifier = function(state) {
+  if (state.eat(0x3F /* ? */)) {
+    if (this.regexp_eatGroupName(state)) {
+      if (state.groupNames.indexOf(state.lastStringValue) !== -1) {
+        state.raise("Duplicate capture group name")
+      }
+      state.groupNames.push(state.lastStringValue)
+      return
+    }
+    state.raise("Invalid group")
+  }
+}
+
+// GroupName[U] ::
+//   `<` RegExpIdentifierName[?U] `>`
+// Note: this updates `state.lastStringValue` property with the eaten name.
+pp.regexp_eatGroupName = function(state) {
+  state.lastStringValue = ""
+  if (state.eat(0x3C /* < */)) {
+    if (this.regexp_eatRegExpIdentifierName(state) && state.eat(0x3E /* > */)) {
+      return true
+    }
+    state.raise("Invalid capture group name")
+  }
+  return false
+}
+
+// RegExpIdentifierName[U] ::
+//   RegExpIdentifierStart[?U]
+//   RegExpIdentifierName[?U] RegExpIdentifierPart[?U]
+// Note: this updates `state.lastStringValue` property with the eaten name.
+pp.regexp_eatRegExpIdentifierName = function(state) {
+  state.lastStringValue = ""
+  if (this.regexp_eatRegExpIdentifierStart(state)) {
+    state.lastStringValue += codePointToString(state.lastIntValue)
+    while (this.regexp_eatRegExpIdentifierPart(state)) {
+      state.lastStringValue += codePointToString(state.lastIntValue)
+    }
+    return true
+  }
+  return false
+}
+
+// RegExpIdentifierStart[U] ::
+//   UnicodeIDStart
+//   `$`
+//   `_`
+//   `\` RegExpUnicodeEscapeSequence[?U]
+pp.regexp_eatRegExpIdentifierStart = function(state) {
+  const start = state.pos
+  let ch = state.current()
+  state.advance()
+
+  if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state)) {
+    ch = state.lastIntValue
+  }
+  if (isRegExpIdentifierStart(ch)) {
+    state.lastIntValue = ch
+    return true
+  }
+
+  state.pos = start
+  return false
+}
+function isRegExpIdentifierStart(ch) {
+  return isIdentifierStart(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */
+}
+
+// RegExpIdentifierPart[U] ::
+//   UnicodeIDContinue
+//   `$`
+//   `_`
+//   `\` RegExpUnicodeEscapeSequence[?U]
+//   <ZWNJ>
+//   <ZWJ>
+pp.regexp_eatRegExpIdentifierPart = function(state) {
+  const start = state.pos
+  let ch = state.current()
+  state.advance()
+
+  if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state)) {
+    ch = state.lastIntValue
+  }
+  if (isRegExpIdentifierPart(ch)) {
+    state.lastIntValue = ch
+    return true
+  }
+
+  state.pos = start
+  return false
+}
+function isRegExpIdentifierPart(ch) {
+  return isIdentifierChar(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */ || ch === 0x200C /* <ZWNJ> */ || ch === 0x200D /* <ZWJ> */
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-AtomEscape
+pp.regexp_eatAtomEscape = function(state) {
+  if (
+    this.regexp_eatBackReference(state) ||
+    this.regexp_eatCharacterClassEscape(state) ||
+    this.regexp_eatCharacterEscape(state) ||
+    (state.switchN && this.regexp_eatKGroupName(state))
+  ) {
+    return true
+  }
+  if (state.switchU) {
+    // Make the same message as V8.
+    if (state.current() === 0x63 /* c */) {
+      state.raise("Invalid unicode escape")
+    }
+    state.raise("Invalid escape")
+  }
+  return false
+}
+pp.regexp_eatBackReference = function(state) {
+  const start = state.pos
+  if (this.regexp_eatDecimalEscape(state)) {
+    const n = state.lastIntValue
+    if (state.switchU) {
+      // For SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-atomescape
+      if (n > state.maxBackReference) {
+        state.maxBackReference = n
+      }
+      return true
+    }
+    if (n <= state.numCapturingParens) {
+      return true
+    }
+    state.pos = start
+  }
+  return false
+}
+pp.regexp_eatKGroupName = function(state) {
+  if (state.eat(0x6B /* k */)) {
+    if (this.regexp_eatGroupName(state)) {
+      state.backReferenceNames.push(state.lastStringValue)
+      return true
+    }
+    state.raise("Invalid named reference")
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-CharacterEscape
+pp.regexp_eatCharacterEscape = function(state) {
+  return (
+    this.regexp_eatControlEscape(state) ||
+    this.regexp_eatCControlLetter(state) ||
+    this.regexp_eatZero(state) ||
+    this.regexp_eatHexEscapeSequence(state) ||
+    this.regexp_eatRegExpUnicodeEscapeSequence(state) ||
+    (!state.switchU && this.regexp_eatLegacyOctalEscapeSequence(state)) ||
+    this.regexp_eatIdentityEscape(state)
+  )
+}
+pp.regexp_eatCControlLetter = function(state) {
+  const start = state.pos
+  if (state.eat(0x63 /* c */)) {
+    if (this.regexp_eatControlLetter(state)) {
+      return true
+    }
+    state.pos = start
+  }
+  return false
+}
+pp.regexp_eatZero = function(state) {
+  if (state.current() === 0x30 /* 0 */ && !isDecimalDigit(state.lookahead())) {
+    state.lastIntValue = 0
+    state.advance()
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-ControlEscape
+pp.regexp_eatControlEscape = function(state) {
+  const ch = state.current()
+  if (ch === 0x74 /* t */) {
+    state.lastIntValue = 0x09 /* \t */
+    state.advance()
+    return true
+  }
+  if (ch === 0x6E /* n */) {
+    state.lastIntValue = 0x0A /* \n */
+    state.advance()
+    return true
+  }
+  if (ch === 0x76 /* v */) {
+    state.lastIntValue = 0x0B /* \v */
+    state.advance()
+    return true
+  }
+  if (ch === 0x66 /* f */) {
+    state.lastIntValue = 0x0C /* \f */
+    state.advance()
+    return true
+  }
+  if (ch === 0x72 /* r */) {
+    state.lastIntValue = 0x0D /* \r */
+    state.advance()
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-ControlLetter
+pp.regexp_eatControlLetter = function(state) {
+  const ch = state.current()
+  if (isControlLetter(ch)) {
+    state.lastIntValue = ch % 0x20
+    state.advance()
+    return true
+  }
+  return false
+}
+function isControlLetter(ch) {
+  return (
+    (ch >= 0x41 /* A */ && ch <= 0x5A /* Z */) ||
+    (ch >= 0x61 /* a */ && ch <= 0x7A /* z */)
+  )
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-RegExpUnicodeEscapeSequence
+pp.regexp_eatRegExpUnicodeEscapeSequence = function(state) {
+  const start = state.pos
+
+  if (state.eat(0x75 /* u */)) {
+    if (this.regexp_eatFixedHexDigits(state, 4)) {
+      const lead = state.lastIntValue
+      if (state.switchU && lead >= 0xD800 && lead <= 0xDBFF) {
+        const leadSurrogateEnd = state.pos
+        if (state.eat(0x5C /* \ */) && state.eat(0x75 /* u */) && this.regexp_eatFixedHexDigits(state, 4)) {
+          const trail = state.lastIntValue
+          if (trail >= 0xDC00 && trail <= 0xDFFF) {
+            state.lastIntValue = (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000
+            return true
+          }
+        }
+        state.pos = leadSurrogateEnd
+        state.lastIntValue = lead
+      }
+      return true
+    }
+    if (
+      state.switchU &&
+      state.eat(0x7B /* { */) &&
+      this.regexp_eatHexDigits(state) &&
+      state.eat(0x7D /* } */) &&
+      isValidUnicode(state.lastIntValue)
+    ) {
+      return true
+    }
+    if (state.switchU) {
+      state.raise("Invalid unicode escape")
+    }
+    state.pos = start
+  }
+
+  return false
+}
+function isValidUnicode(ch) {
+  return ch >= 0 && ch <= 0x10FFFF
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-IdentityEscape
+pp.regexp_eatIdentityEscape = function(state) {
+  if (state.switchU) {
+    if (this.regexp_eatSyntaxCharacter(state)) {
+      return true
+    }
+    if (state.eat(0x2F /* / */)) {
+      state.lastIntValue = 0x2F /* / */
+      return true
+    }
+    return false
+  }
+
+  const ch = state.current()
+  if (ch !== 0x63 /* c */ && (!state.switchN || ch !== 0x6B /* k */)) {
+    state.lastIntValue = ch
+    state.advance()
+    return true
+  }
+
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalEscape
+pp.regexp_eatDecimalEscape = function(state) {
+  state.lastIntValue = 0
+  let ch = state.current()
+  if (ch >= 0x31 /* 1 */ && ch <= 0x39 /* 9 */) {
+    do {
+      state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */)
+      state.advance()
+    } while ((ch = state.current()) >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */)
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClassEscape
+pp.regexp_eatCharacterClassEscape = function(state) {
+  const ch = state.current()
+
+  if (isCharacterClassEscape(ch)) {
+    state.lastIntValue = -1
+    state.advance()
+    return true
+  }
+
+  if (
+    state.switchU &&
+    this.options.ecmaVersion >= 9 &&
+    (ch === 0x50 /* P */ || ch === 0x70 /* p */)
+  ) {
+    state.lastIntValue = -1
+    state.advance()
+    if (
+      state.eat(0x7B /* { */) &&
+      this.regexp_eatUnicodePropertyValueExpression(state) &&
+      state.eat(0x7D /* } */)
+    ) {
+      return true
+    }
+    state.raise("Invalid property name")
+  }
+
+  return false
+}
+function isCharacterClassEscape(ch) {
+  return (
+    ch === 0x64 /* d */ ||
+    ch === 0x44 /* D */ ||
+    ch === 0x73 /* s */ ||
+    ch === 0x53 /* S */ ||
+    ch === 0x77 /* w */ ||
+    ch === 0x57 /* W */
+  )
+}
+
+// UnicodePropertyValueExpression ::
+//   UnicodePropertyName `=` UnicodePropertyValue
+//   LoneUnicodePropertyNameOrValue
+pp.regexp_eatUnicodePropertyValueExpression = function(state) {
+  const start = state.pos
+
+  // UnicodePropertyName `=` UnicodePropertyValue
+  if (this.regexp_eatUnicodePropertyName(state) && state.eat(0x3D /* = */)) {
+    const name = state.lastStringValue
+    if (this.regexp_eatUnicodePropertyValue(state)) {
+      const value = state.lastStringValue
+      this.regexp_validateUnicodePropertyNameAndValue(state, name, value)
+      return true
+    }
+  }
+  state.pos = start
+
+  // LoneUnicodePropertyNameOrValue
+  if (this.regexp_eatLoneUnicodePropertyNameOrValue(state)) {
+    const nameOrValue = state.lastStringValue
+    this.regexp_validateUnicodePropertyNameOrValue(state, nameOrValue)
+    return true
+  }
+  return false
+}
+pp.regexp_validateUnicodePropertyNameAndValue = function(state, name, value) {
+  if (!has(state.unicodeProperties.nonBinary, name))
+    state.raise("Invalid property name")
+  if (!state.unicodeProperties.nonBinary[name].test(value))
+    state.raise("Invalid property value")
+}
+pp.regexp_validateUnicodePropertyNameOrValue = function(state, nameOrValue) {
+  if (!state.unicodeProperties.binary.test(nameOrValue))
+    state.raise("Invalid property name")
+}
+
+// UnicodePropertyName ::
+//   UnicodePropertyNameCharacters
+pp.regexp_eatUnicodePropertyName = function(state) {
+  let ch = 0
+  state.lastStringValue = ""
+  while (isUnicodePropertyNameCharacter(ch = state.current())) {
+    state.lastStringValue += codePointToString(ch)
+    state.advance()
+  }
+  return state.lastStringValue !== ""
+}
+function isUnicodePropertyNameCharacter(ch) {
+  return isControlLetter(ch) || ch === 0x5F /* _ */
+}
+
+// UnicodePropertyValue ::
+//   UnicodePropertyValueCharacters
+pp.regexp_eatUnicodePropertyValue = function(state) {
+  let ch = 0
+  state.lastStringValue = ""
+  while (isUnicodePropertyValueCharacter(ch = state.current())) {
+    state.lastStringValue += codePointToString(ch)
+    state.advance()
+  }
+  return state.lastStringValue !== ""
+}
+function isUnicodePropertyValueCharacter(ch) {
+  return isUnicodePropertyNameCharacter(ch) || isDecimalDigit(ch)
+}
+
+// LoneUnicodePropertyNameOrValue ::
+//   UnicodePropertyValueCharacters
+pp.regexp_eatLoneUnicodePropertyNameOrValue = function(state) {
+  return this.regexp_eatUnicodePropertyValue(state)
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClass
+pp.regexp_eatCharacterClass = function(state) {
+  if (state.eat(0x5B /* [ */)) {
+    state.eat(0x5E /* ^ */)
+    this.regexp_classRanges(state)
+    if (state.eat(0x5D /* ] */)) {
+      return true
+    }
+    // Unreachable since it threw "unterminated regular expression" error before.
+    state.raise("Unterminated character class")
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassRanges
+// https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRanges
+// https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRangesNoDash
+pp.regexp_classRanges = function(state) {
+  while (this.regexp_eatClassAtom(state)) {
+    const left = state.lastIntValue
+    if (state.eat(0x2D /* - */) && this.regexp_eatClassAtom(state)) {
+      const right = state.lastIntValue
+      if (state.switchU && (left === -1 || right === -1)) {
+        state.raise("Invalid character class")
+      }
+      if (left !== -1 && right !== -1 && left > right) {
+        state.raise("Range out of order in character class")
+      }
+    }
+  }
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtom
+// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtomNoDash
+pp.regexp_eatClassAtom = function(state) {
+  const start = state.pos
+
+  if (state.eat(0x5C /* \ */)) {
+    if (this.regexp_eatClassEscape(state)) {
+      return true
+    }
+    if (state.switchU) {
+      // Make the same message as V8.
+      const ch = state.current()
+      if (ch === 0x63 /* c */ || isOctalDigit(ch)) {
+        state.raise("Invalid class escape")
+      }
+      state.raise("Invalid escape")
+    }
+    state.pos = start
+  }
+
+  const ch = state.current()
+  if (ch !== 0x5D /* ] */) {
+    state.lastIntValue = ch
+    state.advance()
+    return true
+  }
+
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassEscape
+pp.regexp_eatClassEscape = function(state) {
+  const start = state.pos
+
+  if (state.eat(0x62 /* b */)) {
+    state.lastIntValue = 0x08 /* <BS> */
+    return true
+  }
+
+  if (state.switchU && state.eat(0x2D /* - */)) {
+    state.lastIntValue = 0x2D /* - */
+    return true
+  }
+
+  if (!state.switchU && state.eat(0x63 /* c */)) {
+    if (this.regexp_eatClassControlLetter(state)) {
+      return true
+    }
+    state.pos = start
+  }
+
+  return (
+    this.regexp_eatCharacterClassEscape(state) ||
+    this.regexp_eatCharacterEscape(state)
+  )
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassControlLetter
+pp.regexp_eatClassControlLetter = function(state) {
+  const ch = state.current()
+  if (isDecimalDigit(ch) || ch === 0x5F /* _ */) {
+    state.lastIntValue = ch % 0x20
+    state.advance()
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence
+pp.regexp_eatHexEscapeSequence = function(state) {
+  const start = state.pos
+  if (state.eat(0x78 /* x */)) {
+    if (this.regexp_eatFixedHexDigits(state, 2)) {
+      return true
+    }
+    if (state.switchU) {
+      state.raise("Invalid escape")
+    }
+    state.pos = start
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalDigits
+pp.regexp_eatDecimalDigits = function(state) {
+  const start = state.pos
+  let ch = 0
+  state.lastIntValue = 0
+  while (isDecimalDigit(ch = state.current())) {
+    state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */)
+    state.advance()
+  }
+  return state.pos !== start
+}
+function isDecimalDigit(ch) {
+  return ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigits
+pp.regexp_eatHexDigits = function(state) {
+  const start = state.pos
+  let ch = 0
+  state.lastIntValue = 0
+  while (isHexDigit(ch = state.current())) {
+    state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch)
+    state.advance()
+  }
+  return state.pos !== start
+}
+function isHexDigit(ch) {
+  return (
+    (ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */) ||
+    (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) ||
+    (ch >= 0x61 /* a */ && ch <= 0x66 /* f */)
+  )
+}
+function hexToInt(ch) {
+  if (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) {
+    return 10 + (ch - 0x41 /* A */)
+  }
+  if (ch >= 0x61 /* a */ && ch <= 0x66 /* f */) {
+    return 10 + (ch - 0x61 /* a */)
+  }
+  return ch - 0x30 /* 0 */
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-LegacyOctalEscapeSequence
+// Allows only 0-377(octal) i.e. 0-255(decimal).
+pp.regexp_eatLegacyOctalEscapeSequence = function(state) {
+  if (this.regexp_eatOctalDigit(state)) {
+    const n1 = state.lastIntValue
+    if (this.regexp_eatOctalDigit(state)) {
+      const n2 = state.lastIntValue
+      if (n1 <= 3 && this.regexp_eatOctalDigit(state)) {
+        state.lastIntValue = n1 * 64 + n2 * 8 + state.lastIntValue
+      } else {
+        state.lastIntValue = n1 * 8 + n2
+      }
+    } else {
+      state.lastIntValue = n1
+    }
+    return true
+  }
+  return false
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-OctalDigit
+pp.regexp_eatOctalDigit = function(state) {
+  const ch = state.current()
+  if (isOctalDigit(ch)) {
+    state.lastIntValue = ch - 0x30 /* 0 */
+    state.advance()
+    return true
+  }
+  state.lastIntValue = 0
+  return false
+}
+function isOctalDigit(ch) {
+  return ch >= 0x30 /* 0 */ && ch <= 0x37 /* 7 */
+}
+
+// https://www.ecma-international.org/ecma-262/8.0/#prod-Hex4Digits
+// https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigit
+// And HexDigit HexDigit in https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence
+pp.regexp_eatFixedHexDigits = function(state, length) {
+  const start = state.pos
+  state.lastIntValue = 0
+  for (let i = 0; i < length; ++i) {
+    const ch = state.current()
+    if (!isHexDigit(ch)) {
+      state.pos = start
+      return false
+    }
+    state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch)
+    state.advance()
+  }
+  return true
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/scope.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/scope.js
new file mode 100644
index 0000000000..b0b9866611
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/scope.js
@@ -0,0 +1,95 @@
+import {Parser} from "./state"
+import {SCOPE_VAR, SCOPE_FUNCTION, SCOPE_TOP, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, BIND_LEXICAL, BIND_SIMPLE_CATCH, BIND_FUNCTION} from "./scopeflags"
+
+const pp = Parser.prototype
+
+class Scope {
+  constructor(flags) {
+    this.flags = flags
+    // A list of var-declared names in the current lexical scope
+    this.var = []
+    // A list of lexically-declared names in the current lexical scope
+    this.lexical = []
+    // A list of lexically-declared FunctionDeclaration names in the current lexical scope
+    this.functions = []
+  }
+}
+
+// The functions in this module keep track of declared variables in the current scope in order to detect duplicate variable names.
+
+pp.enterScope = function(flags) {
+  this.scopeStack.push(new Scope(flags))
+}
+
+pp.exitScope = function() {
+  this.scopeStack.pop()
+}
+
+// The spec says:
+// > At the top level of a function, or script, function declarations are
+// > treated like var declarations rather than like lexical declarations.
+pp.treatFunctionsAsVarInScope = function(scope) {
+  return (scope.flags & SCOPE_FUNCTION) || !this.inModule && (scope.flags & SCOPE_TOP)
+}
+
+pp.declareName = function(name, bindingType, pos) {
+  let redeclared = false
+  if (bindingType === BIND_LEXICAL) {
+    const scope = this.currentScope()
+    redeclared = scope.lexical.indexOf(name) > -1 || scope.functions.indexOf(name) > -1 || scope.var.indexOf(name) > -1
+    scope.lexical.push(name)
+    if (this.inModule && (scope.flags & SCOPE_TOP))
+      delete this.undefinedExports[name]
+  } else if (bindingType === BIND_SIMPLE_CATCH) {
+    const scope = this.currentScope()
+    scope.lexical.push(name)
+  } else if (bindingType === BIND_FUNCTION) {
+    const scope = this.currentScope()
+    if (this.treatFunctionsAsVar)
+      redeclared = scope.lexical.indexOf(name) > -1
+    else
+      redeclared = scope.lexical.indexOf(name) > -1 || scope.var.indexOf(name) > -1
+    scope.functions.push(name)
+  } else {
+    for (let i = this.scopeStack.length - 1; i >= 0; --i) {
+      const scope = this.scopeStack[i]
+      if (scope.lexical.indexOf(name) > -1 && !((scope.flags & SCOPE_SIMPLE_CATCH) && scope.lexical[0] === name) ||
+          !this.treatFunctionsAsVarInScope(scope) && scope.functions.indexOf(name) > -1) {
+        redeclared = true
+        break
+      }
+      scope.var.push(name)
+      if (this.inModule && (scope.flags & SCOPE_TOP))
+        delete this.undefinedExports[name]
+      if (scope.flags & SCOPE_VAR) break
+    }
+  }
+  if (redeclared) this.raiseRecoverable(pos, `Identifier '${name}' has already been declared`)
+}
+
+pp.checkLocalExport = function(id) {
+  // scope.functions must be empty as Module code is always strict.
+  if (this.scopeStack[0].lexical.indexOf(id.name) === -1 &&
+      this.scopeStack[0].var.indexOf(id.name) === -1) {
+    this.undefinedExports[id.name] = id
+  }
+}
+
+pp.currentScope = function() {
+  return this.scopeStack[this.scopeStack.length - 1]
+}
+
+pp.currentVarScope = function() {
+  for (let i = this.scopeStack.length - 1;; i--) {
+    let scope = this.scopeStack[i]
+    if (scope.flags & SCOPE_VAR) return scope
+  }
+}
+
+// Could be useful for `this`, `new.target`, `super()`, `super.property`, and `super[property]`.
+pp.currentThisScope = function() {
+  for (let i = this.scopeStack.length - 1;; i--) {
+    let scope = this.scopeStack[i]
+    if (scope.flags & SCOPE_VAR && !(scope.flags & SCOPE_ARROW)) return scope
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/scopeflags.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/scopeflags.js
new file mode 100644
index 0000000000..ccb16ecc48
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/scopeflags.js
@@ -0,0 +1,24 @@
+// Each scope gets a bitset that may contain these flags
+export const
+    SCOPE_TOP = 1,
+    SCOPE_FUNCTION = 2,
+    SCOPE_VAR = SCOPE_TOP | SCOPE_FUNCTION,
+    SCOPE_ASYNC = 4,
+    SCOPE_GENERATOR = 8,
+    SCOPE_ARROW = 16,
+    SCOPE_SIMPLE_CATCH = 32,
+    SCOPE_SUPER = 64,
+    SCOPE_DIRECT_SUPER = 128
+
+export function functionFlags(async, generator) {
+  return SCOPE_FUNCTION | (async ? SCOPE_ASYNC : 0) | (generator ? SCOPE_GENERATOR : 0)
+}
+
+// Used in checkLVal and declareName to determine the type of a binding
+export const
+    BIND_NONE = 0, // Not a binding
+    BIND_VAR = 1, // Var-style binding
+    BIND_LEXICAL = 2, // Let- or const-style binding
+    BIND_FUNCTION = 3, // Function declaration
+    BIND_SIMPLE_CATCH = 4, // Simple (identifier pattern) catch binding
+    BIND_OUTSIDE = 5 // Special case for function names as bound inside the function
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/state.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/state.js
new file mode 100644
index 0000000000..eb4e0e1208
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/state.js
@@ -0,0 +1,124 @@
+import {reservedWords, keywords} from "./identifier"
+import {types as tt} from "./tokentype"
+import {lineBreak} from "./whitespace"
+import {getOptions} from "./options"
+import {wordsRegexp} from "./util"
+import {SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_SUPER, SCOPE_DIRECT_SUPER} from "./scopeflags"
+
+export class Parser {
+  constructor(options, input, startPos) {
+    this.options = options = getOptions(options)
+    this.sourceFile = options.sourceFile
+    this.keywords = wordsRegexp(keywords[options.ecmaVersion >= 6 ? 6 : options.sourceType === "module" ? "5module" : 5])
+    let reserved = ""
+    if (options.allowReserved !== true) {
+      for (let v = options.ecmaVersion;; v--)
+        if (reserved = reservedWords[v]) break
+      if (options.sourceType === "module") reserved += " await"
+    }
+    this.reservedWords = wordsRegexp(reserved)
+    let reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict
+    this.reservedWordsStrict = wordsRegexp(reservedStrict)
+    this.reservedWordsStrictBind = wordsRegexp(reservedStrict + " " + reservedWords.strictBind)
+    this.input = String(input)
+
+    // Used to signal to callers of `readWord1` whether the word
+    // contained any escape sequences. This is needed because words with
+    // escape sequences must not be interpreted as keywords.
+    this.containsEsc = false
+
+    // Set up token state
+
+    // The current position of the tokenizer in the input.
+    if (startPos) {
+      this.pos = startPos
+      this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1
+      this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length
+    } else {
+      this.pos = this.lineStart = 0
+      this.curLine = 1
+    }
+
+    // Properties of the current token:
+    // Its type
+    this.type = tt.eof
+    // For tokens that include more information than their type, the value
+    this.value = null
+    // Its start and end offset
+    this.start = this.end = this.pos
+    // And, if locations are used, the {line, column} object
+    // corresponding to those offsets
+    this.startLoc = this.endLoc = this.curPosition()
+
+    // Position information for the previous token
+    this.lastTokEndLoc = this.lastTokStartLoc = null
+    this.lastTokStart = this.lastTokEnd = this.pos
+
+    // The context stack is used to superficially track syntactic
+    // context to predict whether a regular expression is allowed in a
+    // given position.
+    this.context = this.initialContext()
+    this.exprAllowed = true
+
+    // Figure out if it's a module code.
+    this.inModule = options.sourceType === "module"
+    this.strict = this.inModule || this.strictDirective(this.pos)
+
+    // Used to signify the start of a potential arrow function
+    this.potentialArrowAt = -1
+
+    // Positions to delayed-check that yield/await does not exist in default parameters.
+    this.yieldPos = this.awaitPos = this.awaitIdentPos = 0
+    // Labels in scope.
+    this.labels = []
+    // Thus-far undefined exports.
+    this.undefinedExports = {}
+
+    // If enabled, skip leading hashbang line.
+    if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === "#!")
+      this.skipLineComment(2)
+
+    // Scope tracking for duplicate variable names (see scope.js)
+    this.scopeStack = []
+    this.enterScope(SCOPE_TOP)
+
+    // For RegExp validation
+    this.regexpState = null
+  }
+
+  parse() {
+    let node = this.options.program || this.startNode()
+    this.nextToken()
+    return this.parseTopLevel(node)
+  }
+
+  get inFunction() { return (this.currentVarScope().flags & SCOPE_FUNCTION) > 0 }
+  get inGenerator() { return (this.currentVarScope().flags & SCOPE_GENERATOR) > 0 }
+  get inAsync() { return (this.currentVarScope().flags & SCOPE_ASYNC) > 0 }
+  get allowSuper() { return (this.currentThisScope().flags & SCOPE_SUPER) > 0 }
+  get allowDirectSuper() { return (this.currentThisScope().flags & SCOPE_DIRECT_SUPER) > 0 }
+  get treatFunctionsAsVar() { return this.treatFunctionsAsVarInScope(this.currentScope()) }
+
+  // Switch to a getter for 7.0.0.
+  inNonArrowFunction() { return (this.currentThisScope().flags & SCOPE_FUNCTION) > 0 }
+
+  static extend(...plugins) {
+    let cls = this
+    for (let i = 0; i < plugins.length; i++) cls = plugins[i](cls)
+    return cls
+  }
+
+  static parse(input, options) {
+    return new this(options, input).parse()
+  }
+
+  static parseExpressionAt(input, pos, options) {
+    let parser = new this(options, input, pos)
+    parser.nextToken()
+    return parser.parseExpression()
+  }
+
+  static tokenizer(input, options) {
+    return new this(options, input)
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/statement.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/statement.js
new file mode 100644
index 0000000000..8c7e171a9f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/statement.js
@@ -0,0 +1,877 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {lineBreak, skipWhiteSpace} from "./whitespace"
+import {isIdentifierStart, isIdentifierChar, keywordRelationalOperator} from "./identifier"
+import {has} from "./util"
+import {DestructuringErrors} from "./parseutil"
+import {functionFlags, SCOPE_SIMPLE_CATCH, BIND_SIMPLE_CATCH, BIND_LEXICAL, BIND_VAR, BIND_FUNCTION} from "./scopeflags"
+
+const pp = Parser.prototype
+
+// ### Statement parsing
+
+// Parse a program. Initializes the parser, reads any number of
+// statements, and wraps them in a Program node.  Optionally takes a
+// `program` argument.  If present, the statements will be appended
+// to its body instead of creating a new node.
+
+pp.parseTopLevel = function(node) {
+  let exports = {}
+  if (!node.body) node.body = []
+  while (this.type !== tt.eof) {
+    let stmt = this.parseStatement(null, true, exports)
+    node.body.push(stmt)
+  }
+  if (this.inModule)
+    for (let name of Object.keys(this.undefinedExports))
+      this.raiseRecoverable(this.undefinedExports[name].start, `Export '${name}' is not defined`)
+  this.adaptDirectivePrologue(node.body)
+  this.next()
+  node.sourceType = this.options.sourceType
+  return this.finishNode(node, "Program")
+}
+
+const loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"}
+
+pp.isLet = function(context) {
+  if (this.options.ecmaVersion < 6 || !this.isContextual("let")) return false
+  skipWhiteSpace.lastIndex = this.pos
+  let skip = skipWhiteSpace.exec(this.input)
+  let next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next)
+  // For ambiguous cases, determine if a LexicalDeclaration (or only a
+  // Statement) is allowed here. If context is not empty then only a Statement
+  // is allowed. However, `let [` is an explicit negative lookahead for
+  // ExpressionStatement, so special-case it first.
+  if (nextCh === 91) return true // '['
+  if (context) return false
+
+  if (nextCh === 123) return true // '{'
+  if (isIdentifierStart(nextCh, true)) {
+    let pos = next + 1
+    while (isIdentifierChar(this.input.charCodeAt(pos), true)) ++pos
+    let ident = this.input.slice(next, pos)
+    if (!keywordRelationalOperator.test(ident)) return true
+  }
+  return false
+}
+
+// check 'async [no LineTerminator here] function'
+// - 'async /*foo*/ function' is OK.
+// - 'async /*\n*/ function' is invalid.
+pp.isAsyncFunction = function() {
+  if (this.options.ecmaVersion < 8 || !this.isContextual("async"))
+    return false
+
+  skipWhiteSpace.lastIndex = this.pos
+  let skip = skipWhiteSpace.exec(this.input)
+  let next = this.pos + skip[0].length
+  return !lineBreak.test(this.input.slice(this.pos, next)) &&
+    this.input.slice(next, next + 8) === "function" &&
+    (next + 8 === this.input.length || !isIdentifierChar(this.input.charAt(next + 8)))
+}
+
+// Parse a single statement.
+//
+// If expecting a statement and finding a slash operator, parse a
+// regular expression literal. This is to handle cases like
+// `if (foo) /blah/.exec(foo)`, where looking at the previous token
+// does not help.
+
+pp.parseStatement = function(context, topLevel, exports) {
+  let starttype = this.type, node = this.startNode(), kind
+
+  if (this.isLet(context)) {
+    starttype = tt._var
+    kind = "let"
+  }
+
+  // Most types of statements are recognized by the keyword they
+  // start with. Many are trivial to parse, some require a bit of
+  // complexity.
+
+  switch (starttype) {
+  case tt._break: case tt._continue: return this.parseBreakContinueStatement(node, starttype.keyword)
+  case tt._debugger: return this.parseDebuggerStatement(node)
+  case tt._do: return this.parseDoStatement(node)
+  case tt._for: return this.parseForStatement(node)
+  case tt._function:
+    // Function as sole body of either an if statement or a labeled statement
+    // works, but not when it is part of a labeled statement that is the sole
+    // body of an if statement.
+    if ((context && (this.strict || context !== "if" && context !== "label")) && this.options.ecmaVersion >= 6) this.unexpected()
+    return this.parseFunctionStatement(node, false, !context)
+  case tt._class:
+    if (context) this.unexpected()
+    return this.parseClass(node, true)
+  case tt._if: return this.parseIfStatement(node)
+  case tt._return: return this.parseReturnStatement(node)
+  case tt._switch: return this.parseSwitchStatement(node)
+  case tt._throw: return this.parseThrowStatement(node)
+  case tt._try: return this.parseTryStatement(node)
+  case tt._const: case tt._var:
+    kind = kind || this.value
+    if (context && kind !== "var") this.unexpected()
+    return this.parseVarStatement(node, kind)
+  case tt._while: return this.parseWhileStatement(node)
+  case tt._with: return this.parseWithStatement(node)
+  case tt.braceL: return this.parseBlock(true, node)
+  case tt.semi: return this.parseEmptyStatement(node)
+  case tt._export:
+  case tt._import:
+    if (this.options.ecmaVersion > 10 && starttype === tt._import) {
+      skipWhiteSpace.lastIndex = this.pos
+      let skip = skipWhiteSpace.exec(this.input)
+      let next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next)
+      if (nextCh === 40) // '('
+        return this.parseExpressionStatement(node, this.parseExpression())
+    }
+
+    if (!this.options.allowImportExportEverywhere) {
+      if (!topLevel)
+        this.raise(this.start, "'import' and 'export' may only appear at the top level")
+      if (!this.inModule)
+        this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'")
+    }
+    return starttype === tt._import ? this.parseImport(node) : this.parseExport(node, exports)
+
+    // If the statement does not start with a statement keyword or a
+    // brace, it's an ExpressionStatement or LabeledStatement. We
+    // simply start parsing an expression, and afterwards, if the
+    // next token is a colon and the expression was a simple
+    // Identifier node, we switch to interpreting it as a label.
+  default:
+    if (this.isAsyncFunction()) {
+      if (context) this.unexpected()
+      this.next()
+      return this.parseFunctionStatement(node, true, !context)
+    }
+
+    let maybeName = this.value, expr = this.parseExpression()
+    if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon))
+      return this.parseLabeledStatement(node, maybeName, expr, context)
+    else return this.parseExpressionStatement(node, expr)
+  }
+}
+
+pp.parseBreakContinueStatement = function(node, keyword) {
+  let isBreak = keyword === "break"
+  this.next()
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.label = null
+  else if (this.type !== tt.name) this.unexpected()
+  else {
+    node.label = this.parseIdent()
+    this.semicolon()
+  }
+
+  // Verify that there is an actual destination to break or
+  // continue to.
+  let i = 0
+  for (; i < this.labels.length; ++i) {
+    let lab = this.labels[i]
+    if (node.label == null || lab.name === node.label.name) {
+      if (lab.kind != null && (isBreak || lab.kind === "loop")) break
+      if (node.label && isBreak) break
+    }
+  }
+  if (i === this.labels.length) this.raise(node.start, "Unsyntactic " + keyword)
+  return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+}
+
+pp.parseDebuggerStatement = function(node) {
+  this.next()
+  this.semicolon()
+  return this.finishNode(node, "DebuggerStatement")
+}
+
+pp.parseDoStatement = function(node) {
+  this.next()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement("do")
+  this.labels.pop()
+  this.expect(tt._while)
+  node.test = this.parseParenExpression()
+  if (this.options.ecmaVersion >= 6)
+    this.eat(tt.semi)
+  else
+    this.semicolon()
+  return this.finishNode(node, "DoWhileStatement")
+}
+
+// Disambiguating between a `for` and a `for`/`in` or `for`/`of`
+// loop is non-trivial. Basically, we have to parse the init `var`
+// statement or expression, disallowing the `in` operator (see
+// the second parameter to `parseExpression`), and then check
+// whether the next token is `in` or `of`. When there is no init
+// part (semicolon immediately after the opening parenthesis), it
+// is a regular `for` loop.
+
+pp.parseForStatement = function(node) {
+  this.next()
+  let awaitAt = (this.options.ecmaVersion >= 9 && (this.inAsync || (!this.inFunction && this.options.allowAwaitOutsideFunction)) && this.eatContextual("await")) ? this.lastTokStart : -1
+  this.labels.push(loopLabel)
+  this.enterScope(0)
+  this.expect(tt.parenL)
+  if (this.type === tt.semi) {
+    if (awaitAt > -1) this.unexpected(awaitAt)
+    return this.parseFor(node, null)
+  }
+  let isLet = this.isLet()
+  if (this.type === tt._var || this.type === tt._const || isLet) {
+    let init = this.startNode(), kind = isLet ? "let" : this.value
+    this.next()
+    this.parseVar(init, true, kind)
+    this.finishNode(init, "VariableDeclaration")
+    if ((this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init.declarations.length === 1) {
+      if (this.options.ecmaVersion >= 9) {
+        if (this.type === tt._in) {
+          if (awaitAt > -1) this.unexpected(awaitAt)
+        } else node.await = awaitAt > -1
+      }
+      return this.parseForIn(node, init)
+    }
+    if (awaitAt > -1) this.unexpected(awaitAt)
+    return this.parseFor(node, init)
+  }
+  let refDestructuringErrors = new DestructuringErrors
+  let init = this.parseExpression(true, refDestructuringErrors)
+  if (this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) {
+    if (this.options.ecmaVersion >= 9) {
+      if (this.type === tt._in) {
+        if (awaitAt > -1) this.unexpected(awaitAt)
+      } else node.await = awaitAt > -1
+    }
+    this.toAssignable(init, false, refDestructuringErrors)
+    this.checkLVal(init)
+    return this.parseForIn(node, init)
+  } else {
+    this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  if (awaitAt > -1) this.unexpected(awaitAt)
+  return this.parseFor(node, init)
+}
+
+pp.parseFunctionStatement = function(node, isAsync, declarationPosition) {
+  this.next()
+  return this.parseFunction(node, FUNC_STATEMENT | (declarationPosition ? 0 : FUNC_HANGING_STATEMENT), false, isAsync)
+}
+
+pp.parseIfStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  // allow function declarations in branches, but only in non-strict mode
+  node.consequent = this.parseStatement("if")
+  node.alternate = this.eat(tt._else) ? this.parseStatement("if") : null
+  return this.finishNode(node, "IfStatement")
+}
+
+pp.parseReturnStatement = function(node) {
+  if (!this.inFunction && !this.options.allowReturnOutsideFunction)
+    this.raise(this.start, "'return' outside of function")
+  this.next()
+
+  // In `return` (and `break`/`continue`), the keywords with
+  // optional arguments, we eagerly look for a semicolon or the
+  // possibility to insert one.
+
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.argument = null
+  else { node.argument = this.parseExpression(); this.semicolon() }
+  return this.finishNode(node, "ReturnStatement")
+}
+
+pp.parseSwitchStatement = function(node) {
+  this.next()
+  node.discriminant = this.parseParenExpression()
+  node.cases = []
+  this.expect(tt.braceL)
+  this.labels.push(switchLabel)
+  this.enterScope(0)
+
+  // Statements under must be grouped (by label) in SwitchCase
+  // nodes. `cur` is used to keep the node that we are currently
+  // adding statements to.
+
+  let cur
+  for (let sawDefault = false; this.type !== tt.braceR;) {
+    if (this.type === tt._case || this.type === tt._default) {
+      let isCase = this.type === tt._case
+      if (cur) this.finishNode(cur, "SwitchCase")
+      node.cases.push(cur = this.startNode())
+      cur.consequent = []
+      this.next()
+      if (isCase) {
+        cur.test = this.parseExpression()
+      } else {
+        if (sawDefault) this.raiseRecoverable(this.lastTokStart, "Multiple default clauses")
+        sawDefault = true
+        cur.test = null
+      }
+      this.expect(tt.colon)
+    } else {
+      if (!cur) this.unexpected()
+      cur.consequent.push(this.parseStatement(null))
+    }
+  }
+  this.exitScope()
+  if (cur) this.finishNode(cur, "SwitchCase")
+  this.next() // Closing brace
+  this.labels.pop()
+  return this.finishNode(node, "SwitchStatement")
+}
+
+pp.parseThrowStatement = function(node) {
+  this.next()
+  if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start)))
+    this.raise(this.lastTokEnd, "Illegal newline after throw")
+  node.argument = this.parseExpression()
+  this.semicolon()
+  return this.finishNode(node, "ThrowStatement")
+}
+
+// Reused empty array added for node fields that are always empty.
+
+const empty = []
+
+pp.parseTryStatement = function(node) {
+  this.next()
+  node.block = this.parseBlock()
+  node.handler = null
+  if (this.type === tt._catch) {
+    let clause = this.startNode()
+    this.next()
+    if (this.eat(tt.parenL)) {
+      clause.param = this.parseBindingAtom()
+      let simple = clause.param.type === "Identifier"
+      this.enterScope(simple ? SCOPE_SIMPLE_CATCH : 0)
+      this.checkLVal(clause.param, simple ? BIND_SIMPLE_CATCH : BIND_LEXICAL)
+      this.expect(tt.parenR)
+    } else {
+      if (this.options.ecmaVersion < 10) this.unexpected()
+      clause.param = null
+      this.enterScope(0)
+    }
+    clause.body = this.parseBlock(false)
+    this.exitScope()
+    node.handler = this.finishNode(clause, "CatchClause")
+  }
+  node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null
+  if (!node.handler && !node.finalizer)
+    this.raise(node.start, "Missing catch or finally clause")
+  return this.finishNode(node, "TryStatement")
+}
+
+pp.parseVarStatement = function(node, kind) {
+  this.next()
+  this.parseVar(node, false, kind)
+  this.semicolon()
+  return this.finishNode(node, "VariableDeclaration")
+}
+
+pp.parseWhileStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement("while")
+  this.labels.pop()
+  return this.finishNode(node, "WhileStatement")
+}
+
+pp.parseWithStatement = function(node) {
+  if (this.strict) this.raise(this.start, "'with' in strict mode")
+  this.next()
+  node.object = this.parseParenExpression()
+  node.body = this.parseStatement("with")
+  return this.finishNode(node, "WithStatement")
+}
+
+pp.parseEmptyStatement = function(node) {
+  this.next()
+  return this.finishNode(node, "EmptyStatement")
+}
+
+pp.parseLabeledStatement = function(node, maybeName, expr, context) {
+  for (let label of this.labels)
+    if (label.name === maybeName)
+      this.raise(expr.start, "Label '" + maybeName + "' is already declared")
+  let kind = this.type.isLoop ? "loop" : this.type === tt._switch ? "switch" : null
+  for (let i = this.labels.length - 1; i >= 0; i--) {
+    let label = this.labels[i]
+    if (label.statementStart === node.start) {
+      // Update information about previous labels on this node
+      label.statementStart = this.start
+      label.kind = kind
+    } else break
+  }
+  this.labels.push({name: maybeName, kind, statementStart: this.start})
+  node.body = this.parseStatement(context ? context.indexOf("label") === -1 ? context + "label" : context : "label")
+  this.labels.pop()
+  node.label = expr
+  return this.finishNode(node, "LabeledStatement")
+}
+
+pp.parseExpressionStatement = function(node, expr) {
+  node.expression = expr
+  this.semicolon()
+  return this.finishNode(node, "ExpressionStatement")
+}
+
+// Parse a semicolon-enclosed block of statements, handling `"use
+// strict"` declarations when `allowStrict` is true (used for
+// function bodies).
+
+pp.parseBlock = function(createNewLexicalScope = true, node = this.startNode(), exitStrict) {
+  node.body = []
+  this.expect(tt.braceL)
+  if (createNewLexicalScope) this.enterScope(0)
+  while (this.type !== tt.braceR) {
+    let stmt = this.parseStatement(null)
+    node.body.push(stmt)
+  }
+  if (exitStrict) this.strict = false
+  this.next()
+  if (createNewLexicalScope) this.exitScope()
+  return this.finishNode(node, "BlockStatement")
+}
+
+// Parse a regular `for` loop. The disambiguation code in
+// `parseStatement` will already have parsed the init statement or
+// expression.
+
+pp.parseFor = function(node, init) {
+  node.init = init
+  this.expect(tt.semi)
+  node.test = this.type === tt.semi ? null : this.parseExpression()
+  this.expect(tt.semi)
+  node.update = this.type === tt.parenR ? null : this.parseExpression()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement("for")
+  this.exitScope()
+  this.labels.pop()
+  return this.finishNode(node, "ForStatement")
+}
+
+// Parse a `for`/`in` and `for`/`of` loop, which are almost
+// same from parser's perspective.
+
+pp.parseForIn = function(node, init) {
+  const isForIn = this.type === tt._in
+  this.next()
+
+  if (
+    init.type === "VariableDeclaration" &&
+    init.declarations[0].init != null &&
+    (
+      !isForIn ||
+      this.options.ecmaVersion < 8 ||
+      this.strict ||
+      init.kind !== "var" ||
+      init.declarations[0].id.type !== "Identifier"
+    )
+  ) {
+    this.raise(
+      init.start,
+      `${
+        isForIn ? "for-in" : "for-of"
+      } loop variable declaration may not have an initializer`
+    )
+  } else if (init.type === "AssignmentPattern") {
+    this.raise(init.start, "Invalid left-hand side in for-loop")
+  }
+  node.left = init
+  node.right = isForIn ? this.parseExpression() : this.parseMaybeAssign()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement("for")
+  this.exitScope()
+  this.labels.pop()
+  return this.finishNode(node, isForIn ? "ForInStatement" : "ForOfStatement")
+}
+
+// Parse a list of variable declarations.
+
+pp.parseVar = function(node, isFor, kind) {
+  node.declarations = []
+  node.kind = kind
+  for (;;) {
+    let decl = this.startNode()
+    this.parseVarId(decl, kind)
+    if (this.eat(tt.eq)) {
+      decl.init = this.parseMaybeAssign(isFor)
+    } else if (kind === "const" && !(this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of")))) {
+      this.unexpected()
+    } else if (decl.id.type !== "Identifier" && !(isFor && (this.type === tt._in || this.isContextual("of")))) {
+      this.raise(this.lastTokEnd, "Complex binding patterns require an initialization value")
+    } else {
+      decl.init = null
+    }
+    node.declarations.push(this.finishNode(decl, "VariableDeclarator"))
+    if (!this.eat(tt.comma)) break
+  }
+  return node
+}
+
+pp.parseVarId = function(decl, kind) {
+  decl.id = this.parseBindingAtom()
+  this.checkLVal(decl.id, kind === "var" ? BIND_VAR : BIND_LEXICAL, false)
+}
+
+const FUNC_STATEMENT = 1, FUNC_HANGING_STATEMENT = 2, FUNC_NULLABLE_ID = 4
+
+// Parse a function declaration or literal (depending on the
+// `statement & FUNC_STATEMENT`).
+
+// Remove `allowExpressionBody` for 7.0.0, as it is only called with false
+pp.parseFunction = function(node, statement, allowExpressionBody, isAsync) {
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 9 || this.options.ecmaVersion >= 6 && !isAsync) {
+    if (this.type === tt.star && (statement & FUNC_HANGING_STATEMENT))
+      this.unexpected()
+    node.generator = this.eat(tt.star)
+  }
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  if (statement & FUNC_STATEMENT) {
+    node.id = (statement & FUNC_NULLABLE_ID) && this.type !== tt.name ? null : this.parseIdent()
+    if (node.id && !(statement & FUNC_HANGING_STATEMENT))
+      // If it is a regular function declaration in sloppy mode, then it is
+      // subject to Annex B semantics (BIND_FUNCTION). Otherwise, the binding
+      // mode depends on properties of the current scope (see
+      // treatFunctionsAsVar).
+      this.checkLVal(node.id, (this.strict || node.generator || node.async) ? this.treatFunctionsAsVar ? BIND_VAR : BIND_LEXICAL : BIND_FUNCTION)
+  }
+
+  let oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos
+  this.yieldPos = 0
+  this.awaitPos = 0
+  this.awaitIdentPos = 0
+  this.enterScope(functionFlags(node.async, node.generator))
+
+  if (!(statement & FUNC_STATEMENT))
+    node.id = this.type === tt.name ? this.parseIdent() : null
+
+  this.parseFunctionParams(node)
+  this.parseFunctionBody(node, allowExpressionBody, false)
+
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  this.awaitIdentPos = oldAwaitIdentPos
+  return this.finishNode(node, (statement & FUNC_STATEMENT) ? "FunctionDeclaration" : "FunctionExpression")
+}
+
+pp.parseFunctionParams = function(node) {
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8)
+  this.checkYieldAwaitInDefaultParams()
+}
+
+// Parse a class declaration or literal (depending on the
+// `isStatement` parameter).
+
+pp.parseClass = function(node, isStatement) {
+  this.next()
+
+  // ecma-262 14.6 Class Definitions
+  // A class definition is always strict mode code.
+  const oldStrict = this.strict
+  this.strict = true
+
+  this.parseClassId(node, isStatement)
+  this.parseClassSuper(node)
+  let classBody = this.startNode()
+  let hadConstructor = false
+  classBody.body = []
+  this.expect(tt.braceL)
+  while (this.type !== tt.braceR) {
+    const element = this.parseClassElement(node.superClass !== null)
+    if (element) {
+      classBody.body.push(element)
+      if (element.type === "MethodDefinition" && element.kind === "constructor") {
+        if (hadConstructor) this.raise(element.start, "Duplicate constructor in the same class")
+        hadConstructor = true
+      }
+    }
+  }
+  this.strict = oldStrict
+  this.next()
+  node.body = this.finishNode(classBody, "ClassBody")
+  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+}
+
+pp.parseClassElement = function(constructorAllowsSuper) {
+  if (this.eat(tt.semi)) return null
+
+  let method = this.startNode()
+  const tryContextual = (k, noLineBreak = false) => {
+    const start = this.start, startLoc = this.startLoc
+    if (!this.eatContextual(k)) return false
+    if (this.type !== tt.parenL && (!noLineBreak || !this.canInsertSemicolon())) return true
+    if (method.key) this.unexpected()
+    method.computed = false
+    method.key = this.startNodeAt(start, startLoc)
+    method.key.name = k
+    this.finishNode(method.key, "Identifier")
+    return false
+  }
+
+  method.kind = "method"
+  method.static = tryContextual("static")
+  let isGenerator = this.eat(tt.star)
+  let isAsync = false
+  if (!isGenerator) {
+    if (this.options.ecmaVersion >= 8 && tryContextual("async", true)) {
+      isAsync = true
+      isGenerator = this.options.ecmaVersion >= 9 && this.eat(tt.star)
+    } else if (tryContextual("get")) {
+      method.kind = "get"
+    } else if (tryContextual("set")) {
+      method.kind = "set"
+    }
+  }
+  if (!method.key) this.parsePropertyName(method)
+  let {key} = method
+  let allowsDirectSuper = false
+  if (!method.computed && !method.static && (key.type === "Identifier" && key.name === "constructor" ||
+      key.type === "Literal" && key.value === "constructor")) {
+    if (method.kind !== "method") this.raise(key.start, "Constructor can't have get/set modifier")
+    if (isGenerator) this.raise(key.start, "Constructor can't be a generator")
+    if (isAsync) this.raise(key.start, "Constructor can't be an async method")
+    method.kind = "constructor"
+    allowsDirectSuper = constructorAllowsSuper
+  } else if (method.static && key.type === "Identifier" && key.name === "prototype") {
+    this.raise(key.start, "Classes may not have a static property named prototype")
+  }
+  this.parseClassMethod(method, isGenerator, isAsync, allowsDirectSuper)
+  if (method.kind === "get" && method.value.params.length !== 0)
+    this.raiseRecoverable(method.value.start, "getter should have no params")
+  if (method.kind === "set" && method.value.params.length !== 1)
+    this.raiseRecoverable(method.value.start, "setter should have exactly one param")
+  if (method.kind === "set" && method.value.params[0].type === "RestElement")
+    this.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params")
+  return method
+}
+
+pp.parseClassMethod = function(method, isGenerator, isAsync, allowsDirectSuper) {
+  method.value = this.parseMethod(isGenerator, isAsync, allowsDirectSuper)
+  return this.finishNode(method, "MethodDefinition")
+}
+
+pp.parseClassId = function(node, isStatement) {
+  if (this.type === tt.name) {
+    node.id = this.parseIdent()
+    if (isStatement)
+      this.checkLVal(node.id, BIND_LEXICAL, false)
+  } else {
+    if (isStatement === true)
+      this.unexpected()
+    node.id = null
+  }
+}
+
+pp.parseClassSuper = function(node) {
+  node.superClass = this.eat(tt._extends) ? this.parseExprSubscripts() : null
+}
+
+// Parses module export declaration.
+
+pp.parseExport = function(node, exports) {
+  this.next()
+  // export * from '...'
+  if (this.eat(tt.star)) {
+    if (this.options.ecmaVersion >= 11) {
+      if (this.eatContextual("as")) {
+        node.exported = this.parseIdent(true)
+        this.checkExport(exports, node.exported.name, this.lastTokStart)
+      } else {
+        node.exported = null
+      }
+    }
+    this.expectContextual("from")
+    if (this.type !== tt.string) this.unexpected()
+    node.source = this.parseExprAtom()
+    this.semicolon()
+    return this.finishNode(node, "ExportAllDeclaration")
+  }
+  if (this.eat(tt._default)) { // export default ...
+    this.checkExport(exports, "default", this.lastTokStart)
+    let isAsync
+    if (this.type === tt._function || (isAsync = this.isAsyncFunction())) {
+      let fNode = this.startNode()
+      this.next()
+      if (isAsync) this.next()
+      node.declaration = this.parseFunction(fNode, FUNC_STATEMENT | FUNC_NULLABLE_ID, false, isAsync)
+    } else if (this.type === tt._class) {
+      let cNode = this.startNode()
+      node.declaration = this.parseClass(cNode, "nullableID")
+    } else {
+      node.declaration = this.parseMaybeAssign()
+      this.semicolon()
+    }
+    return this.finishNode(node, "ExportDefaultDeclaration")
+  }
+  // export var|const|let|function|class ...
+  if (this.shouldParseExportStatement()) {
+    node.declaration = this.parseStatement(null)
+    if (node.declaration.type === "VariableDeclaration")
+      this.checkVariableExport(exports, node.declaration.declarations)
+    else
+      this.checkExport(exports, node.declaration.id.name, node.declaration.id.start)
+    node.specifiers = []
+    node.source = null
+  } else { // export { x, y as z } [from '...']
+    node.declaration = null
+    node.specifiers = this.parseExportSpecifiers(exports)
+    if (this.eatContextual("from")) {
+      if (this.type !== tt.string) this.unexpected()
+      node.source = this.parseExprAtom()
+    } else {
+      for (let spec of node.specifiers) {
+        // check for keywords used as local names
+        this.checkUnreserved(spec.local)
+        // check if export is defined
+        this.checkLocalExport(spec.local)
+      }
+
+      node.source = null
+    }
+    this.semicolon()
+  }
+  return this.finishNode(node, "ExportNamedDeclaration")
+}
+
+pp.checkExport = function(exports, name, pos) {
+  if (!exports) return
+  if (has(exports, name))
+    this.raiseRecoverable(pos, "Duplicate export '" + name + "'")
+  exports[name] = true
+}
+
+pp.checkPatternExport = function(exports, pat) {
+  let type = pat.type
+  if (type === "Identifier")
+    this.checkExport(exports, pat.name, pat.start)
+  else if (type === "ObjectPattern")
+    for (let prop of pat.properties)
+      this.checkPatternExport(exports, prop)
+  else if (type === "ArrayPattern")
+    for (let elt of pat.elements) {
+      if (elt) this.checkPatternExport(exports, elt)
+    }
+  else if (type === "Property")
+    this.checkPatternExport(exports, pat.value)
+  else if (type === "AssignmentPattern")
+    this.checkPatternExport(exports, pat.left)
+  else if (type === "RestElement")
+    this.checkPatternExport(exports, pat.argument)
+  else if (type === "ParenthesizedExpression")
+    this.checkPatternExport(exports, pat.expression)
+}
+
+pp.checkVariableExport = function(exports, decls) {
+  if (!exports) return
+  for (let decl of decls)
+    this.checkPatternExport(exports, decl.id)
+}
+
+pp.shouldParseExportStatement = function() {
+  return this.type.keyword === "var" ||
+    this.type.keyword === "const" ||
+    this.type.keyword === "class" ||
+    this.type.keyword === "function" ||
+    this.isLet() ||
+    this.isAsyncFunction()
+}
+
+// Parses a comma-separated list of module exports.
+
+pp.parseExportSpecifiers = function(exports) {
+  let nodes = [], first = true
+  // export { x, y as z } [from '...']
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    let node = this.startNode()
+    node.local = this.parseIdent(true)
+    node.exported = this.eatContextual("as") ? this.parseIdent(true) : node.local
+    this.checkExport(exports, node.exported.name, node.exported.start)
+    nodes.push(this.finishNode(node, "ExportSpecifier"))
+  }
+  return nodes
+}
+
+// Parses import declaration.
+
+pp.parseImport = function(node) {
+  this.next()
+  // import '...'
+  if (this.type === tt.string) {
+    node.specifiers = empty
+    node.source = this.parseExprAtom()
+  } else {
+    node.specifiers = this.parseImportSpecifiers()
+    this.expectContextual("from")
+    node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+  }
+  this.semicolon()
+  return this.finishNode(node, "ImportDeclaration")
+}
+
+// Parses a comma-separated list of module imports.
+
+pp.parseImportSpecifiers = function() {
+  let nodes = [], first = true
+  if (this.type === tt.name) {
+    // import defaultObj, { x, y as z } from '...'
+    let node = this.startNode()
+    node.local = this.parseIdent()
+    this.checkLVal(node.local, BIND_LEXICAL)
+    nodes.push(this.finishNode(node, "ImportDefaultSpecifier"))
+    if (!this.eat(tt.comma)) return nodes
+  }
+  if (this.type === tt.star) {
+    let node = this.startNode()
+    this.next()
+    this.expectContextual("as")
+    node.local = this.parseIdent()
+    this.checkLVal(node.local, BIND_LEXICAL)
+    nodes.push(this.finishNode(node, "ImportNamespaceSpecifier"))
+    return nodes
+  }
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    let node = this.startNode()
+    node.imported = this.parseIdent(true)
+    if (this.eatContextual("as")) {
+      node.local = this.parseIdent()
+    } else {
+      this.checkUnreserved(node.imported)
+      node.local = node.imported
+    }
+    this.checkLVal(node.local, BIND_LEXICAL)
+    nodes.push(this.finishNode(node, "ImportSpecifier"))
+  }
+  return nodes
+}
+
+// Set `ExpressionStatement#directive` property for directive prologues.
+pp.adaptDirectivePrologue = function(statements) {
+  for (let i = 0; i < statements.length && this.isDirectiveCandidate(statements[i]); ++i) {
+    statements[i].directive = statements[i].expression.raw.slice(1, -1)
+  }
+}
+pp.isDirectiveCandidate = function(statement) {
+  return (
+    statement.type === "ExpressionStatement" &&
+    statement.expression.type === "Literal" &&
+    typeof statement.expression.value === "string" &&
+    // Reject parenthesized strings.
+    (this.input[statement.start] === "\"" || this.input[statement.start] === "'")
+  )
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/tokencontext.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokencontext.js
new file mode 100644
index 0000000000..1ff5556879
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokencontext.js
@@ -0,0 +1,149 @@
+// The algorithm used to determine whether a regexp can appear at a
+// given point in the program is loosely based on sweet.js' approach.
+// See https://github.com/mozilla/sweet.js/wiki/design
+
+import {Parser} from "./state"
+import {types as tt} from "./tokentype"
+import {lineBreak} from "./whitespace"
+
+export class TokContext {
+  constructor(token, isExpr, preserveSpace, override, generator) {
+    this.token = token
+    this.isExpr = !!isExpr
+    this.preserveSpace = !!preserveSpace
+    this.override = override
+    this.generator = !!generator
+  }
+}
+
+export const types = {
+  b_stat: new TokContext("{", false),
+  b_expr: new TokContext("{", true),
+  b_tmpl: new TokContext("${", false),
+  p_stat: new TokContext("(", false),
+  p_expr: new TokContext("(", true),
+  q_tmpl: new TokContext("`", true, true, p => p.tryReadTemplateToken()),
+  f_stat: new TokContext("function", false),
+  f_expr: new TokContext("function", true),
+  f_expr_gen: new TokContext("function", true, false, null, true),
+  f_gen: new TokContext("function", false, false, null, true)
+}
+
+const pp = Parser.prototype
+
+pp.initialContext = function() {
+  return [types.b_stat]
+}
+
+pp.braceIsBlock = function(prevType) {
+  let parent = this.curContext()
+  if (parent === types.f_expr || parent === types.f_stat)
+    return true
+  if (prevType === tt.colon && (parent === types.b_stat || parent === types.b_expr))
+    return !parent.isExpr
+
+  // The check for `tt.name && exprAllowed` detects whether we are
+  // after a `yield` or `of` construct. See the `updateContext` for
+  // `tt.name`.
+  if (prevType === tt._return || prevType === tt.name && this.exprAllowed)
+    return lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+  if (prevType === tt._else || prevType === tt.semi || prevType === tt.eof || prevType === tt.parenR || prevType === tt.arrow)
+    return true
+  if (prevType === tt.braceL)
+    return parent === types.b_stat
+  if (prevType === tt._var || prevType === tt._const || prevType === tt.name)
+    return false
+  return !this.exprAllowed
+}
+
+pp.inGeneratorContext = function() {
+  for (let i = this.context.length - 1; i >= 1; i--) {
+    let context = this.context[i]
+    if (context.token === "function")
+      return context.generator
+  }
+  return false
+}
+
+pp.updateContext = function(prevType) {
+  let update, type = this.type
+  if (type.keyword && prevType === tt.dot)
+    this.exprAllowed = false
+  else if (update = type.updateContext)
+    update.call(this, prevType)
+  else
+    this.exprAllowed = type.beforeExpr
+}
+
+// Token-specific context update code
+
+tt.parenR.updateContext = tt.braceR.updateContext = function() {
+  if (this.context.length === 1) {
+    this.exprAllowed = true
+    return
+  }
+  let out = this.context.pop()
+  if (out === types.b_stat && this.curContext().token === "function") {
+    out = this.context.pop()
+  }
+  this.exprAllowed = !out.isExpr
+}
+
+tt.braceL.updateContext = function(prevType) {
+  this.context.push(this.braceIsBlock(prevType) ? types.b_stat : types.b_expr)
+  this.exprAllowed = true
+}
+
+tt.dollarBraceL.updateContext = function() {
+  this.context.push(types.b_tmpl)
+  this.exprAllowed = true
+}
+
+tt.parenL.updateContext = function(prevType) {
+  let statementParens = prevType === tt._if || prevType === tt._for || prevType === tt._with || prevType === tt._while
+  this.context.push(statementParens ? types.p_stat : types.p_expr)
+  this.exprAllowed = true
+}
+
+tt.incDec.updateContext = function() {
+  // tokExprAllowed stays unchanged
+}
+
+tt._function.updateContext = tt._class.updateContext = function(prevType) {
+  if (prevType.beforeExpr && prevType !== tt.semi && prevType !== tt._else &&
+      !(prevType === tt._return && lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) &&
+      !((prevType === tt.colon || prevType === tt.braceL) && this.curContext() === types.b_stat))
+    this.context.push(types.f_expr)
+  else
+    this.context.push(types.f_stat)
+  this.exprAllowed = false
+}
+
+tt.backQuote.updateContext = function() {
+  if (this.curContext() === types.q_tmpl)
+    this.context.pop()
+  else
+    this.context.push(types.q_tmpl)
+  this.exprAllowed = false
+}
+
+tt.star.updateContext = function(prevType) {
+  if (prevType === tt._function) {
+    let index = this.context.length - 1
+    if (this.context[index] === types.f_expr)
+      this.context[index] = types.f_expr_gen
+    else
+      this.context[index] = types.f_gen
+  }
+  this.exprAllowed = true
+}
+
+tt.name.updateContext = function(prevType) {
+  let allowed = false
+  if (this.options.ecmaVersion >= 6 && prevType !== tt.dot) {
+    if (this.value === "of" && !this.exprAllowed ||
+        this.value === "yield" && this.inGeneratorContext())
+      allowed = true
+  }
+  this.exprAllowed = allowed
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/tokenize.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokenize.js
new file mode 100644
index 0000000000..835fdcd962
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokenize.js
@@ -0,0 +1,727 @@
+import {isIdentifierStart, isIdentifierChar} from "./identifier"
+import {types as tt, keywords as keywordTypes} from "./tokentype"
+import {Parser} from "./state"
+import {SourceLocation} from "./locutil"
+import {RegExpValidationState} from "./regexp"
+import {lineBreak, lineBreakG, isNewLine, nonASCIIwhitespace} from "./whitespace"
+
+// Object type used to represent tokens. Note that normally, tokens
+// simply exist as properties on the parser object. This is only
+// used for the onToken callback and the external tokenizer.
+
+export class Token {
+  constructor(p) {
+    this.type = p.type
+    this.value = p.value
+    this.start = p.start
+    this.end = p.end
+    if (p.options.locations)
+      this.loc = new SourceLocation(p, p.startLoc, p.endLoc)
+    if (p.options.ranges)
+      this.range = [p.start, p.end]
+  }
+}
+
+// ## Tokenizer
+
+const pp = Parser.prototype
+
+// Move to the next token
+
+pp.next = function(ignoreEscapeSequenceInKeyword) {
+  if (!ignoreEscapeSequenceInKeyword && this.type.keyword && this.containsEsc)
+    this.raiseRecoverable(this.start, "Escape sequence in keyword " + this.type.keyword)
+  if (this.options.onToken)
+    this.options.onToken(new Token(this))
+
+  this.lastTokEnd = this.end
+  this.lastTokStart = this.start
+  this.lastTokEndLoc = this.endLoc
+  this.lastTokStartLoc = this.startLoc
+  this.nextToken()
+}
+
+pp.getToken = function() {
+  this.next()
+  return new Token(this)
+}
+
+// If we're in an ES6 environment, make parsers iterable
+if (typeof Symbol !== "undefined")
+  pp[Symbol.iterator] = function() {
+    return {
+      next: () => {
+        let token = this.getToken()
+        return {
+          done: token.type === tt.eof,
+          value: token
+        }
+      }
+    }
+  }
+
+// Toggle strict mode. Re-reads the next number or string to please
+// pedantic tests (`"use strict"; 010;` should fail).
+
+pp.curContext = function() {
+  return this.context[this.context.length - 1]
+}
+
+// Read a single token, updating the parser object's token-related
+// properties.
+
+pp.nextToken = function() {
+  let curContext = this.curContext()
+  if (!curContext || !curContext.preserveSpace) this.skipSpace()
+
+  this.start = this.pos
+  if (this.options.locations) this.startLoc = this.curPosition()
+  if (this.pos >= this.input.length) return this.finishToken(tt.eof)
+
+  if (curContext.override) return curContext.override(this)
+  else this.readToken(this.fullCharCodeAtPos())
+}
+
+pp.readToken = function(code) {
+  // Identifier or keyword. '\uXXXX' sequences are allowed in
+  // identifiers, so '\' also dispatches to that.
+  if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */)
+    return this.readWord()
+
+  return this.getTokenFromCode(code)
+}
+
+pp.fullCharCodeAtPos = function() {
+  let code = this.input.charCodeAt(this.pos)
+  if (code <= 0xd7ff || code >= 0xe000) return code
+  let next = this.input.charCodeAt(this.pos + 1)
+  return (code << 10) + next - 0x35fdc00
+}
+
+pp.skipBlockComment = function() {
+  let startLoc = this.options.onComment && this.curPosition()
+  let start = this.pos, end = this.input.indexOf("*/", this.pos += 2)
+  if (end === -1) this.raise(this.pos - 2, "Unterminated comment")
+  this.pos = end + 2
+  if (this.options.locations) {
+    lineBreakG.lastIndex = start
+    let match
+    while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
+      ++this.curLine
+      this.lineStart = match.index + match[0].length
+    }
+  }
+  if (this.options.onComment)
+    this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+pp.skipLineComment = function(startSkip) {
+  let start = this.pos
+  let startLoc = this.options.onComment && this.curPosition()
+  let ch = this.input.charCodeAt(this.pos += startSkip)
+  while (this.pos < this.input.length && !isNewLine(ch)) {
+    ch = this.input.charCodeAt(++this.pos)
+  }
+  if (this.options.onComment)
+    this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+// Called at the start of the parse and after every token. Skips
+// whitespace and comments, and.
+
+pp.skipSpace = function() {
+  loop: while (this.pos < this.input.length) {
+    let ch = this.input.charCodeAt(this.pos)
+    switch (ch) {
+    case 32: case 160: // ' '
+      ++this.pos
+      break
+    case 13:
+      if (this.input.charCodeAt(this.pos + 1) === 10) {
+        ++this.pos
+      }
+    case 10: case 8232: case 8233:
+      ++this.pos
+      if (this.options.locations) {
+        ++this.curLine
+        this.lineStart = this.pos
+      }
+      break
+    case 47: // '/'
+      switch (this.input.charCodeAt(this.pos + 1)) {
+      case 42: // '*'
+        this.skipBlockComment()
+        break
+      case 47:
+        this.skipLineComment(2)
+        break
+      default:
+        break loop
+      }
+      break
+    default:
+      if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+        ++this.pos
+      } else {
+        break loop
+      }
+    }
+  }
+}
+
+// Called at the end of every token. Sets `end`, `val`, and
+// maintains `context` and `exprAllowed`, and skips the space after
+// the token, so that the next one's `start` will point at the
+// right position.
+
+pp.finishToken = function(type, val) {
+  this.end = this.pos
+  if (this.options.locations) this.endLoc = this.curPosition()
+  let prevType = this.type
+  this.type = type
+  this.value = val
+
+  this.updateContext(prevType)
+}
+
+// ### Token reading
+
+// This is the function that is called to fetch the next token. It
+// is somewhat obscure, because it works in character codes rather
+// than characters, and because operator parsing has been inlined
+// into it.
+//
+// All in the name of speed.
+//
+pp.readToken_dot = function() {
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next >= 48 && next <= 57) return this.readNumber(true)
+  let next2 = this.input.charCodeAt(this.pos + 2)
+  if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.'
+    this.pos += 3
+    return this.finishToken(tt.ellipsis)
+  } else {
+    ++this.pos
+    return this.finishToken(tt.dot)
+  }
+}
+
+pp.readToken_slash = function() { // '/'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (this.exprAllowed) { ++this.pos; return this.readRegexp() }
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.slash, 1)
+}
+
+pp.readToken_mult_modulo_exp = function(code) { // '%*'
+  let next = this.input.charCodeAt(this.pos + 1)
+  let size = 1
+  let tokentype = code === 42 ? tt.star : tt.modulo
+
+  // exponentiation operator ** and **=
+  if (this.options.ecmaVersion >= 7 && code === 42 && next === 42) {
+    ++size
+    tokentype = tt.starstar
+    next = this.input.charCodeAt(this.pos + 2)
+  }
+
+  if (next === 61) return this.finishOp(tt.assign, size + 1)
+  return this.finishOp(tokentype, size)
+}
+
+pp.readToken_pipe_amp = function(code) { // '|&'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1)
+}
+
+pp.readToken_caret = function() { // '^'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.bitwiseXOR, 1)
+}
+
+pp.readToken_plus_min = function(code) { // '+-'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) {
+    if (next === 45 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 62 &&
+        (this.lastTokEnd === 0 || lineBreak.test(this.input.slice(this.lastTokEnd, this.pos)))) {
+      // A `-->` line comment
+      this.skipLineComment(3)
+      this.skipSpace()
+      return this.nextToken()
+    }
+    return this.finishOp(tt.incDec, 2)
+  }
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.plusMin, 1)
+}
+
+pp.readToken_lt_gt = function(code) { // '<>'
+  let next = this.input.charCodeAt(this.pos + 1)
+  let size = 1
+  if (next === code) {
+    size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2
+    if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1)
+    return this.finishOp(tt.bitShift, size)
+  }
+  if (next === 33 && code === 60 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 45 &&
+      this.input.charCodeAt(this.pos + 3) === 45) {
+    // `<!--`, an XML-style comment that should be interpreted as a line comment
+    this.skipLineComment(4)
+    this.skipSpace()
+    return this.nextToken()
+  }
+  if (next === 61) size = 2
+  return this.finishOp(tt.relational, size)
+}
+
+pp.readToken_eq_excl = function(code) { // '=!'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2)
+  if (code === 61 && next === 62 && this.options.ecmaVersion >= 6) { // '=>'
+    this.pos += 2
+    return this.finishToken(tt.arrow)
+  }
+  return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1)
+}
+
+pp.getTokenFromCode = function(code) {
+  switch (code) {
+  // The interpretation of a dot depends on whether it is followed
+  // by a digit or another two dots.
+  case 46: // '.'
+    return this.readToken_dot()
+
+  // Punctuation tokens.
+  case 40: ++this.pos; return this.finishToken(tt.parenL)
+  case 41: ++this.pos; return this.finishToken(tt.parenR)
+  case 59: ++this.pos; return this.finishToken(tt.semi)
+  case 44: ++this.pos; return this.finishToken(tt.comma)
+  case 91: ++this.pos; return this.finishToken(tt.bracketL)
+  case 93: ++this.pos; return this.finishToken(tt.bracketR)
+  case 123: ++this.pos; return this.finishToken(tt.braceL)
+  case 125: ++this.pos; return this.finishToken(tt.braceR)
+  case 58: ++this.pos; return this.finishToken(tt.colon)
+  case 63: ++this.pos; return this.finishToken(tt.question)
+
+  case 96: // '`'
+    if (this.options.ecmaVersion < 6) break
+    ++this.pos
+    return this.finishToken(tt.backQuote)
+
+  case 48: // '0'
+    let next = this.input.charCodeAt(this.pos + 1)
+    if (next === 120 || next === 88) return this.readRadixNumber(16) // '0x', '0X' - hex number
+    if (this.options.ecmaVersion >= 6) {
+      if (next === 111 || next === 79) return this.readRadixNumber(8) // '0o', '0O' - octal number
+      if (next === 98 || next === 66) return this.readRadixNumber(2) // '0b', '0B' - binary number
+    }
+
+  // Anything else beginning with a digit is an integer, octal
+  // number, or float.
+  case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+    return this.readNumber(false)
+
+  // Quotes produce strings.
+  case 34: case 39: // '"', "'"
+    return this.readString(code)
+
+  // Operators are parsed inline in tiny state machines. '=' (61) is
+  // often referred to. `finishOp` simply skips the amount of
+  // characters it is given as second argument, and returns a token
+  // of the type given by its first argument.
+
+  case 47: // '/'
+    return this.readToken_slash()
+
+  case 37: case 42: // '%*'
+    return this.readToken_mult_modulo_exp(code)
+
+  case 124: case 38: // '|&'
+    return this.readToken_pipe_amp(code)
+
+  case 94: // '^'
+    return this.readToken_caret()
+
+  case 43: case 45: // '+-'
+    return this.readToken_plus_min(code)
+
+  case 60: case 62: // '<>'
+    return this.readToken_lt_gt(code)
+
+  case 61: case 33: // '=!'
+    return this.readToken_eq_excl(code)
+
+  case 126: // '~'
+    return this.finishOp(tt.prefix, 1)
+  }
+
+  this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'")
+}
+
+pp.finishOp = function(type, size) {
+  let str = this.input.slice(this.pos, this.pos + size)
+  this.pos += size
+  return this.finishToken(type, str)
+}
+
+pp.readRegexp = function() {
+  let escaped, inClass, start = this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(start, "Unterminated regular expression")
+    let ch = this.input.charAt(this.pos)
+    if (lineBreak.test(ch)) this.raise(start, "Unterminated regular expression")
+    if (!escaped) {
+      if (ch === "[") inClass = true
+      else if (ch === "]" && inClass) inClass = false
+      else if (ch === "/" && !inClass) break
+      escaped = ch === "\\"
+    } else escaped = false
+    ++this.pos
+  }
+  let pattern = this.input.slice(start, this.pos)
+  ++this.pos
+  let flagsStart = this.pos
+  let flags = this.readWord1()
+  if (this.containsEsc) this.unexpected(flagsStart)
+
+  // Validate pattern
+  const state = this.regexpState || (this.regexpState = new RegExpValidationState(this))
+  state.reset(start, pattern, flags)
+  this.validateRegExpFlags(state)
+  this.validateRegExpPattern(state)
+
+  // Create Literal#value property value.
+  let value = null
+  try {
+    value = new RegExp(pattern, flags)
+  } catch (e) {
+    // ESTree requires null if it failed to instantiate RegExp object.
+    // https://github.com/estree/estree/blob/a27003adf4fd7bfad44de9cef372a2eacd527b1c/es5.md#regexpliteral
+  }
+
+  return this.finishToken(tt.regexp, {pattern, flags, value})
+}
+
+// Read an integer in the given radix. Return null if zero digits
+// were read, the integer value otherwise. When `len` is given, this
+// will return `null` unless the integer has exactly `len` digits.
+
+pp.readInt = function(radix, len) {
+  let start = this.pos, total = 0
+  for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+    let code = this.input.charCodeAt(this.pos), val
+    if (code >= 97) val = code - 97 + 10 // a
+    else if (code >= 65) val = code - 65 + 10 // A
+    else if (code >= 48 && code <= 57) val = code - 48 // 0-9
+    else val = Infinity
+    if (val >= radix) break
+    ++this.pos
+    total = total * radix + val
+  }
+  if (this.pos === start || len != null && this.pos - start !== len) return null
+
+  return total
+}
+
+pp.readRadixNumber = function(radix) {
+  let start = this.pos
+  this.pos += 2 // 0x
+  let val = this.readInt(radix)
+  if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix)
+  if (this.options.ecmaVersion >= 11 && this.input.charCodeAt(this.pos) === 110) {
+    val = typeof BigInt !== "undefined" ? BigInt(this.input.slice(start, this.pos)) : null
+    ++this.pos
+  } else if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+  return this.finishToken(tt.num, val)
+}
+
+// Read an integer, octal integer, or floating-point number.
+
+pp.readNumber = function(startsWithDot) {
+  let start = this.pos
+  if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number")
+  let octal = this.pos - start >= 2 && this.input.charCodeAt(start) === 48
+  if (octal && this.strict) this.raise(start, "Invalid number")
+  let next = this.input.charCodeAt(this.pos)
+  if (!octal && !startsWithDot && this.options.ecmaVersion >= 11 && next === 110) {
+    let str = this.input.slice(start, this.pos)
+    let val = typeof BigInt !== "undefined" ? BigInt(str) : null
+    ++this.pos
+    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+    return this.finishToken(tt.num, val)
+  }
+  if (octal && /[89]/.test(this.input.slice(start, this.pos))) octal = false
+  if (next === 46 && !octal) { // '.'
+    ++this.pos
+    this.readInt(10)
+    next = this.input.charCodeAt(this.pos)
+  }
+  if ((next === 69 || next === 101) && !octal) { // 'eE'
+    next = this.input.charCodeAt(++this.pos)
+    if (next === 43 || next === 45) ++this.pos // '+-'
+    if (this.readInt(10) === null) this.raise(start, "Invalid number")
+  }
+  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+
+  let str = this.input.slice(start, this.pos)
+  let val = octal ? parseInt(str, 8) : parseFloat(str)
+  return this.finishToken(tt.num, val)
+}
+
+// Read a string value, interpreting backslash-escapes.
+
+pp.readCodePoint = function() {
+  let ch = this.input.charCodeAt(this.pos), code
+
+  if (ch === 123) { // '{'
+    if (this.options.ecmaVersion < 6) this.unexpected()
+    let codePos = ++this.pos
+    code = this.readHexChar(this.input.indexOf("}", this.pos) - this.pos)
+    ++this.pos
+    if (code > 0x10FFFF) this.invalidStringToken(codePos, "Code point out of bounds")
+  } else {
+    code = this.readHexChar(4)
+  }
+  return code
+}
+
+function codePointToString(code) {
+  // UTF-16 Decoding
+  if (code <= 0xFFFF) return String.fromCharCode(code)
+  code -= 0x10000
+  return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00)
+}
+
+pp.readString = function(quote) {
+  let out = "", chunkStart = ++this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated string constant")
+    let ch = this.input.charCodeAt(this.pos)
+    if (ch === quote) break
+    if (ch === 92) { // '\'
+      out += this.input.slice(chunkStart, this.pos)
+      out += this.readEscapedChar(false)
+      chunkStart = this.pos
+    } else {
+      if (isNewLine(ch, this.options.ecmaVersion >= 10)) this.raise(this.start, "Unterminated string constant")
+      ++this.pos
+    }
+  }
+  out += this.input.slice(chunkStart, this.pos++)
+  return this.finishToken(tt.string, out)
+}
+
+// Reads template string tokens.
+
+const INVALID_TEMPLATE_ESCAPE_ERROR = {}
+
+pp.tryReadTemplateToken = function() {
+  this.inTemplateElement = true
+  try {
+    this.readTmplToken()
+  } catch (err) {
+    if (err === INVALID_TEMPLATE_ESCAPE_ERROR) {
+      this.readInvalidTemplateToken()
+    } else {
+      throw err
+    }
+  }
+
+  this.inTemplateElement = false
+}
+
+pp.invalidStringToken = function(position, message) {
+  if (this.inTemplateElement && this.options.ecmaVersion >= 9) {
+    throw INVALID_TEMPLATE_ESCAPE_ERROR
+  } else {
+    this.raise(position, message)
+  }
+}
+
+pp.readTmplToken = function() {
+  let out = "", chunkStart = this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated template")
+    let ch = this.input.charCodeAt(this.pos)
+    if (ch === 96 || ch === 36 && this.input.charCodeAt(this.pos + 1) === 123) { // '`', '${'
+      if (this.pos === this.start && (this.type === tt.template || this.type === tt.invalidTemplate)) {
+        if (ch === 36) {
+          this.pos += 2
+          return this.finishToken(tt.dollarBraceL)
+        } else {
+          ++this.pos
+          return this.finishToken(tt.backQuote)
+        }
+      }
+      out += this.input.slice(chunkStart, this.pos)
+      return this.finishToken(tt.template, out)
+    }
+    if (ch === 92) { // '\'
+      out += this.input.slice(chunkStart, this.pos)
+      out += this.readEscapedChar(true)
+      chunkStart = this.pos
+    } else if (isNewLine(ch)) {
+      out += this.input.slice(chunkStart, this.pos)
+      ++this.pos
+      switch (ch) {
+      case 13:
+        if (this.input.charCodeAt(this.pos) === 10) ++this.pos
+      case 10:
+        out += "\n"
+        break
+      default:
+        out += String.fromCharCode(ch)
+        break
+      }
+      if (this.options.locations) {
+        ++this.curLine
+        this.lineStart = this.pos
+      }
+      chunkStart = this.pos
+    } else {
+      ++this.pos
+    }
+  }
+}
+
+// Reads a template token to search for the end, without validating any escape sequences
+pp.readInvalidTemplateToken = function() {
+  for (; this.pos < this.input.length; this.pos++) {
+    switch (this.input[this.pos]) {
+    case "\\":
+      ++this.pos
+      break
+
+    case "$":
+      if (this.input[this.pos + 1] !== "{") {
+        break
+      }
+    // falls through
+
+    case "`":
+      return this.finishToken(tt.invalidTemplate, this.input.slice(this.start, this.pos))
+
+    // no default
+    }
+  }
+  this.raise(this.start, "Unterminated template")
+}
+
+// Used to read escaped characters
+
+pp.readEscapedChar = function(inTemplate) {
+  let ch = this.input.charCodeAt(++this.pos)
+  ++this.pos
+  switch (ch) {
+  case 110: return "\n" // 'n' -> '\n'
+  case 114: return "\r" // 'r' -> '\r'
+  case 120: return String.fromCharCode(this.readHexChar(2)) // 'x'
+  case 117: return codePointToString(this.readCodePoint()) // 'u'
+  case 116: return "\t" // 't' -> '\t'
+  case 98: return "\b" // 'b' -> '\b'
+  case 118: return "\u000b" // 'v' -> '\u000b'
+  case 102: return "\f" // 'f' -> '\f'
+  case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos // '\r\n'
+  case 10: // ' \n'
+    if (this.options.locations) { this.lineStart = this.pos; ++this.curLine }
+    return ""
+  case 56:
+  case 57:
+    if (inTemplate) {
+      const codePos = this.pos - 1
+
+      this.invalidStringToken(
+        codePos,
+        "Invalid escape sequence in template string"
+      )
+
+      return null
+    }
+  default:
+    if (ch >= 48 && ch <= 55) {
+      let octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0]
+      let octal = parseInt(octalStr, 8)
+      if (octal > 255) {
+        octalStr = octalStr.slice(0, -1)
+        octal = parseInt(octalStr, 8)
+      }
+      this.pos += octalStr.length - 1
+      ch = this.input.charCodeAt(this.pos)
+      if ((octalStr !== "0" || ch === 56 || ch === 57) && (this.strict || inTemplate)) {
+        this.invalidStringToken(
+          this.pos - 1 - octalStr.length,
+          inTemplate
+            ? "Octal literal in template string"
+            : "Octal literal in strict mode"
+        )
+      }
+      return String.fromCharCode(octal)
+    }
+    if (isNewLine(ch)) {
+      // Unicode new line characters after \ get removed from output in both
+      // template literals and strings
+      return ""
+    }
+    return String.fromCharCode(ch)
+  }
+}
+
+// Used to read character escape sequences ('\x', '\u', '\U').
+
+pp.readHexChar = function(len) {
+  let codePos = this.pos
+  let n = this.readInt(16, len)
+  if (n === null) this.invalidStringToken(codePos, "Bad character escape sequence")
+  return n
+}
+
+// Read an identifier, and return it as a string. Sets `this.containsEsc`
+// to whether the word contained a '\u' escape.
+//
+// Incrementally adds only escaped chars, adding other chunks as-is
+// as a micro-optimization.
+
+pp.readWord1 = function() {
+  this.containsEsc = false
+  let word = "", first = true, chunkStart = this.pos
+  let astral = this.options.ecmaVersion >= 6
+  while (this.pos < this.input.length) {
+    let ch = this.fullCharCodeAtPos()
+    if (isIdentifierChar(ch, astral)) {
+      this.pos += ch <= 0xffff ? 1 : 2
+    } else if (ch === 92) { // "\"
+      this.containsEsc = true
+      word += this.input.slice(chunkStart, this.pos)
+      let escStart = this.pos
+      if (this.input.charCodeAt(++this.pos) !== 117) // "u"
+        this.invalidStringToken(this.pos, "Expecting Unicode escape sequence \\uXXXX")
+      ++this.pos
+      let esc = this.readCodePoint()
+      if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral))
+        this.invalidStringToken(escStart, "Invalid Unicode escape")
+      word += codePointToString(esc)
+      chunkStart = this.pos
+    } else {
+      break
+    }
+    first = false
+  }
+  return word + this.input.slice(chunkStart, this.pos)
+}
+
+// Read an identifier or keyword token. Will check for reserved
+// words when necessary.
+
+pp.readWord = function() {
+  let word = this.readWord1()
+  let type = tt.name
+  if (this.keywords.test(word)) {
+    type = keywordTypes[word]
+  }
+  return this.finishToken(type, word)
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/tokentype.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokentype.js
new file mode 100644
index 0000000000..7a8c48a6d8
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/tokentype.js
@@ -0,0 +1,148 @@
+// ## Token types
+
+// The assignment of fine-grained, information-carrying type objects
+// allows the tokenizer to store the information it has about a
+// token in a way that is very cheap for the parser to look up.
+
+// All token type variables start with an underscore, to make them
+// easy to recognize.
+
+// The `beforeExpr` property is used to disambiguate between regular
+// expressions and divisions. It is set on all token types that can
+// be followed by an expression (thus, a slash after them would be a
+// regular expression).
+//
+// The `startsExpr` property is used to check if the token ends a
+// `yield` expression. It is set on all token types that either can
+// directly start an expression (like a quotation mark) or can
+// continue an expression (like the body of a string).
+//
+// `isLoop` marks a keyword as starting a loop, which is important
+// to know when parsing a label, in order to allow or disallow
+// continue jumps to that label.
+
+export class TokenType {
+  constructor(label, conf = {}) {
+    this.label = label
+    this.keyword = conf.keyword
+    this.beforeExpr = !!conf.beforeExpr
+    this.startsExpr = !!conf.startsExpr
+    this.isLoop = !!conf.isLoop
+    this.isAssign = !!conf.isAssign
+    this.prefix = !!conf.prefix
+    this.postfix = !!conf.postfix
+    this.binop = conf.binop || null
+    this.updateContext = null
+  }
+}
+
+function binop(name, prec) {
+  return new TokenType(name, {beforeExpr: true, binop: prec})
+}
+const beforeExpr = {beforeExpr: true}, startsExpr = {startsExpr: true}
+
+// Map keyword names to token types.
+
+export const keywords = {}
+
+// Succinct definitions of keyword token types
+function kw(name, options = {}) {
+  options.keyword = name
+  return keywords[name] = new TokenType(name, options)
+}
+
+export const types = {
+  num: new TokenType("num", startsExpr),
+  regexp: new TokenType("regexp", startsExpr),
+  string: new TokenType("string", startsExpr),
+  name: new TokenType("name", startsExpr),
+  eof: new TokenType("eof"),
+
+  // Punctuation token types.
+  bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}),
+  bracketR: new TokenType("]"),
+  braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}),
+  braceR: new TokenType("}"),
+  parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}),
+  parenR: new TokenType(")"),
+  comma: new TokenType(",", beforeExpr),
+  semi: new TokenType(";", beforeExpr),
+  colon: new TokenType(":", beforeExpr),
+  dot: new TokenType("."),
+  question: new TokenType("?", beforeExpr),
+  arrow: new TokenType("=>", beforeExpr),
+  template: new TokenType("template"),
+  invalidTemplate: new TokenType("invalidTemplate"),
+  ellipsis: new TokenType("...", beforeExpr),
+  backQuote: new TokenType("`", startsExpr),
+  dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}),
+
+  // Operators. These carry several kinds of properties to help the
+  // parser use them properly (the presence of these properties is
+  // what categorizes them as operators).
+  //
+  // `binop`, when present, specifies that this operator is a binary
+  // operator, and will refer to its precedence.
+  //
+  // `prefix` and `postfix` mark the operator as a prefix or postfix
+  // unary operator.
+  //
+  // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+  // binary operators with a very low precedence, that should result
+  // in AssignmentExpression nodes.
+
+  eq: new TokenType("=", {beforeExpr: true, isAssign: true}),
+  assign: new TokenType("_=", {beforeExpr: true, isAssign: true}),
+  incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}),
+  prefix: new TokenType("!/~", {beforeExpr: true, prefix: true, startsExpr: true}),
+  logicalOR: binop("||", 1),
+  logicalAND: binop("&&", 2),
+  bitwiseOR: binop("|", 3),
+  bitwiseXOR: binop("^", 4),
+  bitwiseAND: binop("&", 5),
+  equality: binop("==/!=/===/!==", 6),
+  relational: binop("</>/<=/>=", 7),
+  bitShift: binop("<</>>/>>>", 8),
+  plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}),
+  modulo: binop("%", 10),
+  star: binop("*", 10),
+  slash: binop("/", 10),
+  starstar: new TokenType("**", {beforeExpr: true}),
+
+  // Keyword token types.
+  _break: kw("break"),
+  _case: kw("case", beforeExpr),
+  _catch: kw("catch"),
+  _continue: kw("continue"),
+  _debugger: kw("debugger"),
+  _default: kw("default", beforeExpr),
+  _do: kw("do", {isLoop: true, beforeExpr: true}),
+  _else: kw("else", beforeExpr),
+  _finally: kw("finally"),
+  _for: kw("for", {isLoop: true}),
+  _function: kw("function", startsExpr),
+  _if: kw("if"),
+  _return: kw("return", beforeExpr),
+  _switch: kw("switch"),
+  _throw: kw("throw", beforeExpr),
+  _try: kw("try"),
+  _var: kw("var"),
+  _const: kw("const"),
+  _while: kw("while", {isLoop: true}),
+  _with: kw("with"),
+  _new: kw("new", {beforeExpr: true, startsExpr: true}),
+  _this: kw("this", startsExpr),
+  _super: kw("super", startsExpr),
+  _class: kw("class", startsExpr),
+  _extends: kw("extends", beforeExpr),
+  _export: kw("export"),
+  _import: kw("import", startsExpr),
+  _null: kw("null", startsExpr),
+  _true: kw("true", startsExpr),
+  _false: kw("false", startsExpr),
+  _in: kw("in", {beforeExpr: true, binop: 7}),
+  _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}),
+  _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true})
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/unicode-property-data.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/unicode-property-data.js
new file mode 100644
index 0000000000..967ed1a360
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/unicode-property-data.js
@@ -0,0 +1,49 @@
+import {wordsRegexp} from "./util.js"
+
+// This file contains Unicode properties extracted from the ECMAScript
+// specification. The lists are extracted like so:
+// $$('#table-binary-unicode-properties > figure > table > tbody > tr > td:nth-child(1) code').map(el => el.innerText)
+
+// #table-binary-unicode-properties
+const ecma9BinaryProperties = "ASCII ASCII_Hex_Digit AHex Alphabetic Alpha Any Assigned Bidi_Control Bidi_C Bidi_Mirrored Bidi_M Case_Ignorable CI Cased Changes_When_Casefolded CWCF Changes_When_Casemapped CWCM Changes_When_Lowercased CWL Changes_When_NFKC_Casefolded CWKCF Changes_When_Titlecased CWT Changes_When_Uppercased CWU Dash Default_Ignorable_Code_Point DI Deprecated Dep Diacritic Dia Emoji Emoji_Component Emoji_Modifier Emoji_Modifier_Base Emoji_Presentation Extender Ext Grapheme_Base Gr_Base Grapheme_Extend Gr_Ext Hex_Digit Hex IDS_Binary_Operator IDSB IDS_Trinary_Operator IDST ID_Continue IDC ID_Start IDS Ideographic Ideo Join_Control Join_C Logical_Order_Exception LOE Lowercase Lower Math Noncharacter_Code_Point NChar Pattern_Syntax Pat_Syn Pattern_White_Space Pat_WS Quotation_Mark QMark Radical Regional_Indicator RI Sentence_Terminal STerm Soft_Dotted SD Terminal_Punctuation Term Unified_Ideograph UIdeo Uppercase Upper Variation_Selector VS White_Space space XID_Continue XIDC XID_Start XIDS"
+const ecma10BinaryProperties = ecma9BinaryProperties + " Extended_Pictographic"
+const ecma11BinaryProperties = ecma10BinaryProperties
+const unicodeBinaryProperties = {
+  9: ecma9BinaryProperties,
+  10: ecma10BinaryProperties,
+  11: ecma11BinaryProperties
+}
+
+// #table-unicode-general-category-values
+const unicodeGeneralCategoryValues = "Cased_Letter LC Close_Punctuation Pe Connector_Punctuation Pc Control Cc cntrl Currency_Symbol Sc Dash_Punctuation Pd Decimal_Number Nd digit Enclosing_Mark Me Final_Punctuation Pf Format Cf Initial_Punctuation Pi Letter L Letter_Number Nl Line_Separator Zl Lowercase_Letter Ll Mark M Combining_Mark Math_Symbol Sm Modifier_Letter Lm Modifier_Symbol Sk Nonspacing_Mark Mn Number N Open_Punctuation Ps Other C Other_Letter Lo Other_Number No Other_Punctuation Po Other_Symbol So Paragraph_Separator Zp Private_Use Co Punctuation P punct Separator Z Space_Separator Zs Spacing_Mark Mc Surrogate Cs Symbol S Titlecase_Letter Lt Unassigned Cn Uppercase_Letter Lu"
+
+// #table-unicode-script-values
+const ecma9ScriptValues = "Adlam Adlm Ahom Ahom Anatolian_Hieroglyphs Hluw Arabic Arab Armenian Armn Avestan Avst Balinese Bali Bamum Bamu Bassa_Vah Bass Batak Batk Bengali Beng Bhaiksuki Bhks Bopomofo Bopo Brahmi Brah Braille Brai Buginese Bugi Buhid Buhd Canadian_Aboriginal Cans Carian Cari Caucasian_Albanian Aghb Chakma Cakm Cham Cham Cherokee Cher Common Zyyy Coptic Copt Qaac Cuneiform Xsux Cypriot Cprt Cyrillic Cyrl Deseret Dsrt Devanagari Deva Duployan Dupl Egyptian_Hieroglyphs Egyp Elbasan Elba Ethiopic Ethi Georgian Geor Glagolitic Glag Gothic Goth Grantha Gran Greek Grek Gujarati Gujr Gurmukhi Guru Han Hani Hangul Hang Hanunoo Hano Hatran Hatr Hebrew Hebr Hiragana Hira Imperial_Aramaic Armi Inherited Zinh Qaai Inscriptional_Pahlavi Phli Inscriptional_Parthian Prti Javanese Java Kaithi Kthi Kannada Knda Katakana Kana Kayah_Li Kali Kharoshthi Khar Khmer Khmr Khojki Khoj Khudawadi Sind Lao Laoo Latin Latn Lepcha Lepc Limbu Limb Linear_A Lina Linear_B Linb Lisu Lisu Lycian Lyci Lydian Lydi Mahajani Mahj Malayalam Mlym Mandaic Mand Manichaean Mani Marchen Marc Masaram_Gondi Gonm Meetei_Mayek Mtei Mende_Kikakui Mend Meroitic_Cursive Merc Meroitic_Hieroglyphs Mero Miao Plrd Modi Modi Mongolian Mong Mro Mroo Multani Mult Myanmar Mymr Nabataean Nbat New_Tai_Lue Talu Newa Newa Nko Nkoo Nushu Nshu Ogham Ogam Ol_Chiki Olck Old_Hungarian Hung Old_Italic Ital Old_North_Arabian Narb Old_Permic Perm Old_Persian Xpeo Old_South_Arabian Sarb Old_Turkic Orkh Oriya Orya Osage Osge Osmanya Osma Pahawh_Hmong Hmng Palmyrene Palm Pau_Cin_Hau Pauc Phags_Pa Phag Phoenician Phnx Psalter_Pahlavi Phlp Rejang Rjng Runic Runr Samaritan Samr Saurashtra Saur Sharada Shrd Shavian Shaw Siddham Sidd SignWriting Sgnw Sinhala Sinh Sora_Sompeng Sora Soyombo Soyo Sundanese Sund Syloti_Nagri Sylo Syriac Syrc Tagalog Tglg Tagbanwa Tagb Tai_Le Tale Tai_Tham Lana Tai_Viet Tavt Takri Takr Tamil Taml Tangut Tang Telugu Telu Thaana Thaa Thai Thai Tibetan Tibt Tifinagh Tfng Tirhuta Tirh Ugaritic Ugar Vai Vaii Warang_Citi Wara Yi Yiii Zanabazar_Square Zanb"
+const ecma10ScriptValues = ecma9ScriptValues + " Dogra Dogr Gunjala_Gondi Gong Hanifi_Rohingya Rohg Makasar Maka Medefaidrin Medf Old_Sogdian Sogo Sogdian Sogd"
+const ecma11ScriptValues = ecma10ScriptValues + " Elymaic Elym Nandinagari Nand Nyiakeng_Puachue_Hmong Hmnp Wancho Wcho"
+const unicodeScriptValues = {
+  9: ecma9ScriptValues,
+  10: ecma10ScriptValues,
+  11: ecma11ScriptValues
+}
+
+const data = {}
+function buildUnicodeData(ecmaVersion) {
+  let d = data[ecmaVersion] = {
+    binary: wordsRegexp(unicodeBinaryProperties[ecmaVersion] + " " + unicodeGeneralCategoryValues),
+    nonBinary: {
+      General_Category: wordsRegexp(unicodeGeneralCategoryValues),
+      Script: wordsRegexp(unicodeScriptValues[ecmaVersion])
+    }
+  }
+  d.nonBinary.Script_Extensions = d.nonBinary.Script
+
+  d.nonBinary.gc = d.nonBinary.General_Category
+  d.nonBinary.sc = d.nonBinary.Script
+  d.nonBinary.scx = d.nonBinary.Script_Extensions
+}
+buildUnicodeData(9)
+buildUnicodeData(10)
+buildUnicodeData(11)
+
+export default data
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/util.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/util.js
new file mode 100644
index 0000000000..a2ac1f1579
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/util.js
@@ -0,0 +1,15 @@
+const {hasOwnProperty, toString} = Object.prototype
+
+// Checks if an object has a property.
+
+export function has(obj, propName) {
+  return hasOwnProperty.call(obj, propName)
+}
+
+export const isArray = Array.isArray || ((obj) => (
+  toString.call(obj) === "[object Array]"
+))
+
+export function wordsRegexp(words) {
+  return new RegExp("^(?:" + words.replace(/ /g, "|") + ")$")
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/acorn/src/whitespace.js b/tools/tests/apps/modules-modern/imports/links/acorn/src/whitespace.js
new file mode 100644
index 0000000000..f48f2f2f3c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/acorn/src/whitespace.js
@@ -0,0 +1,13 @@
+// Matches a whole line break (where CRLF is considered a single
+// line break). Used to count lines.
+
+export const lineBreak = /\r\n?|\n|\u2028|\u2029/
+export const lineBreakG = new RegExp(lineBreak.source, "g")
+
+export function isNewLine(code, ecma2019String) {
+  return code === 10 || code === 13 || (!ecma2019String && (code === 0x2028 || code === 0x2029))
+}
+
+export const nonASCIIwhitespace = /[\u1680\u2000-\u200a\u202f\u205f\u3000\ufeff]/
+
+export const skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g
diff --git a/tools/tests/apps/modules-modern/imports/links/immutable-tuple b/tools/tests/apps/modules-modern/imports/links/immutable-tuple
new file mode 120000
index 0000000000..0814a6ac4e
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/immutable-tuple
@@ -0,0 +1 @@
+../../node_modules/immutable-tuple
\ No newline at end of file
diff --git a/tools/tests/apps/modules-modern/imports/links/jsx-import-test/child.jsx b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/child.jsx
new file mode 100644
index 0000000000..43a7d79c05
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/child.jsx
@@ -0,0 +1,2 @@
+import React from "react";
+export default <div>oyez</div>;
diff --git a/tools/tests/apps/modules-modern/imports/links/jsx-import-test/package.json b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/package.json
new file mode 100644
index 0000000000..adf21517ff
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "jsx-import-test",
+  "version": "0.0.0",
+  "private": true,
+  "main": "parent.js",
+  "dependencies": {
+    "react": "16.4.1"
+  }
+}
diff --git a/tools/tests/apps/modules-modern/imports/links/jsx-import-test/parent.js b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/parent.js
new file mode 100644
index 0000000000..3478298bd0
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/jsx-import-test/parent.js
@@ -0,0 +1 @@
+export jsx from "./child";
diff --git a/tools/tests/apps/modules-modern/imports/links/lodash-es b/tools/tests/apps/modules-modern/imports/links/lodash-es
new file mode 120000
index 0000000000..42a542a26b
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/links/lodash-es
@@ -0,0 +1 @@
+../../node_modules/lodash-es
\ No newline at end of file
diff --git a/tools/tests/apps/modules-modern/imports/plain.es5.js b/tools/tests/apps/modules-modern/imports/plain.es5.js
new file mode 100644
index 0000000000..7450056614
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/plain.es5.js
@@ -0,0 +1,4 @@
+// The use of `let` as an identifier would be illegal if this file were
+// transpiled as ECMAScript 2015.
+var let = "ok";
+exports.let = let;
diff --git a/tools/tests/apps/modules-modern/imports/return.js b/tools/tests/apps/modules-modern/imports/return.js
new file mode 100644
index 0000000000..7311402015
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/return.js
@@ -0,0 +1,3 @@
+export let a = 1234;
+return;
+export let b = 5678;
diff --git a/tools/tests/apps/modules-modern/imports/shared.js b/tools/tests/apps/modules-modern/imports/shared.js
new file mode 100644
index 0000000000..fb8386b352
--- /dev/null
+++ b/tools/tests/apps/modules-modern/imports/shared.js
@@ -0,0 +1,3 @@
+// This module exists so that other modules can modify this shared object
+// to communicate during tests.
+export default Object.create(null);
diff --git a/tools/tests/apps/modules-modern/issue-9878-test-package/dir/normal.json b/tools/tests/apps/modules-modern/issue-9878-test-package/dir/normal.json
new file mode 100644
index 0000000000..0394765bcf
--- /dev/null
+++ b/tools/tests/apps/modules-modern/issue-9878-test-package/dir/normal.json
@@ -0,0 +1,8 @@
+{
+  "stripped": false,
+  "_stripped": false,
+  "nested": {
+    "stripped": false,
+    "_stripped": false
+  }
+}
diff --git a/tools/tests/apps/modules-modern/issue-9878-test-package/dir/package.json b/tools/tests/apps/modules-modern/issue-9878-test-package/dir/package.json
new file mode 100644
index 0000000000..fe7e4adb0d
--- /dev/null
+++ b/tools/tests/apps/modules-modern/issue-9878-test-package/dir/package.json
@@ -0,0 +1,8 @@
+{
+  "stripped": false,
+  "_stripped": true,
+  "nested": {
+    "stripped": false,
+    "_stripped": false
+  }
+}
diff --git a/tools/tests/apps/modules-modern/issue-9878-test-package/main.js b/tools/tests/apps/modules-modern/issue-9878-test-package/main.js
new file mode 100644
index 0000000000..44a0cef3ea
--- /dev/null
+++ b/tools/tests/apps/modules-modern/issue-9878-test-package/main.js
@@ -0,0 +1,6 @@
+// Private underscored properties should be stripped from this
+// package.json module:
+exports.packageJson = require("./dir/package.json");
+
+// But not from this normal.json module:
+exports.normalJson = require("./dir/normal.json");
diff --git a/tools/tests/apps/modules-modern/issue-9878-test-package/package.json b/tools/tests/apps/modules-modern/issue-9878-test-package/package.json
new file mode 100644
index 0000000000..e2381b8604
--- /dev/null
+++ b/tools/tests/apps/modules-modern/issue-9878-test-package/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "issue-9878-test-package",
+  "main": "main.js",
+  "_stripped": true,
+  "nested": {
+    "_stripped": false
+  }
+}
diff --git a/tools/tests/apps/modules-modern/lazy-css.html b/tools/tests/apps/modules-modern/lazy-css.html
new file mode 100644
index 0000000000..5362a7d36b
--- /dev/null
+++ b/tools/tests/apps/modules-modern/lazy-css.html
@@ -0,0 +1,6 @@
+<body>
+  <div class="app-lazy-css"></div>
+  <div class="app-eager-css"></div>
+  <div class="pkg-lazy-css imported"></div>
+  <div class="pkg-lazy-css not-imported"></div>
+</body>
diff --git a/tools/tests/apps/modules-modern/lib/a/index.js b/tools/tests/apps/modules-modern/lib/a/index.js
new file mode 100644
index 0000000000..3a871fa797
--- /dev/null
+++ b/tools/tests/apps/modules-modern/lib/a/index.js
@@ -0,0 +1 @@
+export const main = module.id;
diff --git a/tools/tests/apps/modules-modern/lib/a/package.json b/tools/tests/apps/modules-modern/lib/a/package.json
new file mode 100644
index 0000000000..3ebe3db02e
--- /dev/null
+++ b/tools/tests/apps/modules-modern/lib/a/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "a",
+  "main": "../b"
+}
diff --git a/tools/tests/apps/modules-modern/lib/b/package.json b/tools/tests/apps/modules-modern/lib/b/package.json
new file mode 100644
index 0000000000..252a111f9e
--- /dev/null
+++ b/tools/tests/apps/modules-modern/lib/b/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "b",
+  "main": "../a"
+}
diff --git a/tools/tests/apps/modules-modern/lib/index.js b/tools/tests/apps/modules-modern/lib/index.js
new file mode 100644
index 0000000000..6b436a0e88
--- /dev/null
+++ b/tools/tests/apps/modules-modern/lib/index.js
@@ -0,0 +1 @@
+export {main as aMain} from "./a";
diff --git a/tools/tests/apps/modules-modern/package-lock.json b/tools/tests/apps/modules-modern/package-lock.json
new file mode 100644
index 0000000000..6c43965a11
--- /dev/null
+++ b/tools/tests/apps/modules-modern/package-lock.json
@@ -0,0 +1,3105 @@
+{
+  "name": "modules-test-app",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
+      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ=="
+    },
+    "@babel/core": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.5.tgz",
+      "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==",
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.24.5",
+        "@babel/helpers": "^7.24.5",
+        "@babel/parser": "^7.24.5",
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.24.2",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
+          "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+          "requires": {
+            "@babel/highlight": "^7.24.2",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz",
+          "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
+          "requires": {
+            "@babel/types": "^7.24.5",
+            "@jridgewell/gen-mapping": "^0.3.5",
+            "@jridgewell/trace-mapping": "^0.3.25",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+          "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+          "requires": {
+            "@babel/template": "^7.22.15",
+            "@babel/types": "^7.23.0"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+          "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
+          "requires": {
+            "@babel/types": "^7.24.5"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
+          "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "chalk": "^2.4.2",
+            "js-tokens": "^4.0.0",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+          "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg=="
+        },
+        "@babel/template": {
+          "version": "7.24.0",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+          "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+          "requires": {
+            "@babel/code-frame": "^7.23.5",
+            "@babel/parser": "^7.24.0",
+            "@babel/types": "^7.24.0"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz",
+          "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
+          "requires": {
+            "@babel/code-frame": "^7.24.2",
+            "@babel/generator": "^7.24.5",
+            "@babel/helper-environment-visitor": "^7.22.20",
+            "@babel/helper-function-name": "^7.23.0",
+            "@babel/helper-hoist-variables": "^7.22.5",
+            "@babel/helper-split-export-declaration": "^7.24.5",
+            "@babel/parser": "^7.24.5",
+            "@babel/types": "^7.24.5",
+            "debug": "^4.3.1",
+            "globals": "^11.1.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "4.3.4",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+              "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+              "requires": {
+                "ms": "2.1.2"
+              }
+            }
+          }
+        },
+        "@babel/types": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+          "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.24.1",
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz",
+      "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==",
+      "requires": {
+        "@babel/types": "^7.7.2",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz",
+      "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==",
+      "requires": {
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "requires": {
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+    },
+    "@babel/helper-function-name": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz",
+      "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==",
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.7.0",
+        "@babel/template": "^7.7.0",
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz",
+      "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==",
+      "requires": {
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "requires": {
+        "@babel/types": "^7.22.5"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+          "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.24.1",
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz",
+      "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==",
+      "requires": {
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz",
+      "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.24.3",
+        "@babel/helper-simple-access": "^7.24.5",
+        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/helper-validator-identifier": "^7.24.5"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.24.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+          "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+          "requires": {
+            "@babel/types": "^7.24.0"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+          "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
+          "requires": {
+            "@babel/types": "^7.24.5"
+          }
+        },
+        "@babel/types": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+          "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.24.1",
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz",
+      "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ=="
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz",
+      "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==",
+      "requires": {
+        "@babel/types": "^7.24.5"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+          "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.24.1",
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz",
+      "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==",
+      "requires": {
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+      "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
+    },
+    "@babel/helpers": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.5.tgz",
+      "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==",
+      "requires": {
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.24.2",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
+          "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+          "requires": {
+            "@babel/highlight": "^7.24.2",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz",
+          "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
+          "requires": {
+            "@babel/types": "^7.24.5",
+            "@jridgewell/gen-mapping": "^0.3.5",
+            "@jridgewell/trace-mapping": "^0.3.25",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+          "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+          "requires": {
+            "@babel/template": "^7.22.15",
+            "@babel/types": "^7.23.0"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+          "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
+          "requires": {
+            "@babel/types": "^7.24.5"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
+          "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "chalk": "^2.4.2",
+            "js-tokens": "^4.0.0",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+          "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg=="
+        },
+        "@babel/template": {
+          "version": "7.24.0",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+          "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+          "requires": {
+            "@babel/code-frame": "^7.23.5",
+            "@babel/parser": "^7.24.0",
+            "@babel/types": "^7.24.0"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz",
+          "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
+          "requires": {
+            "@babel/code-frame": "^7.24.2",
+            "@babel/generator": "^7.24.5",
+            "@babel/helper-environment-visitor": "^7.22.20",
+            "@babel/helper-function-name": "^7.23.0",
+            "@babel/helper-hoist-variables": "^7.22.5",
+            "@babel/helper-split-export-declaration": "^7.24.5",
+            "@babel/parser": "^7.24.5",
+            "@babel/types": "^7.24.5",
+            "debug": "^4.3.1",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+          "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.24.1",
+            "@babel/helper-validator-identifier": "^7.24.5",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz",
+      "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A=="
+    },
+    "@babel/plugin-proposal-do-expressions": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.24.1.tgz",
+      "integrity": "sha512-tVYbJAE3Duz/T0lV5P27aAgpg2vTfUuV0dXN4NNbnoRk7G989IcgjYIA+1pMHUMMLij7Gun42CC15UN5jWm4LA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/plugin-syntax-do-expressions": "^7.24.1"
+      }
+    },
+    "@babel/plugin-syntax-do-expressions": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.24.1.tgz",
+      "integrity": "sha512-l5ZJA2DB2s/pM3SQzwf1ykWOiBaqN6Eb07EoZ/mH8dUR5RnaWlmPLoav6y4OT8A9Pkl615osBMZOedFbErdOOA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.0"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
+      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+      "requires": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+          "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+        }
+      }
+    },
+    "@babel/template": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz",
+      "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/types": "^7.7.0"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz",
+      "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==",
+      "requires": {
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.7.2",
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/helper-split-export-declaration": "^7.7.0",
+        "@babel/parser": "^7.7.2",
+        "@babel/types": "^7.7.2",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/types": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz",
+      "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==",
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@emotion/is-prop-valid": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.5.tgz",
+      "integrity": "sha512-6ZODuZSFofbxSbcxwsFz+6ioPjb0ISJRRPLZ+WIbjcU2IMU0Io+RGQjjaTgOvNQl007KICBm7zXQaYQEC1r6Bg==",
+      "requires": {
+        "@emotion/memoize": "0.7.3"
+      }
+    },
+    "@emotion/memoize": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.3.tgz",
+      "integrity": "sha512-2Md9mH6mvo+ygq1trTeVp2uzAKwE2P7In0cRpD/M9Q70aH8L+rxMLbb3JCN2JoSWsV2O+DdFjfbbXoMoLBczow=="
+    },
+    "@emotion/unitless": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.4.tgz",
+      "integrity": "sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ=="
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
+    },
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@polymer/lit-element": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@polymer/lit-element/-/lit-element-0.7.1.tgz",
+      "integrity": "sha512-aYSzVhC19l7xSm73aHI06VPcD/H+GxpFNZrhbJ+zVIpgAveOgGp5Ga7UtTBHQCdHlJbZ0dMlaBXMZ3twgXCokg==",
+      "requires": {
+        "lit-html": "^1.0.0-rc.2"
+      }
+    },
+    "@terebentina/react-popover": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@terebentina/react-popover/-/react-popover-2.0.0.tgz",
+      "integrity": "sha512-VFQ9OkuasLMON8p0jpwnH6pnITHdTx+Xm/Eg+2oHoXK8fGtiEGJR5huLoqFU+WHYEYtO7x8O2usZO8UjQoQq/A=="
+    },
+    "@types/mime-types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
+      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM="
+    },
+    "@types/node": {
+      "version": "12.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz",
+      "integrity": "sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="
+    },
+    "@wry/context": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.4.4.tgz",
+      "integrity": "sha512-LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag==",
+      "requires": {
+        "@types/node": ">=6",
+        "tslib": "^1.9.3"
+      }
+    },
+    "acorn": {
+      "version": "file:imports/links/acorn"
+    },
+    "agent-base": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+    },
+    "async": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+      "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+    },
+    "aws-sdk": {
+      "version": "2.572.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.572.0.tgz",
+      "integrity": "sha512-sE9SdbnJoQTr2+rLjLlHQTfSunayhi0FuI18MmrJVgbzBu54UZoHhD9MNTYhhZqU8/vBa25Ji99BWStIwuu5Vw==",
+      "requires": {
+        "buffer": "^4.9.1",
+        "events": "^1.1.1",
+        "ieee754": "^1.1.13",
+        "jmespath": "^0.15.0",
+        "querystring": "^0.2.0",
+        "sax": "^1.2.1",
+        "url": "^0.10.3",
+        "uuid": "^3.3.2",
+        "xml2js": "^0.4.19"
+      }
+    },
+    "babel-plugin-styled-components": {
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.6.tgz",
+      "integrity": "sha512-gyQj/Zf1kQti66100PhrCRjI5ldjaze9O0M3emXRPAN80Zsf8+e1thpTpaXJXVHXtaM4/+dJEgZHyS9Its+8SA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-module-imports": "^7.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "lodash": "^4.17.11"
+      }
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
+    "babel-runtime": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
+      "integrity": "sha512-KpgoA8VE/pMmNCrnEeeXqFG24TIH11Z3ZaimIhJWsin8EbfZy3WzFKUTIan10ZIDgRVvi9EkLbruJElJC9dRlg==",
+      "requires": {
+        "core-js": "^1.0.0"
+      }
+    },
+    "bail": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz",
+      "integrity": "sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "big-number": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/big-number/-/big-number-0.3.1.tgz",
+      "integrity": "sha512-vuviGgr68k2TdLxQgjWpNU579cCTKEbQQczP6dW7dcEpvfheivgyAnchFrnda67ccoftQOuowXMgIaX1SEZkSQ=="
+    },
+    "bignumber.js": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
+      "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
+    },
+    "bl": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browserslist": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        }
+      }
+    },
+    "camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001617",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001617.tgz",
+      "integrity": "sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA=="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "character-entities": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.3.tgz",
+      "integrity": "sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w=="
+    },
+    "character-entities-legacy": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz",
+      "integrity": "sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww=="
+    },
+    "character-reference-invalid": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz",
+      "integrity": "sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg=="
+    },
+    "classnames": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+    },
+    "cli-color": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz",
+      "integrity": "sha512-f4DFHXdoe2rGMwuVO+DTBM6CkSt4m9R4a0vjnq5CJkSCKaXbrHbslCmyjG6cz/o50HP2wkjO3G1mXvc7G3V1LQ==",
+      "requires": {
+        "es5-ext": "~0.9.2",
+        "memoizee": "~0.2.5"
+      }
+    },
+    "collapse-white-space": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz",
+      "integrity": "sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ=="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "colors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA=="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
+    },
+    "css-to-react-native": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
+      "integrity": "sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA=="
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "deep-diff": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz",
+      "integrity": "sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug=="
+    },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.4.761",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.761.tgz",
+      "integrity": "sha512-PIbxpiJGx6Bb8dQaonNc6CGTRlVntdLg/2nMa1YhnrwYOORY9a3ZgGN0UQYE6lAcj/lkyduJN7BPt/JiY+jAQQ=="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "es-abstract": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
+      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz",
+      "integrity": "sha512-wP3OSxZ0L/qK76t6qxPR8gWr2o5F4SzNF9qS5F/mOfVY3Ezcg07v6hSkETDmoekXIzn8xhQbHpp+tVlOE+qOAg=="
+    },
+    "escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "event-emitter": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz",
+      "integrity": "sha512-kdjfxF6jYJ5m/OEe3ZNNJzbCEcagF4lNJeuhgrBSRnlitpdxICDKzCel+Z5Wbl7K9UhBN/7k2MzXBvCvSwfzzg==",
+      "requires": {
+        "es5-ext": "~0.9.2"
+      }
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extract-zip": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "requires": {
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ=="
+    },
+    "fbjs": {
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+      "requires": {
+        "core-js": "^1.0.0",
+        "isomorphic-fetch": "^2.1.1",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.18"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "generic-pool": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.5.4.tgz",
+      "integrity": "sha512-K2jozechYi0U3CNYlCWFGccmgjYhyqxOQVehL03l+gJ75LWDocM2qJeAaIneFd30ncD965WXnyM04jDgXzTMPw=="
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+    },
+    "get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        }
+      }
+    },
+    "github": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/github/-/github-0.2.4.tgz",
+      "integrity": "sha512-dKaFVLM/jg6vZV6vGw8scyFF+1pl9QGqk4k72au1jQvFg9zhyIdi0XbP2NOsdYQth44Nez74m3pPb5yIzuAD0w==",
+      "requires": {
+        "mime": "^1.2.11"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "graphql": {
+      "version": "14.5.8",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz",
+      "integrity": "sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==",
+      "requires": {
+        "iterall": "^1.2.2"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+    },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+    },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        }
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "requires": {
+        "agent-base": "5",
+        "debug": "4"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "immutability-helper": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-2.9.1.tgz",
+      "integrity": "sha512-r/RmRG8xO06s/k+PIaif2r5rGc3j4Yhc01jSBfwPCXDLYZwp/yxralI37Df1mwmuzcCsen/E/ITKcTEvc1PQmQ==",
+      "requires": {
+        "invariant": "^2.2.0"
+      }
+    },
+    "immutable-tuple": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.10.tgz",
+      "integrity": "sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "is-alphabetical": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.3.tgz",
+      "integrity": "sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA=="
+    },
+    "is-alphanumerical": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz",
+      "integrity": "sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==",
+      "requires": {
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-decimal": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.3.tgz",
+      "integrity": "sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ=="
+    },
+    "is-hexadecimal": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz",
+      "integrity": "sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-what": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.3.1.tgz",
+      "integrity": "sha512-seFn10yAXy+yJlTRO+8VfiafC+0QJanGLMPTBWLrJm/QPauuchy0UXh8B6H5o9VA8BAzk0iYievt6mNp6gfaqA=="
+    },
+    "is-whitespace-character": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz",
+      "integrity": "sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ=="
+    },
+    "is-word-character": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.3.tgz",
+      "integrity": "sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
+      "requires": {
+        "node-fetch": "^1.0.1",
+        "whatwg-fetch": ">=0.10.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
+    },
+    "iterall": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+      "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+    },
+    "jmespath": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+    },
+    "jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+    },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+    },
+    "jsx-import-test": {
+      "version": "file:imports/links/jsx-import-test",
+      "requires": {
+        "react": "16.4.1"
+      }
+    },
+    "just-curry-it": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/just-curry-it/-/just-curry-it-3.1.0.tgz",
+      "integrity": "sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg=="
+    },
+    "lit-html": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.1.2.tgz",
+      "integrity": "sha512-FFlUMKHKi+qG1x1iHNZ1hrtc/zHmfYTyrSvs3/wBTvaNtpZjOZGWzU7efGYVpgp6KvWeKF6ql9/KsCq6Z/mEDA=="
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "markdown-escapes": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.3.tgz",
+      "integrity": "sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw=="
+    },
+    "markdown-to-jsx": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-4.0.3.tgz",
+      "integrity": "sha512-m7n+vSoYm2XPjbwUiUJKaASF5IA0Pl98RfxoPzaIv70hmi/+uZxOjsD88Qf0c/uYcFwNQF9T6l1NmhG0JPFyRQ==",
+      "requires": {
+        "lodash.get": "^4.4.2",
+        "remark-parse": "^2.0.1",
+        "unified": "^5.0.0"
+      }
+    },
+    "memoize-one": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz",
+      "integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="
+    },
+    "memoizee": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz",
+      "integrity": "sha512-0VZI0btwyGk6FSDnJGuJtso4M/eSxhVb5ID5AZNWMFFgT2LexCV18hHI764V4ELKlyfnQ5KMQ+q5H3uvFN3MLw==",
+      "requires": {
+        "es5-ext": "~0.9.2",
+        "event-emitter": "~0.2.2",
+        "next-tick": "0.1.x"
+      }
+    },
+    "merge-anything": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.1.tgz",
+      "integrity": "sha512-dYOIAl9GFCJNctSIHWOj9OJtarCjsD16P8ObCl6oxrujAG+kOvlwJuOD9/O9iYZ9aTi1RGpGTG9q9etIvuUikQ==",
+      "requires": {
+        "is-what": "^3.3.1"
+      }
+    },
+    "meteor-node-stubs": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.9.tgz",
+      "integrity": "sha512-EKRezc1/PblYtYiK4BOT3h5geWDo9AFBBSYNamPNh8AC5msUbVCcg8kekzAa7r7JPzBX8nZWaXEQVar4t8q/Hg==",
+      "requires": {
+        "@meteorjs/crypto-browserify": "^3.12.1",
+        "assert": "^2.1.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "domain-browser": "^4.23.0",
+        "elliptic": "^6.5.4",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.2",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.3",
+        "util": "^0.12.5",
+        "vm-browserify": "^1.1.2"
+      },
+      "dependencies": {
+        "@meteorjs/crypto-browserify": {
+          "version": "3.12.1",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.1",
+            "browserify-sign": "^4.2.3",
+            "create-ecdh": "^4.0.4",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "diffie-hellman": "^5.0.3",
+            "hash-base": "~3.0.4",
+            "inherits": "^2.0.4",
+            "pbkdf2": "^3.1.2",
+            "public-encrypt": "^4.0.3",
+            "randombytes": "^2.1.0",
+            "randomfill": "^1.0.4"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
+          }
+        },
+        "asn1.js": {
+          "version": "4.10.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "assert": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "is-nan": "^1.3.2",
+            "object-is": "^1.1.5",
+            "object.assign": "^4.1.4",
+            "util": "^0.12.5"
+          }
+        },
+        "available-typed-arrays": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "bn.js": {
+          "version": "5.2.0",
+          "bundled": true
+        },
+        "brorand": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "browserify-aes": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "browserify-cipher": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
+          }
+        },
+        "browserify-des": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "browserify-rsa": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.0.0",
+            "randombytes": "^2.0.1"
+          }
+        },
+        "browserify-sign": {
+          "version": "4.2.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.2.1",
+            "browserify-rsa": "^4.1.0",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "elliptic": "^6.5.5",
+            "hash-base": "~3.0",
+            "inherits": "^2.0.4",
+            "parse-asn1": "^5.1.7",
+            "readable-stream": "^2.3.8",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "5.2.1",
+              "bundled": true
+            },
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.8",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2",
+                  "bundled": true
+                }
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2",
+                  "bundled": true
+                }
+              }
+            }
+          }
+        },
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "bundled": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-xor": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "builtin-status-codes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "call-bind": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.1",
+            "set-function-length": "^1.1.1"
+          }
+        },
+        "cipher-base": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "console-browserify": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "constants-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "create-ecdh": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.5.3"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "create-hash": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
+          }
+        },
+        "create-hmac": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "define-data-property": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
+          }
+        },
+        "define-properties": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "define-data-property": "^1.0.1",
+            "has-property-descriptors": "^1.0.0",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "des.js": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          }
+        },
+        "diffie-hellman": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "domain-browser": {
+          "version": "4.23.0",
+          "bundled": true
+        },
+        "elliptic": {
+          "version": "6.5.5",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.11.9",
+            "brorand": "^1.1.0",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.1",
+            "inherits": "^2.0.4",
+            "minimalistic-assert": "^1.0.1",
+            "minimalistic-crypto-utils": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "events": {
+          "version": "3.3.0",
+          "bundled": true
+        },
+        "evp_bytestokey": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "for-each": {
+          "version": "0.3.3",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.3"
+          }
+        },
+        "function-bind": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "get-intrinsic": {
+          "version": "1.2.2",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "gopd": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.1.3"
+          }
+        },
+        "has-property-descriptors": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "get-intrinsic": "^1.2.2"
+          }
+        },
+        "has-proto": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "has-tostringtag": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "hash-base": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "hash.js": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.1"
+          }
+        },
+        "hasown": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.2"
+          }
+        },
+        "hmac-drbg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
+          }
+        },
+        "https-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "is-arguments": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.7",
+          "bundled": true
+        },
+        "is-generator-function": {
+          "version": "1.0.10",
+          "bundled": true,
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-nan": {
+          "version": "1.3.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "is-typed-array": {
+          "version": "1.1.12",
+          "bundled": true,
+          "requires": {
+            "which-typed-array": "^1.1.11"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "md5.js": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "miller-rabin": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "minimalistic-assert": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "minimalistic-crypto-utils": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-inspect": {
+          "version": "1.13.1",
+          "bundled": true
+        },
+        "object-is": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "object-keys": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "object.assign": {
+          "version": "4.1.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "has-symbols": "^1.0.3",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "os-browserify": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "pako": {
+          "version": "1.0.11",
+          "bundled": true
+        },
+        "parse-asn1": {
+          "version": "5.1.7",
+          "bundled": true,
+          "requires": {
+            "asn1.js": "^4.10.1",
+            "browserify-aes": "^1.2.0",
+            "evp_bytestokey": "^1.0.3",
+            "hash-base": "~3.0",
+            "pbkdf2": "^3.1.2",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "bundled": true,
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
+          }
+        },
+        "path-browserify": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pbkdf2": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "process": {
+          "version": "0.11.10",
+          "bundled": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "public-encrypt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "qs": {
+          "version": "6.11.2",
+          "bundled": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "querystring-es3": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "randombytes": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "randomfill": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.2",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ripemd160": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "bundled": true
+        },
+        "set-function-length": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "define-data-property": "^1.1.1",
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "sha.js": {
+          "version": "2.4.11",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "side-channel": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "get-intrinsic": "^1.0.2",
+            "object-inspect": "^1.9.0"
+          }
+        },
+        "stream-browserify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "~2.0.4",
+            "readable-stream": "^3.5.0"
+          }
+        },
+        "stream-http": {
+          "version": "3.2.0",
+          "bundled": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "timers-browserify": {
+          "version": "2.0.12",
+          "bundled": true,
+          "requires": {
+            "setimmediate": "^1.0.4"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "url": {
+          "version": "0.11.3",
+          "bundled": true,
+          "requires": {
+            "punycode": "^1.4.1",
+            "qs": "^6.11.2"
+          }
+        },
+        "util": {
+          "version": "0.12.5",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "is-arguments": "^1.0.4",
+            "is-generator-function": "^1.0.7",
+            "is-typed-array": "^1.1.3",
+            "which-typed-array": "^1.1.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "vm-browserify": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "which-typed-array": {
+          "version": "1.1.13",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.5",
+            "call-bind": "^1.0.4",
+            "for-each": "^0.3.3",
+            "gopd": "^1.0.1",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mobx": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.8.0.tgz",
+      "integrity": "sha512-NsZB+9bF5j+nv9Qwk6bNeE3np26a4TbTGkMpOLf6o1zXoM9BtHPQn/00px4uZ2AXJXtQML5P4MEWdMm6icMIfQ=="
+    },
+    "moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "mssql": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/mssql/-/mssql-3.3.0.tgz",
+      "integrity": "sha512-dfI6YUSDcHZAzV5M+BwDznFArJNhRGD81Kg1RN4naqcciWaX5Tf1pYaLptBeeZwb0jyvooaLN1VIrKRVtORR8A==",
+      "requires": {
+        "generic-pool": "^2.2.0",
+        "promise": "^7.0.1",
+        "tedious": "~1.14.0"
+      }
+    },
+    "mysql": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz",
+      "integrity": "sha512-7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA==",
+      "requires": {
+        "bignumber.js": "7.2.1",
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2",
+        "sqlstring": "2.3.1"
+      }
+    },
+    "next-tick": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz",
+      "integrity": "sha512-I44QWeGCHJTx2D3buhnljvSjmPgJua3zdPGtlCQEvA45t9kS/CaHnlVqidTzHwq8LGXhD2SMezjk4hQgP+32Lg=="
+    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "parse-entities": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
+      "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
+      "requires": {
+        "character-entities": "^1.0.0",
+        "character-entities-legacy": "^1.0.0",
+        "character-reference-invalid": "^1.0.0",
+        "is-alphanumerical": "^1.0.0",
+        "is-decimal": "^1.0.0",
+        "is-hexadecimal": "^1.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+    },
+    "puppeteer": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
+      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
+      "requires": {
+        "@types/mime-types": "^2.1.0",
+        "debug": "^4.1.0",
+        "extract-zip": "^1.6.6",
+        "https-proxy-agent": "^4.0.0",
+        "mime": "^2.0.3",
+        "mime-types": "^2.1.25",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^2.6.1",
+        "ws": "^6.1.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+        }
+      }
+    },
+    "qs": {
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+      "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
+      "requires": {
+        "side-channel": "^1.0.6"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
+    },
+    "react": {
+      "version": "16.4.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.4.1.tgz",
+      "integrity": "sha512-3GEs0giKp6E0Oh/Y9ZC60CmYgUPnp7voH9fbjWsvXtYFb4EWtgQub0ADSq0sJR0BbHc4FThLLtzlcFaFXIorwg==",
+      "requires": {
+        "fbjs": "^0.8.16",
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.0"
+      }
+    },
+    "react-dom": {
+      "version": "16.11.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.11.0.tgz",
+      "integrity": "sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.17.0"
+      }
+    },
+    "react-is": {
+      "version": "16.11.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
+      "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
+    },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "react-redux": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz",
+      "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "hoist-non-react-statics": "^3.3.0",
+        "invariant": "^2.2.4",
+        "loose-envify": "^1.1.0",
+        "prop-types": "^15.6.1",
+        "react-is": "^16.6.0",
+        "react-lifecycles-compat": "^3.0.0"
+      }
+    },
+    "react-trello": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/react-trello/-/react-trello-2.1.4.tgz",
+      "integrity": "sha512-wAOMUgmDT5aIR1DeZqOIr4O91zGpIjEkqtRqplrQUf+8tCXDp288EwZV0PE1bYMulzyT/UBrv4hxOx3gHZqpOA==",
+      "requires": {
+        "@terebentina/react-popover": "^2.0.0",
+        "classnames": "^2.2.6",
+        "immutability-helper": "^2.8.1",
+        "lodash": "^4.17.11",
+        "prop-types": "^15.6.2",
+        "react-redux": "^5.0.7",
+        "redux": "^4.0.0",
+        "redux-actions": "^2.6.1",
+        "redux-logger": "^3.0.6",
+        "smooth-dnd": "git+https://github.com/rcdexta/smooth-dnd.git",
+        "uuid": "^3.3.2"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "reduce-reducers": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/reduce-reducers/-/reduce-reducers-0.4.3.tgz",
+      "integrity": "sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw=="
+    },
+    "redux": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.4.tgz",
+      "integrity": "sha512-vKv4WdiJxOWKxK0yRoaK3Y4pxxB0ilzVx6dszU2W8wLxlb2yikRph4iV/ymtdJ6ZxpBLFbyrxklnT5yBbQSl3Q==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "symbol-observable": "^1.2.0"
+      }
+    },
+    "redux-actions": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/redux-actions/-/redux-actions-2.6.5.tgz",
+      "integrity": "sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw==",
+      "requires": {
+        "invariant": "^2.2.4",
+        "just-curry-it": "^3.1.0",
+        "loose-envify": "^1.4.0",
+        "reduce-reducers": "^0.4.3",
+        "to-camel-case": "^1.0.0"
+      }
+    },
+    "redux-logger": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz",
+      "integrity": "sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg==",
+      "requires": {
+        "deep-diff": "^0.3.5"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
+    "remark-parse": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-2.3.0.tgz",
+      "integrity": "sha512-IrHRVas/IeOx3scoxx0wxsAiRfy2hJ6dgfgk9sNR9yACXeg8F3xOcbAwzwnSLhyBSkPlzXcZEzsVmCakvIepgQ==",
+      "requires": {
+        "collapse-white-space": "^1.0.2",
+        "has": "^1.0.1",
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0",
+        "is-whitespace-character": "^1.0.0",
+        "is-word-character": "^1.0.0",
+        "markdown-escapes": "^1.0.0",
+        "parse-entities": "^1.0.2",
+        "repeat-string": "^1.5.4",
+        "state-toggle": "^1.0.0",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "^1.0.0",
+        "unherit": "^1.0.4",
+        "unist-util-remove-position": "^1.0.0",
+        "vfile-location": "^2.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
+    },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha512-vuNYXC7gG7IeVNBC1xUllqCcZKRbJoSPOBhnTEcAIiKCsbuef6zO3F0Rve3isPMMoNoQRWjQwbAgAjHUHniyEA=="
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "scheduler": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.17.0.tgz",
+      "integrity": "sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+    },
+    "side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "dependencies": {
+        "object-inspect": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+          "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
+        }
+      }
+    },
+    "smooth-dnd": {
+      "version": "git+https://github.com/rcdexta/smooth-dnd.git#223f4672bea94f65b98af4fd28ab0db2c3b9c8a2",
+      "from": "git+https://github.com/rcdexta/smooth-dnd.git"
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "sprintf": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz",
+      "integrity": "sha512-4X5KsuXFQ7f+d7Y+bi4qSb6eI+YoifDTGr0MQJXRoYO7BO7evfRCjds6kk3z7l5CiJYxgDN1x5Er4WiyCt+zTQ=="
+    },
+    "sqlstring": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
+      "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ=="
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="
+    },
+    "state-toggle": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.2.tgz",
+      "integrity": "sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw=="
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "stripe": {
+      "version": "15.10.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-15.10.0.tgz",
+      "integrity": "sha512-yM2967TDiNhmPE69R61Btx7URgRJOjAoLRvAa0dUyF5qfDMjDh4Qolr/FaZigxUzBH5/8SphkHpNS4Ie2L5RYg==",
+      "requires": {
+        "@types/node": ">=8.1.0",
+        "qs": "^6.11.0"
+      }
+    },
+    "styled-components": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz",
+      "integrity": "sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@emotion/is-prop-valid": "^0.8.1",
+        "@emotion/unitless": "^0.7.0",
+        "babel-plugin-styled-components": ">= 1",
+        "css-to-react-native": "^2.2.2",
+        "memoize-one": "^5.0.0",
+        "merge-anything": "^2.2.4",
+        "prop-types": "^15.5.4",
+        "react-is": "^16.6.0",
+        "stylis": "^3.5.0",
+        "stylis-rule-sheet": "^0.0.10",
+        "supports-color": "^5.5.0"
+      }
+    },
+    "stylis": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
+      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
+    },
+    "stylis-rule-sheet": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
+      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+    },
+    "tedious": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/tedious/-/tedious-1.14.0.tgz",
+      "integrity": "sha512-iEna73qG96pjNyES2jtMBS4f4g2se0rr1s2rHhFZ3lFPRRHYO4cpGKdLsZds4brDDqkaD1sSf2lfNEhwVxJZTA==",
+      "requires": {
+        "babel-runtime": "^5.8.19",
+        "big-number": "0.3.1",
+        "bl": "^1.0.0",
+        "iconv-lite": "^0.4.11",
+        "readable-stream": "^2.0.2",
+        "semver": "^5.1.0",
+        "sprintf": "0.1.5"
+      }
+    },
+    "to-camel-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz",
+      "integrity": "sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q==",
+      "requires": {
+        "to-space-case": "^1.0.0"
+      }
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+    },
+    "to-no-case": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz",
+      "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg=="
+    },
+    "to-space-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
+      "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
+      "requires": {
+        "to-no-case": "^1.0.0"
+      }
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ=="
+    },
+    "trim-trailing-lines": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz",
+      "integrity": "sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q=="
+    },
+    "trough": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz",
+      "integrity": "sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q=="
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+    },
+    "ua-parser-js": {
+      "version": "0.7.38",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
+      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA=="
+    },
+    "unherit": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.2.tgz",
+      "integrity": "sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "xtend": "^4.0.1"
+      }
+    },
+    "unified": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-5.1.0.tgz",
+      "integrity": "sha512-mSHD25l+EyuNc3WB/K1/zMle3AHYxZ0iz4JxP9cSCBr9HDmRSnR24vTWo/r1/z84PUlQRN+QCt9jvKd422y8MA==",
+      "requires": {
+        "bail": "^1.0.0",
+        "extend": "^3.0.0",
+        "has": "^1.0.1",
+        "is-buffer": "^1.1.4",
+        "once": "^1.3.3",
+        "trough": "^1.0.0",
+        "vfile": "^2.0.0",
+        "x-is-string": "^0.1.0"
+      }
+    },
+    "unist-util-is": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
+      "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
+      "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
+      "requires": {
+        "unist-util-visit": "^1.1.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
+      "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="
+    },
+    "unist-util-visit": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
+      "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
+      "requires": {
+        "unist-util-visit-parents": "^2.0.0"
+      }
+    },
+    "unist-util-visit-parents": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
+      "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
+      "requires": {
+        "unist-util-is": "^3.0.0"
+      }
+    },
+    "update-browserslist-db": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.15.tgz",
+      "integrity": "sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==",
+      "requires": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+    },
+    "vfile": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
+      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+      "requires": {
+        "is-buffer": "^1.1.4",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "^1.0.0",
+        "vfile-message": "^1.0.0"
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
+      "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="
+    },
+    "vfile-message": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
+      "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
+      "requires": {
+        "unist-util-stringify-position": "^1.1.1"
+      }
+    },
+    "whatwg-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+    },
+    "winston": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz",
+      "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==",
+      "requires": {
+        "async": "~1.0.0",
+        "colors": "1.0.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "stack-trace": "0.0.x"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "x-is-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
+      "integrity": "sha512-GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w=="
+    },
+    "xml2js": {
+      "version": "0.4.22",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.22.tgz",
+      "integrity": "sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "util.promisify": "~1.0.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/package.json b/tools/tests/apps/modules-modern/package.json
new file mode 100644
index 0000000000..ca41575ebe
--- /dev/null
+++ b/tools/tests/apps/modules-modern/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "modules-test-app",
+  "author": "Ben Newman <ben@meteor.com>",
+  "description": "Test app exercising many aspects of the Meteor module system.",
+  "private": true,
+  "dependencies": {
+    "@babel/core": "^7.23.5",
+    "@babel/plugin-proposal-do-expressions": "^7.23.3",
+    "@babel/runtime": "^7.23.5",
+    "@polymer/lit-element": "0.7.1",
+    "@wry/context": "^0.4.0",
+    "acorn": "file:imports/links/acorn",
+    "aws-sdk": "^2.2.41",
+    "cli-color": "^0.2.3",
+    "github": "^0.2.4",
+    "graphql": "^14.3.1",
+    "immutable-tuple": "^0.4.4",
+    "jquery": "^3.7.1",
+    "jsx-import-test": "file:imports/links/jsx-import-test",
+    "lodash-es": "^4.17.21",
+    "markdown-to-jsx": "4.0.3",
+    "meteor-node-stubs": "^1.2.12",
+    "mobx": "5.8.0",
+    "moment": "^2.30.1",
+    "mssql": "^3.1.1",
+    "mysql": "^2.15.0",
+    "pify": "^4.0.1",
+    "puppeteer": "^2.1.1",
+    "react-dom": "^16.8.6",
+    "react-trello": "2.1.4",
+    "regenerator-runtime": "^0.11.1",
+    "stripe": "^15.10.0",
+    "styled-components": "^4.3.2",
+    "uuid": "^3.4.0",
+    "winston": "^2.3.1"
+  },
+  "scripts": {
+    "test": "METEOR_PROFILE=20 TEST_BROWSER_DRIVER=puppeteer meteor test --full-app --driver-package meteortesting:mocha",
+    "browser": "METEOR_PROFILE=20 TEST_BROWSER_DRIVER=puppeteer meteor test --full-app --driver-package meteortesting:mocha",
+    "test-packages": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --driver-package meteortesting:mocha packages/modules-test-package"
+  },
+  "meteor": {
+    "testModule": "tests.js",
+    "nodeModules": {
+      "recompile": {
+        "pify": "legacy",
+        "@polymer/lit-element": true
+      }
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/packages/client-only-ecmascript/README.md b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/README.md
new file mode 100644
index 0000000000..6a3787a42d
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/README.md
@@ -0,0 +1 @@
+Test package for issue https://github.com/meteor/meteor/issues/6877.
diff --git a/tools/tests/apps/modules-modern/packages/client-only-ecmascript/client.js b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/client.js
new file mode 100644
index 0000000000..364a0b9480
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/client.js
@@ -0,0 +1,6 @@
+export { name as imported } from "./imported.js";
+export const name = 'client-only-ecmascript';
+export const ClientTypeof = {
+  require: typeof require,
+  exports: typeof exports
+};
diff --git a/tools/tests/apps/modules-modern/packages/client-only-ecmascript/imported.js b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/imported.js
new file mode 100644
index 0000000000..f3e9aa9c6f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/imported.js
@@ -0,0 +1 @@
+export const name = module.id;
diff --git a/tools/tests/apps/modules-modern/packages/client-only-ecmascript/package.js b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/package.js
new file mode 100644
index 0000000000..62e8e86473
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/package.js
@@ -0,0 +1,13 @@
+Package.describe({
+  name: "client-only-ecmascript",
+  version: "0.0.1",
+  summary: "",
+  documentation: null
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript", "client");
+  api.mainModule("client.js", "client");
+  api.addFiles("server.js", "server");
+  api.export("ServerTypeof", "server");
+});
diff --git a/tools/tests/apps/modules-modern/packages/client-only-ecmascript/server.js b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/server.js
new file mode 100644
index 0000000000..5e877d73c6
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/client-only-ecmascript/server.js
@@ -0,0 +1,4 @@
+ServerTypeof = {
+  require: typeof require,
+  exports: typeof exports
+};
diff --git a/tools/tests/apps/modules-modern/packages/dummy-compiler/main.js b/tools/tests/apps/modules-modern/packages/dummy-compiler/main.js
new file mode 100644
index 0000000000..eba720080d
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/dummy-compiler/main.js
@@ -0,0 +1,8 @@
+import assert from "assert";
+import { id as sourceId } from "./test.dummy";
+import { id as secondId } from "./test.dummy.secondModule";
+
+export function check() {
+  assert.ok(sourceId.endsWith("/test.dummy"), sourceId);
+  assert.ok(secondId.endsWith("/test.dummy.secondModule"), sourceId);
+}
diff --git a/tools/tests/apps/modules-modern/packages/dummy-compiler/package.js b/tools/tests/apps/modules-modern/packages/dummy-compiler/package.js
new file mode 100644
index 0000000000..ad5935c32d
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/dummy-compiler/package.js
@@ -0,0 +1,16 @@
+Package.describe({
+  name: "dummy-compiler",
+  version: "1.0.0",
+  description: "test package for issue #10233"
+});
+
+Package.registerBuildPlugin({
+  name: "dummy-compiler",
+  sources: ["plugin.js"]
+});
+
+Package.onUse(function (api) {
+  api.use("isobuild:compiler-plugin@1.0.0");
+  api.use("ecmascript");
+  api.mainModule("main.js");
+});
diff --git a/tools/tests/apps/modules-modern/packages/dummy-compiler/plugin.js b/tools/tests/apps/modules-modern/packages/dummy-compiler/plugin.js
new file mode 100644
index 0000000000..4427389235
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/dummy-compiler/plugin.js
@@ -0,0 +1,29 @@
+Plugin.registerCompiler({
+  extensions: ["dummy"]
+}, function () {
+  return new DummyCompiler();
+});
+
+function DummyCompiler() {}
+
+DummyCompiler.prototype.processFilesForTarget = function (inputFiles) {
+  var self = this;
+
+  inputFiles.forEach(function (inputFile) {
+    self.compileOneFile(inputFile);
+  });
+};
+
+DummyCompiler.prototype.compileOneFile = function (inputFile) {
+  var path = inputFile.getPathInPackage();
+
+  inputFile.addJavaScript({
+    path: path,
+    data: 'exports.id = module.id;'
+  });
+
+  inputFile.addJavaScript({
+    path: path + ".secondModule",
+    data: 'exports.id = module.id;'
+  });
+};
diff --git a/tools/tests/apps/modules-modern/packages/dummy-compiler/test.dummy b/tools/tests/apps/modules-modern/packages/dummy-compiler/test.dummy
new file mode 100644
index 0000000000..12039db933
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/dummy-compiler/test.dummy
@@ -0,0 +1 @@
+// Nothing to see here!
diff --git a/tools/tests/apps/modules-modern/packages/import-local-json-module/data.json b/tools/tests/apps/modules-modern/packages/import-local-json-module/data.json
new file mode 100644
index 0000000000..0ad27b3920
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/import-local-json-module/data.json
@@ -0,0 +1,3 @@
+{
+  "oyez": 1234
+}
diff --git a/tools/tests/apps/modules-modern/packages/import-local-json-module/main.js b/tools/tests/apps/modules-modern/packages/import-local-json-module/main.js
new file mode 100644
index 0000000000..f48fd261f6
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/import-local-json-module/main.js
@@ -0,0 +1 @@
+export { oyez } from "./data.json";
diff --git a/tools/tests/apps/modules-modern/packages/import-local-json-module/package.js b/tools/tests/apps/modules-modern/packages/import-local-json-module/package.js
new file mode 100644
index 0000000000..bdcb78cf54
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/import-local-json-module/package.js
@@ -0,0 +1,11 @@
+Package.describe({
+  name: "import-local-json-module",
+  version: "0.0.1",
+  summary: "Regression test for issue #10122",
+  documentation: null
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript");
+  api.mainModule("main.js");
+});
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/.gitignore b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/README b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/README
new file mode 100644
index 0000000000..3d492553a4
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/README
@@ -0,0 +1,7 @@
+This directory and the files immediately inside it are automatically generated
+when you change this package's NPM dependencies. Commit the files in this
+directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
+so that others run the same versions of sub-dependencies.
+
+You should NOT check in the node_modules directory that Meteor automatically
+creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/npm-shrinkwrap.json b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 0000000000..22547232a8
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,182 @@
+{
+  "lockfileVersion": 4,
+  "dependencies": {
+    "@wry/context": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.4.0.tgz",
+      "integrity": "sha512-rVjwzFjVYXJ8pWJ8ZRCHv6meOebQvfTlvnUYUNX93Ce0KNeMTqCkf0GiOJc6BNVB96s7qfvwoLN3nUgDnSFOOg=="
+    },
+    "assert": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz",
+      "integrity": "sha512-5aKcpD+XnHpZ7EGxsuo6uoILNh0rvm0Ypa17GlkrF2CNSPhvdgi3ft9XsL2ajdVOI2I3xuGZnHvlXAeqTZYvXg=="
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+    },
+    "cheerio": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
+      "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA=="
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA=="
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
+    },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "ganalytics": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/ganalytics/-/ganalytics-3.1.2.tgz",
+      "integrity": "sha512-+v7cGYFyte8cNtakkBKCBL7M6fQdAXZumghAryLHztJ08jG6bFEfidfOcMQErAe8sLsekboyavKH5tF9MaDT1Q=="
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "lodash.assignin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
+      "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg=="
+    },
+    "lodash.bind": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
+      "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA=="
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
+    },
+    "lodash.filter": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
+      "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ=="
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="
+    },
+    "lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
+    },
+    "lodash.map": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+      "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q=="
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="
+    },
+    "lodash.reduce": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
+      "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw=="
+    },
+    "lodash.reject": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
+      "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ=="
+    },
+    "lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ=="
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="
+    },
+    "os-browserify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.0.tgz",
+      "integrity": "sha512-oFcZ4Sqg4duxsVmkbuygtTRg5EEJ6PMoFUHC/vLLONyiJLvs5fvjCDSV47lP6vFLz/nZrhBhKqMrpk8IeoG3eQ=="
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/README.md b/tools/tests/apps/modules-modern/packages/modules-test-package/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/client.js b/tools/tests/apps/modules-modern/packages/modules-test-package/client.js
new file mode 100644
index 0000000000..db78899134
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/client.js
@@ -0,0 +1,17 @@
+import {
+  checkPackageVars,
+  checkWhere,
+} from "./common";
+
+export const where = "client";
+export * from "./common";
+
+checkWhere(where);
+
+var style = require("./css/imported.css");
+if (! style) {
+  require("./css/not-imported.css");
+}
+
+ClientPackageVar = "client";
+checkPackageVars();
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/client/where.js b/tools/tests/apps/modules-modern/packages/modules-test-package/client/where.js
new file mode 100644
index 0000000000..52de0b33a0
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/client/where.js
@@ -0,0 +1 @@
+export * from "../server/where.js";
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/common.js b/tools/tests/apps/modules-modern/packages/modules-test-package/common.js
new file mode 100644
index 0000000000..fb1f95f5bf
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/common.js
@@ -0,0 +1,54 @@
+import assert from "assert";
+import "regenerator-runtime/runtime";
+export const ModulesTestPackage = "loaded";
+
+import { parse } from "acorn";
+assert.strictEqual(typeof parse, "function");
+
+// Test that an npm package with a "module" entry point in its package.json
+// file can be imported.
+import { Slot } from "@wry/context";
+assert.strictEqual(typeof Slot, "function");
+const idPrefix = "/node_modules/meteor/modules-test-package/node_modules/@wry/context/lib/";
+assert.strictEqual(
+  require.resolve("@wry/context"),
+  idPrefix + (
+    Meteor.isClient && Meteor.isModern ? "context.esm.js" : "context.js"
+  ),
+);
+
+import ganalytics from "ganalytics";
+assert.strictEqual(typeof ganalytics, "function");
+
+export async function checkWhere(where) {
+  const { where: serverWhere } = await require("./server/where.js");
+  const { where: clientWhere } = await require("./client/where.js");
+  assert.strictEqual(serverWhere, where);
+  assert.strictEqual(clientWhere, where);
+}
+
+export function checkPackageVars() {
+  if (Meteor.isClient) {
+    assert.strictEqual(ClientPackageVar, "client");
+    try {
+      console.log(ServerPackageVar);
+    } catch (e) {
+      if (e instanceof ReferenceError) {
+        // ok
+      } else {
+        throw e;
+      }
+    }
+  } else {
+    assert.strictEqual(ServerPackageVar, "server");
+    try {
+      console.log(ClientPackageVar);
+    } catch (e) {
+      if (e instanceof ReferenceError) {
+        // ok
+      } else {
+        throw e;
+      }
+    }
+  }
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/css/imported.css b/tools/tests/apps/modules-modern/packages/modules-test-package/css/imported.css
new file mode 100644
index 0000000000..5d82f172cb
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/css/imported.css
@@ -0,0 +1,7 @@
+.pkg-lazy-css.imported {
+  padding: 20px;
+}
+
+.not-imported {
+  padding: 0px;
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/css/not-imported.css b/tools/tests/apps/modules-modern/packages/modules-test-package/css/not-imported.css
new file mode 100644
index 0000000000..f159897d9f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/css/not-imported.css
@@ -0,0 +1,3 @@
+.pkg-lazy-css.not-imported {
+  padding: 20px;
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/illegal.html b/tools/tests/apps/modules-modern/packages/modules-test-package/illegal.html
new file mode 100644
index 0000000000..e7994d980c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/illegal.html
@@ -0,0 +1 @@
+<div>This is not a valid template file!</div>
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/os-stub.js b/tools/tests/apps/modules-modern/packages/modules-test-package/os-stub.js
new file mode 100644
index 0000000000..b809de7c4c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/os-stub.js
@@ -0,0 +1,2 @@
+export {platform} from "os-browserify/browser";
+export const name = module.id;
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/package.js b/tools/tests/apps/modules-modern/packages/modules-test-package/package.js
new file mode 100644
index 0000000000..c79fd35cbf
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/package.js
@@ -0,0 +1,31 @@
+Package.describe({
+  name: 'modules-test-package',
+  version: '0.0.1',
+  summary: 'local test package',
+  documentation: 'README.md'
+});
+
+Npm.depends({
+  "@wry/context": "0.4.0",
+  "os-browserify": "0.2.0",
+  "assert": "1.3.0",
+  "cheerio": "0.22.0",
+  "ganalytics": "3.1.2",
+});
+
+Package.onUse(function(api) {
+  api.use('ecmascript');
+  api.use('templating');
+  api.mainModule("client.js", "client", {
+    lazy: true
+  });
+  api.mainModule("server.js", "server");
+  api.export("ModulesTestPackage", "server");
+});
+
+Package.onTest(function (api) {
+  api.use("ecmascript");
+  api.use("tinytest");
+  api.use("modules-test-package");
+  api.mainModule("tests.js");
+});
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/server.js b/tools/tests/apps/modules-modern/packages/modules-test-package/server.js
new file mode 100644
index 0000000000..f2a19148ef
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/server.js
@@ -0,0 +1,12 @@
+import assert from "assert";
+
+import * as common from "./common";
+assert.strictEqual(common.ModulesTestPackage, "loaded");
+
+export { ModulesTestPackage } from "./common";
+
+export const where = "server";
+await common.checkWhere(where);
+
+ServerPackageVar = "server";
+common.checkPackageVars();
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/server/where.js b/tools/tests/apps/modules-modern/packages/modules-test-package/server/where.js
new file mode 100644
index 0000000000..aac3fa79df
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/server/where.js
@@ -0,0 +1,2 @@
+import { Meteor } from "meteor/meteor";
+export const where = Meteor.isServer ? "server" : "client";
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-package/tests.js b/tools/tests/apps/modules-modern/packages/modules-test-package/tests.js
new file mode 100644
index 0000000000..67378a6352
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-package/tests.js
@@ -0,0 +1,9 @@
+import assert from "assert";
+
+describe("cheerio", () => {
+  it("should be importable", () => {
+    import cheerio from "cheerio";
+    assert.strictEqual(typeof cheerio, "object");
+    assert.deepEqual(Object.keys(cheerio), ["cheerio"]);
+  });
+});
diff --git a/tools/tests/apps/modules-modern/server/only.js b/tools/tests/apps/modules-modern/server/only.js
new file mode 100644
index 0000000000..09bdc8a89f
--- /dev/null
+++ b/tools/tests/apps/modules-modern/server/only.js
@@ -0,0 +1,17 @@
+import assert from "assert";
+
+import "github";
+import "aws-sdk";
+import "stripe";
+import "mssql";
+
+import winston from "winston";
+import * as winstonNamespace from "winston";
+assert.strictEqual(typeof winston.default, "object");
+assert.strictEqual(typeof winston.transports.Console, "function");
+assert.strictEqual(winstonNamespace.default, winston);
+
+assert.strictEqual(Meteor.isServer, true);
+assert.strictEqual(Meteor.isClient, false);
+
+export default module.id;
diff --git a/tools/tests/apps/modules-modern/tests.js b/tools/tests/apps/modules-modern/tests.js
new file mode 100644
index 0000000000..6d64df86af
--- /dev/null
+++ b/tools/tests/apps/modules-modern/tests.js
@@ -0,0 +1,761 @@
+import assert from "assert";
+import fs from "fs";
+import { Meteor as ImportedMeteor } from "meteor/meteor";
+import moment from "moment";
+import path from "path";
+import shared from "./imports/shared";
+
+describe("app modules", () => {
+  it("can be imported using absolute identifiers", async () => {
+    assert.strictEqual(await require("/tests"), exports);
+  });
+
+  it("can have different file extensions", async () => {
+    assert.strictEqual(
+      (await require("./eager-jsx")).extension,
+      ".jsx"
+    );
+
+    assert.strictEqual(
+      require("./eager-coffee").extension,
+      ".coffee"
+    );
+
+    assert.strictEqual(
+      (await require("/eager-jsx")).extension,
+      ".jsx"
+    );
+
+    assert.strictEqual(
+      require("/eager-coffee").extension,
+      ".coffee"
+    );
+  });
+
+  it("are eagerly evaluated if outside imports/", () => {
+    assert.strictEqual(shared["/eager-jsx.jsx"], "eager jsx");
+    assert.strictEqual(shared["/eager-coffee.coffee"], "eager coffee");
+  });
+
+  it("are lazily evaluated if inside imports/", (done) => {
+    const delayMs = 200;
+
+    setTimeout(async () => {
+      assert.strictEqual(shared["/imports/lazy1.js"], void 0);
+      assert.strictEqual(shared["/imports/lazy2.js"], void 0);
+
+      var reset1 = (await require("./imports/lazy1")).reset;
+
+      assert.strictEqual(shared["/imports/lazy1.js"], 1);
+      assert.strictEqual(shared["/imports/lazy2.js"], 2);
+
+      // Make sure this test can run again without starting a new process.
+      (await require("./imports/lazy2")).reset();
+      reset1();
+
+      done();
+    }, delayMs);
+  });
+
+  it("cannot import server modules on client", async () => {
+    let error;
+    let result;
+    try {
+      result = (await require("./server/only")).default;
+    } catch (expectedOnClient) {
+      error = expectedOnClient;
+    }
+
+    if (Meteor.isServer) {
+      assert.strictEqual(typeof error, "undefined");
+      assert.strictEqual(result, "/server/only.js");
+      assert.strictEqual(await require("./server/only"),
+                         await require("/server/only"));
+    }
+
+    if (Meteor.isClient) {
+      assert.ok(error instanceof Error);
+    }
+  });
+
+  it("cannot import client modules on server", () => {
+    let error;
+    let result;
+    try {
+      result = require("./client/only").default;
+    } catch (expectedOnServer) {
+      error = expectedOnServer;
+    }
+
+    if (Meteor.isClient) {
+      assert.strictEqual(typeof error, "undefined");
+      assert.strictEqual(result, "/client/only.js");
+      assert.strictEqual(require("./client/only"),
+                         require("/client/only"));
+    }
+
+    if (Meteor.isServer) {
+      assert.ok(error instanceof Error);
+    }
+  });
+
+  it("should have access to filename and dirname", async () => {
+    assert.strictEqual(await require(__filename), exports);
+    assert.strictEqual(
+      require("path").relative(__dirname, __filename),
+      "tests.js"
+    );
+  });
+
+  it("can be implemented by directories", () => {
+    assert.strictEqual(
+      require("./imports/dir").fellBackTo,
+      "/imports/dir/index.js"
+    );
+  });
+});
+
+describe("template modules", () => {
+  Meteor.isClient &&
+  it("should be importable on the client", () => {
+    assert.strictEqual(typeof Template, "function");
+    assert.ok(! Object.prototype.hasOwnProperty.call(Template, "lazy"));
+    require("./imports/lazy.html");
+    assert.ok(Object.prototype.hasOwnProperty.call(Template, "lazy"));
+    assert.ok(Template.lazy instanceof Template);
+  });
+
+  Meteor.isServer &&
+  it("should not be importable on the server", () => {
+    let error;
+    try {
+      require("./imports/lazy.html");
+    } catch (expected) {
+      error = expected;
+    }
+    assert.ok(error instanceof Error);
+  });
+});
+
+Meteor.isClient &&
+describe("css modules", () => {
+  it("should be loaded eagerly unless lazy", () => {
+    assert.strictEqual(
+      $(".app-eager-css").css("display"),
+      "none"
+    );
+
+    // Eager CSS is added unconditionally to a combined <style> tag at the
+    // beginning of the <head>. If the corresponding module ever gets
+    // imported, its module.exports object should be an empty stub, rather
+    // than a <style> node added dynamically to the <head>.
+    assert.deepEqual(Object.keys(require("./eager.css")), []);
+  });
+
+  it("should be importable by an app", () => {
+    assert.strictEqual($(".app-lazy-css").css("padding"), "0px");
+    require("./imports/lazy.css");
+    assert.strictEqual($(".app-lazy-css").css("padding"), "10px");
+  });
+
+  it("should be importable by a package", async () => {
+    assert.strictEqual(
+      $(".pkg-lazy-css.imported").css("padding"),
+      "0px"
+    );
+
+    assert.strictEqual(
+      $(".pkg-lazy-css.not-imported").css("padding"),
+      "0px"
+    );
+
+    // Since client.js is a lazy main module, its side effects don't
+    // happen until we import it for the first time (here).
+    await require("meteor/modules-test-package/client.js");
+
+    assert.strictEqual(
+      $(".pkg-lazy-css.imported").css("padding"),
+      "20px"
+    );
+
+    assert.strictEqual(
+      $(".pkg-lazy-css.not-imported").css("padding"),
+      "0px"
+    );
+  });
+});
+
+describe("native node_modules", () => {
+  Meteor.isServer &&
+  it("can be imported on the server", () => {
+    assert.strictEqual(typeof require("fs").readFile, "function");
+  });
+
+  Meteor.isClient &&
+  it("are imported as stubs on the client", () => {
+    const inherits = require("util").inherits;
+    assert.strictEqual(typeof inherits, "function");
+  });
+
+  Meteor.isServer &&
+  it("cannot be overridden on the server", () => {
+    assert.strictEqual(typeof require("repl").start, "function");
+  });
+
+  it("can be implemented by wrapper npm packages", () => {
+    const Stream = require("stream");
+    assert.strictEqual(typeof Stream, "function");
+    assert.strictEqual(typeof Stream.Readable, "function");
+  });
+
+  it("can all be imported", () => {
+    require("assert");
+    require("buffer");
+    require("child_process");
+    require("cluster");
+    require("console");
+    require("constants");
+    require("dgram");
+    require("dns");
+    require("domain");
+    require("events");
+    require("fs");
+    require("http");
+    require("https");
+    require("module");
+    require("net");
+    require("os");
+    require("path");
+    require("process");
+    require("querystring");
+    require("readline");
+    require("repl");
+    require("stream");
+    require("_stream_duplex");
+    require("_stream_passthrough");
+    require("_stream_readable");
+    require("_stream_transform");
+    require("_stream_writable");
+    require("string_decoder");
+    require("sys");
+    require("timers");
+    require("tls");
+    require("tty");
+    require("url");
+    require("util");
+    require("vm");
+    require("zlib");
+
+    // The crypto package automatically polyfills global.Buffer on the
+    // client, so save it for last to ensure that none of the packages
+    // above depend on global.Buffer.
+    require("crypto");
+  });
+
+  Meteor.isClient &&
+  it('should return Module from require("module")', () => {
+    assert.ok(module instanceof require("module"));
+  });
+});
+
+describe("local node_modules", () => {
+  it("should be importable", () => {
+    assert.strictEqual(require("moment"), moment);
+    const cal = moment().calendar();
+    assert.ok(cal.match(/\bat\b/));
+  });
+
+  it("can be imported using absolute identifiers", () => {
+    assert.strictEqual(
+      require("moment"),
+      require("/node_modules/moment")
+    );
+  });
+
+  it("should be importable by packages", () => {
+    // Defined in packages/modules-test-package/common.js.
+    assert.strictEqual(typeof regeneratorRuntime, "object");
+  });
+
+  it('should expose "version" field of package.json', () => {
+    const pkg = require("moment/package.json");
+    assert.strictEqual(pkg.version, "2.30.1");
+  });
+
+  it('should support object-valued package.json "browser" fields', () => {
+    const uuid = require("uuid");
+    const id = uuid();
+    assert.strictEqual(typeof id, "string");
+    assert.strictEqual(id.split("-").length, 5);
+
+    if (Meteor.isClient) {
+      assert.strictEqual(
+        require.resolve("uuid/lib/rng.js"),
+        "/node_modules/uuid/lib/rng-browser.js"
+      );
+
+      const { browser } = require(["uuid", "package.json"].join("/"));
+      assert.strictEqual(typeof browser, "object");
+    }
+  });
+
+  it('should support package.json without a "main" field', () => {
+    if (Meteor.isServer) {
+      // Only import mysql during server tests, but register the
+      // dependency in the client bundle, too.
+      assert.strictEqual(
+        typeof require("mysql").createQuery,
+        "function"
+      );
+    }
+
+    assert.strictEqual(
+      require.resolve("mysql"),
+      "/node_modules/mysql/index.js"
+    );
+
+    // Verify that the package.json stub is bundled even though it is not
+    // needed for looking up the index.js module (#9235).
+    const pkg = require(["mysql", "package.json"].join("/"));
+    assert.strictEqual(pkg.name, "mysql");
+    assert.strictEqual(pkg.main, void 0);
+  });
+
+  it('should support package.json with a directory "main" field', () => {
+    if (Meteor.isServer) {
+      assert.strictEqual(typeof require("cli-color"), "function");
+    }
+
+    assert.strictEqual(
+      require.resolve("cli-color"),
+      "/node_modules/cli-color/lib/index.js"
+    );
+
+    const pkg = require(["cli-color", "package.json"].join("/"));
+    assert.strictEqual(pkg.name, "cli-color");
+    assert.strictEqual(pkg.main, "lib");
+
+    // We have to use an older version of cli-color to get this unusual
+    // module layout, so we shouldn't let this change without notice.
+    assert.strictEqual(pkg.version, "0.2.3");
+  });
+
+  it('should prefer "module" field of package.json on client', () => {
+    assert.strictEqual(
+      require.resolve("@wry/context"),
+      "/node_modules/@wry/context/lib/" + (
+        Meteor.isClient && Meteor.isModern ? "context.esm.js" : "context.js"
+      ),
+    );
+
+    assert.strictEqual(
+      typeof require("@wry/context").Slot,
+      "function",
+    );
+  });
+
+  it("packages with .mjs entry points can be imported", () => {
+    assert.strictEqual(
+      require.resolve("graphql"),
+      "/node_modules/graphql/index." + (
+        Meteor.isClient && Meteor.isModern ? "mjs" : "js"
+      ),
+    );
+    const { parse } = require("graphql");
+    const nestedParse = require("graphql/language/parser").parse;
+    assert.strictEqual(typeof parse, "function");
+    assert.strictEqual(parse, nestedParse);
+  });
+
+  Meteor.isClient && it("can import @polymer/lit-element", () => {
+    // This import is enabled by the meteor.nodeModules.recompile section of
+    // the package.json file for the modules test application.
+    const litElement = require("@polymer/lit-element");
+    const typeofMap = {};
+    Object.keys(litElement).forEach(key => {
+      typeofMap[key] = typeof litElement[key];
+    });
+
+    assert.deepEqual(typeofMap, {
+      defaultConverter: "object",
+      notEqual: "function",
+      UpdatingElement: "function",
+      customElement: "function",
+      property: "function",
+      query: "function",
+      queryAll: "function",
+      eventOptions: "function",
+      html: "function",
+      svg: "function",
+      TemplateResult: "function",
+      SVGTemplateResult: "function",
+      supportsAdoptingStyleSheets: "boolean",
+      CSSResult: "function",
+      css: "function",
+      LitElement: "function"
+    });
+  });
+
+  it("can import @babel/runtime/helpers/esm/*", () => {
+    import asyncIterator from "@babel/runtime/helpers/esm/asyncIterator.js";
+    import createClass from "@babel/runtime/helpers/esm/createClass.js";
+    import getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf.js";
+    import inherits from "@babel/runtime/helpers/esm/inherits.js";
+    import toArray from "@babel/runtime/helpers/esm/toArray.js";
+    import _typeof from "@babel/runtime/helpers/esm/typeof.js";
+
+    assert.strictEqual(typeof asyncIterator, "function");
+    assert.strictEqual(typeof createClass, "function");
+    assert.strictEqual(typeof getPrototypeOf, "function");
+    assert.strictEqual(typeof inherits, "function");
+    assert.strictEqual(typeof toArray, "function");
+    assert.strictEqual(typeof _typeof, "function");
+  });
+
+  it('can import packages with broken "module" fields', () => {
+    assert.strictEqual(
+      require.resolve("markdown-to-jsx"),
+      "/node_modules/markdown-to-jsx/index.es5.js",
+    );
+    const md2jsx = require("markdown-to-jsx");
+    assert.strictEqual(typeof md2jsx.default, "function");
+
+    assert.strictEqual(
+      require.resolve("react-trello"),
+      "/node_modules/react-trello/dist/index.js",
+    );
+    const reactTrello = require("react-trello");
+    assert.strictEqual(typeof reactTrello.default, "function");
+  });
+});
+
+describe("Meteor packages", () => {
+  it("api.export should create named exports", () => {
+    assert.strictEqual(typeof ImportedMeteor, "object");
+    assert.strictEqual(Meteor, ImportedMeteor);
+  });
+
+  it("should be importable", () => {
+
+    const Blaze = require("meteor/blaze").Blaze;
+    assert.strictEqual(typeof Blaze, "object");
+
+    let error;
+    try {
+      require("meteor/nonexistent");
+    } catch (expected) {
+      error = expected;
+    }
+    assert.ok(error instanceof Error);
+  });
+
+  it("can be local", async () => {
+    // ModulesTestPackage is only api.export-ed on the server.
+    if (Meteor.isServer) {
+      assert.strictEqual(ModulesTestPackage, "loaded");
+    }
+    if (Meteor.isClient) {
+      assert.strictEqual(typeof ModulesTestPackage, "undefined");
+    }
+
+    // But it is importable by both client and server.
+    const mtp = await require("meteor/modules-test-package");
+    assert.strictEqual(mtp.ModulesTestPackage, "loaded");
+
+    assert.strictEqual(mtp.where, Meteor.isServer ? "server" : "client");
+  });
+
+  it("should expose their files for import", async () => {
+    const osStub = await require("meteor/modules-test-package/os-stub");
+
+    assert.strictEqual(
+      osStub.platform(),
+      "browser"
+    );
+
+    assert.strictEqual(
+      osStub.name,
+      "/node_modules/meteor/modules-test-package/os-stub.js"
+    );
+  });
+
+  it("should only include lazy files if platform uses modules", function () {
+    if (Meteor.isServer) {
+      const clientOnlyIsopackPath = path.join(
+        // Currently process.cwd is .meteor/local/build/programs/server.
+        "..", "..", "..", "isopacks", "client-only-ecmascript"
+      );
+
+      const webJsonPath = path.join(
+        clientOnlyIsopackPath,
+        "web.browser.json"
+      );
+
+      const osJsonPath = path.join(
+        clientOnlyIsopackPath,
+        "os.json"
+      );
+
+      const web = JSON.parse(fs.readFileSync(webJsonPath));
+      assert.deepEqual(web.resources.map(function (res) {
+        return res.path;
+      }), ["client.js", "imported.js", "server.js"]);
+      assert.strictEqual(web.resources[0].fileOptions.mainModule, true);
+      assert.strictEqual(web.resources[1].fileOptions.lazy, true);
+      assert.strictEqual(web.resources[2].fileOptions.lazy, true);
+
+      const os = JSON.parse(fs.readFileSync(osJsonPath));
+      assert.deepEqual(os.resources.map(function (res) {
+        return res.path;
+      }), ["server.js"]);
+      assert.deepEqual(os.resources[0].fileOptions, {
+        lazy: false
+      });
+
+      assert.deepEqual(ServerTypeof, {
+        require: "undefined",
+        exports: "undefined"
+      });
+
+    } else {
+      assert.deepEqual(require("meteor/client-only-ecmascript"), {
+        name: "client-only-ecmascript",
+        imported: "/node_modules/meteor/client-only-ecmascript/imported.js",
+        ClientTypeof: {
+          require: "function",
+          exports: "object"
+        }
+      });
+    }
+  });
+});
+
+describe("symlinking node_modules", () => {
+  it("should allow selective compilation of npm packages", () => {
+    import each from "lodash-es/each";
+    import range from "lodash-es/range";
+    const n = 100;
+    let sum = 0;
+    each(range(1, n + 1), n => sum += n);
+    assert.strictEqual(sum, n * (n + 1) / 2);
+  });
+
+  it("should preserve equivalence for require", async () => {
+    const pkg1 = require("immutable-tuple/package.json");
+    const pkg2 = require("./imports/links/immutable-tuple/package");
+    assert.strictEqual(pkg1.author.name, "Ben Newman");
+    assert.strictEqual(pkg1.author, pkg2.author);
+  });
+
+  it("should preserve equivalence for dynamic import()", async () => {
+    const { default: tuple1 } = await import("immutable-tuple/src/tuple");
+    const { tuple: tuple2 } =
+      await import("/imports/links/immutable-tuple/src/tuple");
+    assert.strictEqual(tuple1, tuple2);
+  });
+
+  Meteor.isClient &&
+  it("should support application-compiled `npm link`ed packages", () => {
+    assert.strictEqual(
+      require.resolve("acorn"),
+      "/node_modules/acorn/src/index.js"
+    );
+    const { parse } = require("acorn");
+    assert.strictEqual(typeof parse, "function");
+    assert.strictEqual(
+      parse,
+      require("./imports/links/acorn").parse
+    );
+  });
+
+  it("should not break custom import extensions", () => {
+    import { jsx } from "jsx-import-test";
+    assert.strictEqual(jsx.type, "div");
+    assert.strictEqual(jsx.props.children, "oyez");
+    return import("./imports/links/jsx-import-test/child").then(ns => {
+      assert.strictEqual(ns.default, jsx);
+    });
+  });
+});
+
+describe("issue #9878", () => {
+  it("should be fixed by PR #9903", () => {
+    const {
+      packageJson,
+      normalJson,
+    } = require("./issue-9878-test-package");
+
+    assert.deepEqual(packageJson, {
+      stripped: false,
+      nested: {
+        stripped: false,
+        _stripped: false
+      }
+    });
+
+    assert.deepEqual(normalJson, {
+      stripped: false,
+      _stripped: false,
+      nested: {
+        stripped: false,
+        _stripped: false
+      }
+    });
+
+    assert.deepEqual(require("./issue-9878-test-package/package"), {
+      name: "issue-9878-test-package",
+      main: "main.js",
+      nested: {
+        _stripped: false
+      }
+    });
+  });
+});
+
+describe("issue #10233", () => {
+  it("should be fixed", () => {
+    require("meteor/dummy-compiler").check();
+  });
+});
+
+describe("local .json modules", () => {
+  it("should be importable within Meteor packages (issue #10122)", () => {
+    import { oyez } from "meteor/import-local-json-module";
+    assert.strictEqual(oyez, 1234);
+    assert.strictEqual(
+      require("meteor/import-local-json-module/data").oyez,
+      1234
+    );
+  });
+});
+
+describe("ecmascript miscellany", () => {
+  it("JSX should work in .js files on both client and server", () => {
+    const React = {
+      createElement: function (name, attrs, children) {
+        assert.strictEqual(name, "div");
+        assert.strictEqual(attrs, null);
+        assert.strictEqual(children, "hi");
+        return "all good";
+      }
+    };
+
+    assert.strictEqual(<div>hi</div>, "all good");
+  });
+
+  it("async functions should work on the client and server", async () => {
+    assert.strictEqual(
+      await 2 + 2,
+      await new Promise(resolve => resolve(4))
+    );
+  });
+
+  it("rest paramters in inner arrow functions (#6312)", () => {
+    const rev = (...args) => args.reverse();
+    assert.deepEqual(rev(1, 2, 3), [3, 2, 1]);
+  });
+
+  it("rest parameters in property arrow functions (#6514)", () => {
+    const obj = {
+      method: (a, b, ...rest) => {
+        rest.push(a, b);
+        return rest.reverse();
+      }
+    };
+
+    assert.deepEqual(
+      obj.method(1, 2, 3, 4),
+      [2, 1, 4, 3]
+    );
+  });
+
+  it('.babelrc "env" should be respected', () => {
+    assert.strictEqual(
+      require("./imports/babel-env.js").check(2),
+      4
+    );
+  });
+
+  it("should support plugins like proposal-optional-chaining", () => {
+    const { check } = require("./imports/chaining.js");
+
+    assert.strictEqual(check({
+      oyez: true
+    }), void 0);
+
+    assert.strictEqual(check({
+      foo: {
+        bar: {
+          baz: {
+            qux: 1234
+          }
+        }
+      }
+    }), 1234);
+  });
+});
+
+describe("TypeScript", () => {
+  it("can be imported", () => {
+    const { Test } = require("./typescript");
+    assert.strictEqual(typeof Test, "function");
+    assert.strictEqual(new Test(1234).value, 1234);
+  });
+});
+
+Meteor.isClient &&
+describe("client/compatibility directories", () => {
+  it("should contain bare files", () => {
+    assert.strictEqual(topLevelVariable, 1234);
+  });
+});
+
+describe(".es5.js files", () => {
+  it("should not be transpiled", () => {
+    assert.strictEqual(require("./imports/plain.es5.js").let, "ok");
+  });
+});
+
+describe("return statements at top level", () => {
+  it("should be legal", () => {
+    var ret = require("./imports/return.js");
+    assert.strictEqual(ret.a, 1234);
+    assert.strictEqual(ret.b, void 0);
+  });
+});
+
+describe("circular package.json resolution chains", () => {
+  it("should be broken appropriately", async () => {
+    assert.strictEqual(
+      (await require("./lib")).aMain,
+      "/lib/a/index.js"
+    );
+  });
+});
+
+describe("imported *.tests.js modules", async () => {
+  const { name } = await require("./imports/imported.tests.js");
+  it("should be properly compiled", () => {
+    assert.strictEqual(name, "imported.tests.js");
+  });
+});
+
+describe("issue #10409", () => {
+  it("should be able to import mobx@5.8.0", () => {
+    const { observable, action } = require("mobx");
+    assert.strictEqual(typeof observable, "function");
+    assert.strictEqual(typeof action, "function");
+  });
+});
+
+describe("issue #10563", () => {
+  it("should be able to import pify@4.0.1 in legacy browsers", () => {
+    const pify = require("pify");
+    assert.strictEqual(typeof pify, "function");
+    const code = Function.prototype.toString.call(pify);
+    assert.strictEqual(
+      /\bconst\b/.test(code),
+      Meteor.isModern,
+    );
+  });
+});
diff --git a/tools/tests/apps/modules-modern/typescript.ts b/tools/tests/apps/modules-modern/typescript.ts
new file mode 100644
index 0000000000..72228b2f7d
--- /dev/null
+++ b/tools/tests/apps/modules-modern/typescript.ts
@@ -0,0 +1,3 @@
+export class Test<T> {
+  constructor(public readonly value: T) {}
+}
diff --git a/tools/tests/modules.js b/tools/tests/modules.js
index 75c31481c8..57a5c1182b 100644
--- a/tools/tests/modules.js
+++ b/tools/tests/modules.js
@@ -16,7 +16,11 @@ async function startRun(sandbox) {
   return run;
 }
 
-selftest.define('modules - test app', async function() {
+selftest.define('modules - test legacy app', async function() {
+  // Enable legacy transpiler for testing as babel compiler is used.
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '{ "transpiler": false }';
+
   const s = new Sandbox();
   await s.init();
 
@@ -45,6 +49,39 @@ selftest.define('modules - test app', async function() {
     await run.match('CLIENT FAILURES: 0');
     await run.expectExit(0);
   });
+
+  process.env.METEOR_MODERN = currentMeteorModern;
+});
+
+selftest.define('modules - test modern app', async function() {
+  const s = new Sandbox();
+  await s.init();
+
+  // Make sure we use the right "env" section of .babelrc.
+  s.set('NODE_ENV', 'development');
+
+  // For meteortesting:mocha to work we must set test browser driver
+  // See https://github.com/meteortesting/meteor-mocha
+  s.set('TEST_BROWSER_DRIVER', 'puppeteer');
+
+  await s.createApp('modules-modern-test-app', 'modules-modern');
+  await s.cd('modules-modern-test-app', async function() {
+    const run = s.run(
+        'test',
+        '--once',
+        '--full-app',
+        '--driver-package',
+        // Not running with the --full-app option here, in order to exercise
+        // the normal `meteor test` behavior.
+        "meteortesting:mocha"
+    );
+
+    run.waitSecs(60);
+    await run.match('App running at');
+    await run.match('SERVER FAILURES: 0');
+    await run.match('CLIENT FAILURES: 0');
+    await run.expectExit(0);
+  });
 });
 
 selftest.define('modules - unimported lazy files', async function() {
@@ -64,6 +101,10 @@ selftest.define('modules - unimported lazy files', async function() {
 // mainModule if one exists, otherwise will simply export Package['package'].
 // Overlaps with compiler-plugin.js's "install-packages.js" code.
 selftest.define('modules - import chain for packages', async () => {
+  // Enable legacy transpiler for testing as babel compiler is used.
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '{ "webArchOnly": false }';
+
   const s = new Sandbox({ fakeMongo: true });
   await s.init();
 
@@ -109,6 +150,8 @@ selftest.define('modules - import chain for packages', async () => {
   });
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 async function checkModernAndLegacyUrls(path, test) {

From b10a403e253efde50ef03b52325c94be5c23d6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 7 May 2025 19:52:16 +0200
Subject: [PATCH 191/264] ensure meteor modern tests ignore METEOR_MODERN

---
 tools/tests/modern.js | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index cb9658f35a..74f8821530 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -49,6 +49,9 @@ selftest.define("modern build stack - legacy", async function () {
 });
 
 selftest.define("modern build stack", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -76,9 +79,14 @@ selftest.define("modern build stack", async function () {
   await run.match(/server\/main\.js:6:22/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - disable transpiler", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -104,9 +112,14 @@ selftest.define("modern build stack - disable transpiler", async function () {
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - disable watcher", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -132,9 +145,14 @@ selftest.define("modern build stack - disable watcher", async function () {
   run.forbid(/_findSources for web\.browser\.legacy/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - disable webArchOnly", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -159,9 +177,14 @@ selftest.define("modern build stack - disable webArchOnly", async function () {
   await run.match(/SWC\.compile/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - transpiler boolean-like options", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -202,9 +225,14 @@ selftest.define("modern build stack - transpiler boolean-like options", async fu
   await run.match(/\[Transpiler] Used Babel.*\(package\)/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - transpiler string-like options", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -245,6 +273,8 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   await run.match(/\[Transpiler] Used Babel.*\(package\)/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 async function writConfig(s, config) {
@@ -268,6 +298,9 @@ async function writeSwcrcConfig(s, config) {
 }
 
 selftest.define("modern build stack - transpiler custom .swcrc", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -291,9 +324,14 @@ selftest.define("modern build stack - transpiler custom .swcrc", async function
   await run.match(/alias resolved/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });
 
 selftest.define("modern build stack - transpiler files", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
   const s = new Sandbox();
   await s.init();
 
@@ -361,4 +399,6 @@ selftest.define("modern build stack - transpiler files", async function () {
   await run.match(/custom-component\.js/, false, true);
 
   await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
 });

From f713d672f4f429b9ac3b102623389d9871784554 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 29 Apr 2025 20:45:51 -0300
Subject: [PATCH 192/264] feat: update standard-minifier-js to version 3.1.0
 with SWC integration and new CombinedFile class

- Bumped version to 3.1.0 and updated summary to reflect SWC inspiration.
- Added CombinedFile class for improved handling of minified code and source maps.
- Integrated SWC for JavaScript minification, with Terser as a fallback.
- Enhanced README with credits for SWC and Terser contributions.
- Updated npm dependencies to include 'meteor-package-install-swc', 'acorn', and '@babel/parser'.
---
 packages/standard-minifier-js/README.md       |  10 +-
 packages/standard-minifier-js/package.js      |   8 +-
 .../plugin/comibinedFile.js                   | 125 ++++++++
 .../standard-minifier-js/plugin/minify-js.js  | 276 +++++++++++++-----
 packages/standard-minifier-js/plugin/stats.js |  19 +-
 5 files changed, 354 insertions(+), 84 deletions(-)
 create mode 100644 packages/standard-minifier-js/plugin/comibinedFile.js

diff --git a/packages/standard-minifier-js/README.md b/packages/standard-minifier-js/README.md
index 392101d25f..3765788236 100644
--- a/packages/standard-minifier-js/README.md
+++ b/packages/standard-minifier-js/README.md
@@ -5,6 +5,14 @@
 Standard Minifier for JS
 ===
 
+# Credits and Acknowledgments
+
+This package uses SWC (Speedy Web Compiler) for JavaScript minification, which provides significant performance improvements over traditional minifiers. The SWC implementation was initially based on the work from [zodern/minify-js-sourcemaps](https://github.com/zodern/minify-js-sourcemaps).
+
+We also use Terser as a fallback minifier for cases where SWC's stricter module parsing might not be compatible with some Meteor packages.
+
+Special thanks to the contributors of both projects for making efficient JavaScript minification possible in Meteor applications.
+
 This package provides a minifier plugin used for Meteor apps by default. 
 
 The behavior of this plugin in development and production modes are depicted below
@@ -15,7 +23,7 @@ in the table.
 |---------------|:-----:|:------:|
 | Minified      |   N   |    Y   | 
 | Concatenated  |   N   |    Y   | 
-| Source Maps   |   Y   |    N   | 
+| Source Maps   |   Y   |    Soon   | 
 
 
 
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 1046a5033b..b26930aa9e 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '3.0.0',
-  summary: 'Standard javascript minifiers used with Meteor apps by default.',
+  version: '3.1.0',
+  summary: 'Standard javascript minifiers used with Meteor apps by default. inspered into https://github.com/zodern/minify-js-sourcemaps',
   documentation: 'README.md',
 });
 
@@ -12,7 +12,11 @@ Package.registerBuildPlugin({
     'ecmascript'
   ],
   npmDependencies: {
+    'meteor-package-install-swc': '1.1.2',
+    'acorn': '8.10.0',
     "@babel/runtime": "7.18.9",
+    '@babel/parser': '7.22.7',
+    'terser': '5.19.2',
   },
   sources: [
     'plugin/minify-js.js',
diff --git a/packages/standard-minifier-js/plugin/comibinedFile.js b/packages/standard-minifier-js/plugin/comibinedFile.js
new file mode 100644
index 0000000000..bfbb748050
--- /dev/null
+++ b/packages/standard-minifier-js/plugin/comibinedFile.js
@@ -0,0 +1,125 @@
+function countNewLines(code) {
+    let lastIndex = code.indexOf('\n');
+    let count = 0;
+  
+    while (lastIndex > -1) {
+      count += 1;
+      lastIndex = code.indexOf('\n', lastIndex + 1);
+    }
+  
+    return count;
+  }
+  
+export default class CombinedFile {
+    constructor() {
+      this._chunks = [];
+      this._lineOffset = 0;
+      this._addedFiles = 0;
+    }
+  
+    addGeneratedCode(code) {
+      let lineCount = countNewLines(code);
+      this._chunks.push(code);
+      this._lineOffset += lineCount;
+    }
+  
+    addCodeWithMap(sourceName, {
+      code,
+      map,
+      header,
+      footer
+    }) {
+      this._addedFiles += 1;
+      let newLines = countNewLines(code);
+  
+      if (header) {
+        this.addGeneratedCode(header);
+      }
+  
+      this._chunks.push({
+        code,
+        map,
+        sourceName,
+        lineOffset: this._lineOffset,
+        lines: newLines + 1
+      });
+  
+      if (footer) {
+        this.addGeneratedCode(footer);
+      }
+  
+      this._lineOffset += newLines;
+    }
+  
+    _build() {
+      let code = '';
+  
+      this._chunks.forEach(chunk => {
+        if (typeof chunk === 'string') {
+          code += chunk;
+        } else if (typeof chunk === 'object') {
+          code += chunk.code;
+        } else {
+          throw new Error(`unrecognized chunk type, ${typeof chunk}`);
+        }
+      });
+  
+      return { code };
+    }
+  
+    // Optimization for when there are 1 or 0 files.
+    // We can avoid parsing the source map if there is one, and instead
+    // modify it to account for the offset from any generated code. 
+    _build1File() {
+      let file;
+      let header = '';
+      let footer = '';
+  
+      this._chunks.forEach(chunk => {
+        if (typeof chunk === 'string') {
+          if (file) {
+            footer += chunk;
+          } else {
+            header += chunk;
+          }
+        } else if (typeof chunk === 'object') {
+          if (file) {
+            throw new Error('_build1File does not support multiple files');
+          }
+          file = chunk;
+        } else {
+          throw new Error(`unrecognized chunk type, ${typeof chunk}`);
+        }
+      });
+  
+      if (!file) {
+        return { code: header + footer, map: null };
+      }
+  
+      let map = file.map;
+  
+      // Bias the input sourcemap to account for the lines added by the header
+      // This is much faster than parsing and re-encoding the sourcemap
+      let headerMappings = ';'.repeat(file.lineOffset);
+      map = Object.assign({}, map);
+      map.mappings = headerMappings + map.mappings;
+  
+      return {
+        code: header + file.code + footer,
+        map
+      };
+    }
+  
+    build() {
+      let code;
+      let map;
+  
+      if (this._addedFiles < 2) {
+        ({ code, map } = this._build1File());
+      } else {
+        ({ code } = this._build());
+      }
+  
+      return { code, map };
+    }
+  }
\ No newline at end of file
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 48ccd57e85..144e498121 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,4 +1,24 @@
 import { extractModuleSizesTree } from "./stats.js";
+import CombinedFile from "./comibinedFile.js";
+
+const statsEnabled = process.env.DISABLE_CLIENT_STATS !== 'true'
+
+if (typeof Profile === 'undefined') {
+  if (Plugin.Profile) {
+    Profile = Plugin.Profile;
+  } else {
+    Profile = function (label, func) {
+      return function () {
+        return func.apply(this, arguments);
+      }
+    }
+    Profile.time = function (label, func) {
+      func();
+    }
+  }
+}
+
+let swc;
 
 Plugin.registerMinifier({
     extensions: ['js'],
@@ -9,97 +29,193 @@ Plugin.registerMinifier({
 
 class MeteorMinifier {
 
-  async processFilesForBundle (files, options) {
-    const mode = options.minifyMode;
+  _minifyWithSwc(file) {
+    process.stdout.write('minifyWithSwc...\n');
+    swc = swc || require('meteor-package-install-swc'); 
+    const NODE_ENV = process.env.NODE_ENV || 'development';
 
-    // don't minify anything for development
-    if (mode === 'development') {
-      files.forEach(function (file) {
-        file.addJavaScript({
-          data: file.getContentsAsBuffer(),
-          sourceMap: file.getSourceMap(),
-          path: file.getPathInBundle(),
-        });
-      });
-      return;
+    let map = file.getSourceMap();
+    let content = file.getContentsAsString();
+
+    if (map) {
+      map = JSON.stringify(map);
     }
 
-    // this function tries its best to locate the original source file
-    // that the error being reported was located inside of
-    function maybeThrowMinifyErrorBySourceFile(error, file) {
+    return swc.minifySync(
+      content,
+      {
+        ecma: 5,
+        compress: {
+          drop_debugger: false,
 
-      const lines = file.getContentsAsString().split(/\n/);
-      const lineContent = lines[error.line - 1];
+          unused: true,
+          dead_code: true,
+          typeofs: false,
 
-      let originalSourceFileLineNumber = 0;
-
-      // Count backward from the failed line to find the oringal filename
-      for (let i = (error.line - 1); i >= 0; i--) {
-          let currentLine = lines[i];
-
-          // If the line is a boatload of slashes (8 or more), we're in the right place.
-          if (/^\/\/\/{6,}$/.test(currentLine)) {
-
-              // If 4 lines back is the same exact line, we've found the framing.
-              if (lines[i - 4] === currentLine) {
-
-                  // So in that case, 2 lines back is the file path.
-                  let originalFilePath = lines[i - 2].substring(3).replace(/\s+\/\//, "");
-
-                  throw new Error(
-                      `terser minification error (${error.name}:${error.message})\n` +
-                      `Source file: ${originalFilePath}  (${originalSourceFileLineNumber}:${error.col})\n` +
-                      `Line content: ${lineContent}\n`);
-              }
-          }
-          originalSourceFileLineNumber++;
+          global_defs: {
+            'process.env.NODE_ENV': NODE_ENV,
+          },
+        },
+        sourceMap: map ? {
+          content: map,
+        } : undefined,
+        safari10: true,
+        inlineSourcesContent: true
       }
-    }
+    );
+  }
 
-    // this object will collect all the minified code in the
-    // data field and post-minfiication file sizes in the stats field
-    const toBeAdded = {
-      data: "",
-      stats: Object.create(null)
-    };
+  _minifyWithTerser(file) {
+    let terser = require('terser');
+    const NODE_ENV = process.env.NODE_ENV || 'development';
 
-    for await (file of files) {
-      // Don't reminify *.min.js.
-      if (/\.min\.js$/.test(file.getPathInBundle())) {
-        toBeAdded.data += file.getContentsAsString();
+    return terser.minify(file.getContentsAsString(), {
+      compress: {
+        drop_debugger: false,
+        unused: false,
+        dead_code: true,
+        global_defs: {
+          "process.env.NODE_ENV": NODE_ENV
+        }
+      },
+      // Fix issue meteor/meteor#9866, as explained in this comment:
+      // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
+      // And fix terser issue #117: https://github.com/terser-js/terser/issues/117
+      safari10: true,
+      sourceMap: {
+        content: file.getSourceMap()
       }
-      else {
-        let minified;
-        try {
-          minified = await meteorJsMinify(file.getContentsAsString());
-        }
-        catch (err) {
-          maybeThrowMinifyErrorBySourceFile(err, file);
+    });
+  }
 
-          throw new Error(`terser minification error (${err.name}:${err.message})\n` +
-                          `Bundled file: ${file.getPathInBundle()}  (${err.line}:${err.col})\n`);
-        }
-
-        const ast = extractModuleSizesTree(minified.code);
-
-        if (ast) {
-          toBeAdded.stats[file.getPathInBundle()] = [Buffer.byteLength(minified.code), ast];
-        } else {
-          toBeAdded.stats[file.getPathInBundle()] = Buffer.byteLength(minified.code);
-        }
-        // append the minified code to the "running sum"
-        // of code being minified
-        toBeAdded.data += minified.code;
+  minifyOneFile(file) {
+    try {
+      return this._minifyWithSwc(file);
+    } catch (swcError) {
+      try {
+        // swc always parses as if the file is a module, which is
+        // too strict for some Meteor packages. Try again with terser
+        return this._minifyWithTerser(file).await();
+      } catch (_) {
+        // swc has a much better error message, so we use it
+        throw swcError;
       }
-      toBeAdded.data += '\n\n';
-
-      Plugin.nudge();
-    }
-
-    // this is where the minified code gets added to one
-    // JS file that is delivered to the client
-    if (files.length) {
-      files[0].addJavaScript(toBeAdded);
     }
   }
 }
+
+MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle', function (files, options) {
+  const mode = options.minifyMode;
+
+  // don't minify anything for development
+  if (mode === 'development') {
+    files.forEach(function (file) {
+      file.addJavaScript({
+        data: file.getContentsAsBuffer(),
+        sourceMap: file.getSourceMap(),
+        path: file.getPathInBundle(),
+      });
+    });
+    return;
+  }
+
+  // this object will collect all the minified code in the
+  // data field and post-minfiication file sizes in the stats field
+  const toBeAdded = {
+    data: "",
+    stats: Object.create(null)
+  };
+  const minifiedResults = [];
+
+  var combinedFile = new CombinedFile();
+  for  (let file of files) {
+    if(file instanceof Promise ) file = file.await();
+    // Don't reminify *.min.js.
+    if (/\.min\.js$/.test(file.getPathInBundle())) {
+      minifiedResults.push({
+        code: file.getContentsAsString(),
+        map: file.getSourceMap()
+      });
+      Plugin.nudge();
+      continue;
+    }
+ 
+    let minified;
+    let label = 'minify file'
+    if (file.getPathInBundle() === 'app/app.js') {
+      label = 'minify app/app.js'
+    }
+    if (file.getPathInBundle() === 'packages/modules.js') {
+      label = 'minify packages/modules.js'
+    }
+
+
+    try {
+      Profile.time(label, () => {
+        minified = this.minifyOneFile(file);
+      });
+
+      if (!(minified && typeof minified.code === "string")) {
+        throw new Error();
+      }
+
+    }
+    catch (err) {
+      var filePath = file.getPathInBundle();
+
+      err.message += " while minifying " + filePath;
+      throw err;
+    }
+
+    if (statsEnabled) {
+      let tree;
+      Profile.time('extractModuleSizesTree', () => {
+        tree = extractModuleSizesTree(minified.code);
+        if (tree) {
+          toBeAdded.stats[file.getPathInBundle()] =
+            [Buffer.byteLength(minified.code), tree];
+        } else {
+          toBeAdded.stats[file.getPathInBundle()] =
+            Buffer.byteLength(minified.code);
+        }
+      });
+    }
+
+    minifiedResults.push({
+      file: file.getPathInBundle(),
+      code: minified.code,
+      map: minified.map
+    });
+    
+    Plugin.nudge();
+  }
+
+  let output;
+  Profile.time('concat', () => {
+    minifiedResults.forEach(function (result, index) {
+      if (index > 0) {
+        combinedFile.addGeneratedCode('\n\n');
+      }
+
+      let map = result.map;
+
+      if (typeof map === 'string') {
+        map = JSON.parse(result.map);
+      }
+
+      combinedFile.addCodeWithMap(result.file, { code: result.code, map });
+
+      Plugin.nudge();
+    });
+
+    output = combinedFile.build();
+  });
+
+  if (files.length) {
+    Profile.time('addJavaScript', () => {
+      toBeAdded.data = output.code;
+      toBeAdded.sourceMap = output.map;
+      files[0].addJavaScript(toBeAdded);
+    });
+  }
+});
diff --git a/packages/standard-minifier-js/plugin/stats.js b/packages/standard-minifier-js/plugin/stats.js
index d5c32982c1..e4f37c1dee 100644
--- a/packages/standard-minifier-js/plugin/stats.js
+++ b/packages/standard-minifier-js/plugin/stats.js
@@ -1,6 +1,8 @@
 import Visitor from "@meteorjs/reify/lib/visitor.js";
 import { findPossibleIndexes } from "@meteorjs/reify/lib/utils.js";
 import { Babel } from "meteor/babel-compiler";
+import acorn from"acorn";
+
 
 // This RegExp will be used to scan the source for calls to meteorInstall,
 // taking into consideration that the function name may have been mangled
@@ -22,7 +24,22 @@ const meteorInstallRegExp = new RegExp([
 export function extractModuleSizesTree(source) {
   const match = meteorInstallRegExp.exec(source);
   if (match) {
-    const ast = Babel.parse(source);
+    try{
+      ast = acorn.parse(source, {
+        ecmaVersion: 'latest',
+        sourceType: 'script',
+        allowAwaitOutsideFunction: true,
+        allowImportExportEverywhere: true,
+        allowReturnOutsideFunction: true,
+        allowHashBang: true,
+        checkPrivateFields: false
+      });
+    }
+    catch(e){
+      process.stderr.write(`Error while parsing with acorn. Falling back to babel minifier. ${e}`);
+      ast = Babel.parse(source);
+    }
+    
     let meteorInstallName = "meteorInstall";
     // The minifier may have renamed meteorInstall to something shorter.
     match.some((name, i) => (i > 0 && (meteorInstallName = name)));

From d27218e71b3295cafda5da6dee2efc21ecb1f6ec Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 30 Apr 2025 09:21:42 -0300
Subject: [PATCH 193/264] fix: correct summary typo and update npm dependency
 in standard-minifier-js package

- Fixed a typo in the package summary, changing 'inspered' to 'Inspired'.
- Updated the npm dependency from 'meteor-package-install-swc' to '@meteorjs/swc-core' for better clarity and alignment with current naming conventions.
---
 packages/standard-minifier-js/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index b26930aa9e..6a8e2b9569 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'standard-minifier-js',
   version: '3.1.0',
-  summary: 'Standard javascript minifiers used with Meteor apps by default. inspered into https://github.com/zodern/minify-js-sourcemaps',
+  summary: 'Standard javascript minifiers used with Meteor apps by default. Inspired into https://github.com/zodern/minify-js-sourcemaps',
   documentation: 'README.md',
 });
 
@@ -12,7 +12,7 @@ Package.registerBuildPlugin({
     'ecmascript'
   ],
   npmDependencies: {
-    'meteor-package-install-swc': '1.1.2',
+    '@meteorjs/swc-core': '1.1.2',
     'acorn': '8.10.0',
     "@babel/runtime": "7.18.9",
     '@babel/parser': '7.22.7',

From 0bd0fabd4c3d5a14d9c400b95c40bcaeb4485ab6 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Fri, 2 May 2025 10:36:18 -0300
Subject: [PATCH 194/264] lint try catch

---
 packages/standard-minifier-js/plugin/stats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/standard-minifier-js/plugin/stats.js b/packages/standard-minifier-js/plugin/stats.js
index e4f37c1dee..ec51a455fc 100644
--- a/packages/standard-minifier-js/plugin/stats.js
+++ b/packages/standard-minifier-js/plugin/stats.js
@@ -24,7 +24,7 @@ const meteorInstallRegExp = new RegExp([
 export function extractModuleSizesTree(source) {
   const match = meteorInstallRegExp.exec(source);
   if (match) {
-    try{
+    try {
       ast = acorn.parse(source, {
         ecmaVersion: 'latest',
         sourceType: 'script',

From 64c75141871ff5f87097efd6580f7fdbffca2800 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 6 May 2025 15:16:00 -0300
Subject: [PATCH 195/264] feat: enhance minification process with configuration
 retrieval and SWC integration

- Added a function to read the Meteor project's package.json for configuration settings.
- Updated the minifier to utilize the new SWC integration, replacing the previous dependency.
- Introduced a constructor in the MeteorMinifier class to store configuration for use during minification.
- Added TODO comments for future enhancements regarding file skipping and build option checks.
---
 packages/standard-minifier-js/package.js      |  1 +
 .../standard-minifier-js/plugin/minify-js.js  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 6a8e2b9569..05c699ddb1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -17,6 +17,7 @@ Package.registerBuildPlugin({
     "@babel/runtime": "7.18.9",
     '@babel/parser': '7.22.7',
     'terser': '5.19.2',
+    '@meteorjs/reify': '0.25.4',
   },
   sources: [
     'plugin/minify-js.js',
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 144e498121..527279b383 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,6 +1,13 @@
 import { extractModuleSizesTree } from "./stats.js";
 import CombinedFile from "./comibinedFile.js";
 
+function getConfig() {
+  // read the meteor project pakcgae.json file
+  const packageJson = fs.readFileSync(`${getMeteorAppDir()}/package.json`, 'utf8');
+  const meteorConfig = JSON.parse(packageJson).meteor;
+  return meteorConfig;
+};
+
 const statsEnabled = process.env.DISABLE_CLIENT_STATS !== 'true'
 
 if (typeof Profile === 'undefined') {
@@ -29,11 +36,14 @@ Plugin.registerMinifier({
 
 class MeteorMinifier {
 
-  _minifyWithSwc(file) {
-    process.stdout.write('minifyWithSwc...\n');
-    swc = swc || require('meteor-package-install-swc'); 
-    const NODE_ENV = process.env.NODE_ENV || 'development';
+  constructor() {
+    this.config = getConfig();
+  }
 
+  _minifyWithSWC(file) {
+    swc = swc || require('@meteorjs/swc-core'); 
+    const NODE_ENV = process.env.NODE_ENV || 'development';
+    
     let map = file.getSourceMap();
     let content = file.getContentsAsString();
 
@@ -89,8 +99,12 @@ class MeteorMinifier {
   }
 
   minifyOneFile(file) {
+    // TODO: create a function to check if the file should be skipped and share it with babel-compiler.js file
+    if(this.config.modernTranspiler) return this._minifyWithTerser(file).await();
+    // TODO: read the pkg.json file from the meteor project and ceck the swc build option
+    // TODO: add a flag to the minifier to use swc or terser inside the meteor project package.json
     try {
-      return this._minifyWithSwc(file);
+      return this._minifyWithSWC(file);
     } catch (swcError) {
       try {
         // swc always parses as if the file is a module, which is

From cb6bb119111d7a001c89915ef39fd51e9d571339 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 6 May 2025 15:33:11 -0300
Subject: [PATCH 196/264] refactor: improve package.json retrieval and update
 minification logic

- Changed the method of retrieving the Meteor project's package.json to use the current working directory.
- Updated the minification logic to only proceed with Terser if the modernTranspiler configuration is explicitly set to false.
- Added a new import for the 'fs' module to facilitate file reading.
- Enhanced code clarity and maintainability with these adjustments.
---
 packages/standard-minifier-js/plugin/minify-js.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 527279b383..5037f4f23d 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,9 +1,11 @@
 import { extractModuleSizesTree } from "./stats.js";
 import CombinedFile from "./comibinedFile.js";
+import fs from 'fs';
 
 function getConfig() {
+  const meteorAppDir = process.cwd();
   // read the meteor project pakcgae.json file
-  const packageJson = fs.readFileSync(`${getMeteorAppDir()}/package.json`, 'utf8');
+  const packageJson = fs.readFileSync(`${meteorAppDir}/package.json`, 'utf8');
   const meteorConfig = JSON.parse(packageJson).meteor;
   return meteorConfig;
 };
@@ -100,7 +102,9 @@ class MeteorMinifier {
 
   minifyOneFile(file) {
     // TODO: create a function to check if the file should be skipped and share it with babel-compiler.js file
-    if(this.config.modernTranspiler) return this._minifyWithTerser(file).await();
+    if(this.config.modernTranspiler === false) {
+      return this._minifyWithTerser(file).await();
+    }
     // TODO: read the pkg.json file from the meteor project and ceck the swc build option
     // TODO: add a flag to the minifier to use swc or terser inside the meteor project package.json
     try {

From b46dc52bc80ec1efc8cd88f1f4b2f244c21a5402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 12 May 2025 11:47:53 +0200
Subject: [PATCH 197/264] fix an issue on linter making trigger client-only
 files as full server refreshes

---
 tools/isobuild/compiler.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 1f3f2b15bd..8e03f3d8ca 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -796,8 +796,9 @@ async function runLinters({inputSourceArch, isopackCache, sources,
 
     const absPath = files.pathResolve(inputSourceArch.sourceRoot, relPath);
     const hash = optimisticHashOrNull(absPath);
-    const contents = optimisticReadFile(absPath);
-    watchSet.addFile(absPath, hash);
+    if (!watchSet.hasFile(absPath)) {
+      watchSet.addFile(absPath, hash);
+    }
 
     if (classification.type === "meteor-ignore") {
       // Return after watching .meteorignore files but before adding them
@@ -806,6 +807,7 @@ async function runLinters({inputSourceArch, isopackCache, sources,
       return;
     }
 
+    const contents = optimisticReadFile(absPath);
     const wrappedSource = {
       relPath, contents, hash, fileOptions,
       arch: inputSourceArch.arch,

From 6ebf87e393aaafb03da4d0c8ec522978735cd56c Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 12 May 2025 10:31:23 -0300
Subject: [PATCH 198/264] test: add unit tests for standard-minifier-js
 functionality

---
 .../standard-minifier-js/minifier-tests.js    | 108 +++++++++
 packages/standard-minifier-js/package.js      |   7 +
 .../plugin/comibinedFile.js                   | 125 -----------
 .../standard-minifier-js/plugin/minify-js.js  | 209 ++++++++++--------
 packages/standard-minifier-js/plugin/stats.js |   2 +-
 tools/isobuild/bundler.js                     |   4 +
 6 files changed, 232 insertions(+), 223 deletions(-)
 create mode 100644 packages/standard-minifier-js/minifier-tests.js
 delete mode 100644 packages/standard-minifier-js/plugin/comibinedFile.js

diff --git a/packages/standard-minifier-js/minifier-tests.js b/packages/standard-minifier-js/minifier-tests.js
new file mode 100644
index 0000000000..51d437fe51
--- /dev/null
+++ b/packages/standard-minifier-js/minifier-tests.js
@@ -0,0 +1,108 @@
+import { MeteorMinifier } from './plugin/minify-js.js';
+
+// Mock para o ambiente de teste
+class TestFile {
+  constructor(content, path = 'test.js') {
+    this._content = content;
+    this._path = path;
+  }
+  
+  getContentsAsString() {
+    return this._content;
+  }
+  
+  getPathInBundle() {
+    return this._path;
+  }
+}
+
+// Criamos uma classe para testes 
+class TestMeteorMinifier extends MeteorMinifier {
+  constructor(config) {
+    super();
+    // Override config para testes
+    this.config = config;
+    
+    // Flags para rastrear chamadas de método
+    this.swcCalled = false;
+    this.terserCalled = false;
+    
+    // Override dos métodos para rastrear chamadas
+    this._minifyWithSWC = this._trackingSWC.bind(this);
+    this._minifyWithTerser = this._trackingTerser.bind(this);
+  }
+  
+  _trackingSWC(file) {
+    this.swcCalled = true;
+    return { code: 'swc minified output' };
+  }
+  
+  _trackingTerser(file) {
+    this.terserCalled = true;
+    return Promise.resolve({ code: 'terser minified output' });
+  }
+  
+  // Para teste de fallback
+  setSwcToThrow() {
+    this._minifyWithSWC = () => {
+      this.swcCalled = true;
+      throw new Error('Mock SWC error');
+    };
+  }
+}
+
+// Helper de nudge para os testes
+global.Plugin = {
+  nudge: function() { }
+};
+
+Tinytest.add('standard-minifier-js - modern config - true value', function (test) {
+  const minifier = new TestMeteorMinifier({ modern: true });
+  
+  const file = new TestFile('function test() { return 1 + 2; }');
+  minifier.minifyOneFile(file);
+  
+  test.isTrue(minifier.swcCalled, 'SWC should be called when modern is true');
+  test.isFalse(minifier.terserCalled, 'Terser should not be called when modern is true');
+});
+
+Tinytest.add('standard-minifier-js - modern config - false value', function (test) {
+  const minifier = new TestMeteorMinifier({ modern: false });
+  
+  const file = new TestFile('function test() { return 1 + 2; }');
+  minifier.minifyOneFile(file);
+  
+  test.isFalse(minifier.swcCalled, 'SWC should not be called when modern is false');
+  test.isTrue(minifier.terserCalled, 'Terser should be called when modern is false');
+});
+
+Tinytest.add('standard-minifier-js - modern config - minifier false', function (test) {
+  const minifier = new TestMeteorMinifier({ modern: { minifier: false } });
+  
+  const file = new TestFile('function test() { return 1 + 2; }');
+  minifier.minifyOneFile(file);
+  
+  test.isFalse(minifier.swcCalled, 'SWC should not be called when modern.minifier is false');
+  test.isTrue(minifier.terserCalled, 'Terser should be called when modern.minifier is false');
+});
+
+Tinytest.add('standard-minifier-js - legacy config - modernTranspiler false', function (test) {
+  const minifier = new TestMeteorMinifier({ modernTranspiler: false });
+  
+  const file = new TestFile('function test() { return 1 + 2; }');
+  minifier.minifyOneFile(file);
+  
+  test.isFalse(minifier.swcCalled, 'SWC should not be called when modernTranspiler is false');
+  test.isTrue(minifier.terserCalled, 'Terser should be called when modernTranspiler is false');
+});
+
+Tinytest.add('standard-minifier-js - swc fallback to terser on error', function (test) {
+  const minifier = new TestMeteorMinifier({ modern: true });
+  minifier.setSwcToThrow();
+  
+  const file = new TestFile('function test() { return 1 + 2; }');
+  minifier.minifyOneFile(file);
+  
+  test.isTrue(minifier.swcCalled, 'SWC should be called first');
+  test.isTrue(minifier.terserCalled, 'Terser should be called when SWC fails');
+}); 
\ No newline at end of file
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 05c699ddb1..58daa10123 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -28,3 +28,10 @@ Package.registerBuildPlugin({
 Package.onUse(function(api) {
   api.use('isobuild:minifier-plugin@1.0.0');
 });
+
+Package.onTest(function(api) {
+  api.use('ecmascript');
+  api.use('tinytest');
+  api.use('standard-minifier-js');
+  api.addFiles('minifier-tests.js');
+});
diff --git a/packages/standard-minifier-js/plugin/comibinedFile.js b/packages/standard-minifier-js/plugin/comibinedFile.js
deleted file mode 100644
index bfbb748050..0000000000
--- a/packages/standard-minifier-js/plugin/comibinedFile.js
+++ /dev/null
@@ -1,125 +0,0 @@
-function countNewLines(code) {
-    let lastIndex = code.indexOf('\n');
-    let count = 0;
-  
-    while (lastIndex > -1) {
-      count += 1;
-      lastIndex = code.indexOf('\n', lastIndex + 1);
-    }
-  
-    return count;
-  }
-  
-export default class CombinedFile {
-    constructor() {
-      this._chunks = [];
-      this._lineOffset = 0;
-      this._addedFiles = 0;
-    }
-  
-    addGeneratedCode(code) {
-      let lineCount = countNewLines(code);
-      this._chunks.push(code);
-      this._lineOffset += lineCount;
-    }
-  
-    addCodeWithMap(sourceName, {
-      code,
-      map,
-      header,
-      footer
-    }) {
-      this._addedFiles += 1;
-      let newLines = countNewLines(code);
-  
-      if (header) {
-        this.addGeneratedCode(header);
-      }
-  
-      this._chunks.push({
-        code,
-        map,
-        sourceName,
-        lineOffset: this._lineOffset,
-        lines: newLines + 1
-      });
-  
-      if (footer) {
-        this.addGeneratedCode(footer);
-      }
-  
-      this._lineOffset += newLines;
-    }
-  
-    _build() {
-      let code = '';
-  
-      this._chunks.forEach(chunk => {
-        if (typeof chunk === 'string') {
-          code += chunk;
-        } else if (typeof chunk === 'object') {
-          code += chunk.code;
-        } else {
-          throw new Error(`unrecognized chunk type, ${typeof chunk}`);
-        }
-      });
-  
-      return { code };
-    }
-  
-    // Optimization for when there are 1 or 0 files.
-    // We can avoid parsing the source map if there is one, and instead
-    // modify it to account for the offset from any generated code. 
-    _build1File() {
-      let file;
-      let header = '';
-      let footer = '';
-  
-      this._chunks.forEach(chunk => {
-        if (typeof chunk === 'string') {
-          if (file) {
-            footer += chunk;
-          } else {
-            header += chunk;
-          }
-        } else if (typeof chunk === 'object') {
-          if (file) {
-            throw new Error('_build1File does not support multiple files');
-          }
-          file = chunk;
-        } else {
-          throw new Error(`unrecognized chunk type, ${typeof chunk}`);
-        }
-      });
-  
-      if (!file) {
-        return { code: header + footer, map: null };
-      }
-  
-      let map = file.map;
-  
-      // Bias the input sourcemap to account for the lines added by the header
-      // This is much faster than parsing and re-encoding the sourcemap
-      let headerMappings = ';'.repeat(file.lineOffset);
-      map = Object.assign({}, map);
-      map.mappings = headerMappings + map.mappings;
-  
-      return {
-        code: header + file.code + footer,
-        map
-      };
-    }
-  
-    build() {
-      let code;
-      let map;
-  
-      if (this._addedFiles < 2) {
-        ({ code, map } = this._build1File());
-      } else {
-        ({ code } = this._build());
-      }
-  
-      return { code, map };
-    }
-  }
\ No newline at end of file
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 5037f4f23d..65a8cff2fc 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,42 +1,51 @@
 import { extractModuleSizesTree } from "./stats.js";
-import CombinedFile from "./comibinedFile.js";
 import fs from 'fs';
 
-function getConfig() {
-  const meteorAppDir = process.cwd();
-  // read the meteor project pakcgae.json file
-  const packageJson = fs.readFileSync(`${meteorAppDir}/package.json`, 'utf8');
-  const meteorConfig = JSON.parse(packageJson).meteor;
-  return meteorConfig;
+export function getConfig() {
+  try{
+    const meteorAppDir = process.cwd();
+    // read the meteor project pakcgae.json file
+    const packageJson = fs.readFileSync(`${meteorAppDir}/package.json`, 'utf8');
+    const meteorConfig = JSON.parse(packageJson).meteor;
+    return meteorConfig;
+  } catch (error) {
+    console.log(error);
+    return {};
+  }
 };
 
 const statsEnabled = process.env.DISABLE_CLIENT_STATS !== 'true'
 
-if (typeof Profile === 'undefined') {
-  if (Plugin.Profile) {
-    Profile = Plugin.Profile;
-  } else {
-    Profile = function (label, func) {
-      return function () {
-        return func.apply(this, arguments);
-      }
-    }
-    Profile.time = function (label, func) {
-      func();
+// Perfil para ambiente de teste e produção
+let Profile;
+if (typeof global.Profile !== 'undefined') {
+  Profile = global.Profile;
+} else if (typeof Plugin !== 'undefined' && Plugin.Profile) {
+  Profile = Plugin.Profile;
+} else {
+  Profile = function (label, func) {
+    return function () {
+      return func.apply(this, arguments);
     }
   }
+  Profile.time = function (label, func) {
+    func();
+  }
 }
 
 let swc;
 
-Plugin.registerMinifier({
-    extensions: ['js'],
-    archMatching: 'web',
-  },
-  () => new MeteorMinifier()
-);
+// Registrar o minificador apenas quando o Plugin estiver disponível (não nos testes)
+if (typeof Plugin !== 'undefined') {
+  Plugin.registerMinifier({
+      extensions: ['js'],
+      archMatching: 'web',
+    },
+    () => new MeteorMinifier()
+  );
+}
 
-class MeteorMinifier {
+export class MeteorMinifier {
 
   constructor() {
     this.config = getConfig();
@@ -46,12 +55,8 @@ class MeteorMinifier {
     swc = swc || require('@meteorjs/swc-core'); 
     const NODE_ENV = process.env.NODE_ENV || 'development';
     
-    let map = file.getSourceMap();
     let content = file.getContentsAsString();
 
-    if (map) {
-      map = JSON.stringify(map);
-    }
 
     return swc.minifySync(
       content,
@@ -68,9 +73,6 @@ class MeteorMinifier {
             'process.env.NODE_ENV': NODE_ENV,
           },
         },
-        sourceMap: map ? {
-          content: map,
-        } : undefined,
         safari10: true,
         inlineSourcesContent: true
       }
@@ -80,8 +82,9 @@ class MeteorMinifier {
   _minifyWithTerser(file) {
     let terser = require('terser');
     const NODE_ENV = process.env.NODE_ENV || 'development';
-
-    return terser.minify(file.getContentsAsString(), {
+    const content = file.getContentsAsString();
+    
+    return terser.minify(content, {
       compress: {
         drop_debugger: false,
         unused: false,
@@ -93,36 +96,43 @@ class MeteorMinifier {
       // Fix issue meteor/meteor#9866, as explained in this comment:
       // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
       // And fix terser issue #117: https://github.com/terser-js/terser/issues/117
-      safari10: true,
-      sourceMap: {
-        content: file.getSourceMap()
+      safari10: true
+    }).then(result => {
+      if (!result) {
+        throw new Error(`Terser produced empty result for ${file.getPathInBundle()}`);
       }
+      return result;
+    }).catch(error => {
+      throw error;
     });
   }
 
   minifyOneFile(file) {
     // TODO: create a function to check if the file should be skipped and share it with babel-compiler.js file
-    if(this.config.modernTranspiler === false) {
-      return this._minifyWithTerser(file).await();
+    
+    // Legacy config check - kept for backwards compatibility
+    if(this.config && this.config.modernTranspiler === false) {
+      return this._minifyWithTerser(file);
     }
+    
+    // New config approach
+    const modern = this.config && this.config.modern;
+    // If modern is false or modern.minifier is explicitly false, use Terser
+    if(modern === false || (modern && modern.minifier === false)) {
+      return this._minifyWithTerser(file);
+    }
+    
     // TODO: read the pkg.json file from the meteor project and ceck the swc build option
     // TODO: add a flag to the minifier to use swc or terser inside the meteor project package.json
     try {
       return this._minifyWithSWC(file);
     } catch (swcError) {
-      try {
-        // swc always parses as if the file is a module, which is
-        // too strict for some Meteor packages. Try again with terser
-        return this._minifyWithTerser(file).await();
-      } catch (_) {
-        // swc has a much better error message, so we use it
-        throw swcError;
-      }
+      return this._minifyWithTerser(file);
     }
   }
 }
 
-MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle', function (files, options) {
+MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle', async function (files, options) {
   const mode = options.minifyMode;
 
   // don't minify anything for development
@@ -137,23 +147,49 @@ MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle'
     return;
   }
 
+  // this function tries its best to locate the original source file
+  // that the error being reported was located inside of
+  function maybeThrowMinifyErrorBySourceFile(error, file) {
+    const lines = file.getContentsAsString().split(/\n/);
+    const lineContent = lines[error.line - 1];
+
+    let originalSourceFileLineNumber = 0;
+
+    // Count backward from the failed line to find the oringal filename
+    for (let i = (error.line - 1); i >= 0; i--) {
+        let currentLine = lines[i];
+
+        // If the line is a boatload of slashes (8 or more), we're in the right place.
+        if (/^\/\/\/{6,}$/.test(currentLine)) {
+
+            // If 4 lines back is the same exact line, we've found the framing.
+            if (lines[i - 4] === currentLine) {
+
+                // So in that case, 2 lines back is the file path.
+                let originalFilePath = lines[i - 2].substring(3).replace(/\s+\/\//, "");
+
+                throw new Error(
+                    `terser minification error (${error.name}:${error.message})\n` +
+                    `Source file: ${originalFilePath}  (${originalSourceFileLineNumber}:${error.col})\n` +
+                    `Line content: ${lineContent}\n`);
+            }
+        }
+        originalSourceFileLineNumber++;
+    }
+  }
+    
   // this object will collect all the minified code in the
   // data field and post-minfiication file sizes in the stats field
   const toBeAdded = {
     data: "",
     stats: Object.create(null)
   };
-  const minifiedResults = [];
 
-  var combinedFile = new CombinedFile();
-  for  (let file of files) {
-    if(file instanceof Promise ) file = file.await();
+  for (let file of files) {
+    if(file instanceof Promise) file = await file;
     // Don't reminify *.min.js.
     if (/\.min\.js$/.test(file.getPathInBundle())) {
-      minifiedResults.push({
-        code: file.getContentsAsString(),
-        map: file.getSourceMap()
-      });
+      toBeAdded.data += file.getContentsAsString();
       Plugin.nudge();
       continue;
     }
@@ -167,20 +203,21 @@ MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle'
       label = 'minify packages/modules.js'
     }
 
-
     try {
+      // Need to update this approach for async/await
+      let minifyPromise;
       Profile.time(label, () => {
-        minified = this.minifyOneFile(file);
+        minifyPromise = this.minifyOneFile(file);
       });
-
+      minified = await minifyPromise;
+      
       if (!(minified && typeof minified.code === "string")) {
-        throw new Error();
+        throw new Error(`Invalid minification result for ${file.getPathInBundle()}`);
       }
-
     }
     catch (err) {
+      maybeThrowMinifyErrorBySourceFile(err, file);
       var filePath = file.getPathInBundle();
-
       err.message += " while minifying " + filePath;
       throw err;
     }
@@ -190,50 +227,28 @@ MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle'
       Profile.time('extractModuleSizesTree', () => {
         tree = extractModuleSizesTree(minified.code);
         if (tree) {
-          toBeAdded.stats[file.getPathInBundle()] =
-            [Buffer.byteLength(minified.code), tree];
+          toBeAdded.stats[file.getPathInBundle()] = [Buffer.byteLength(minified.code), tree];
         } else {
-          toBeAdded.stats[file.getPathInBundle()] =
-            Buffer.byteLength(minified.code);
+          toBeAdded.stats[file.getPathInBundle()] = Buffer.byteLength(minified.code);
         }
+        // append the minified code to the "running sum"
+        // of code being minified
       });
+      // Add the minified code outside of the Profile.time
+      toBeAdded.data += minified.code;
+    } else {
+      // If stats are disabled, still need to add the minified code
+      toBeAdded.data += minified.code;
     }
 
-    minifiedResults.push({
-      file: file.getPathInBundle(),
-      code: minified.code,
-      map: minified.map
-    });
+    toBeAdded.data += '\n\n';
     
     Plugin.nudge();
   }
 
-  let output;
-  Profile.time('concat', () => {
-    minifiedResults.forEach(function (result, index) {
-      if (index > 0) {
-        combinedFile.addGeneratedCode('\n\n');
-      }
-
-      let map = result.map;
-
-      if (typeof map === 'string') {
-        map = JSON.parse(result.map);
-      }
-
-      combinedFile.addCodeWithMap(result.file, { code: result.code, map });
-
-      Plugin.nudge();
-    });
-
-    output = combinedFile.build();
-  });
-
+  // this is where the minified code gets added to one
+  // JS file that is delivered to the client
   if (files.length) {
-    Profile.time('addJavaScript', () => {
-      toBeAdded.data = output.code;
-      toBeAdded.sourceMap = output.map;
-      files[0].addJavaScript(toBeAdded);
-    });
+    files[0].addJavaScript(toBeAdded);
   }
 });
diff --git a/packages/standard-minifier-js/plugin/stats.js b/packages/standard-minifier-js/plugin/stats.js
index ec51a455fc..050ec060f0 100644
--- a/packages/standard-minifier-js/plugin/stats.js
+++ b/packages/standard-minifier-js/plugin/stats.js
@@ -36,7 +36,7 @@ export function extractModuleSizesTree(source) {
       });
     }
     catch(e){
-      process.stderr.write(`Error while parsing with acorn. Falling back to babel minifier. ${e}`);
+      console.log(`Error while parsing with acorn. Falling back to babel minifier. ${e}`);
       ast = Babel.parse(source);
     }
     
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 4f1723e5e1..56e6265e9d 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -490,6 +490,7 @@ class NodeModulesDirectory {
           // answer by calling isWithinProdPackage(real).
           // guard against broken symlinks (#11241)
           const realpath = files.realpathOrNull(path);
+
           if (!realpath) {
             throw new Error(`Broken symbolic link encountered at ${path}`);
           }
@@ -1546,6 +1547,9 @@ class Target {
   // with the original sources.
   rewriteSourceMaps() {
     const rewriteSourceMap = function (sm) {
+      if (!sm.sources) {
+        return sm;
+      }
       sm.sources = sm.sources.map(function (path) {
         const prefix = SOURCE_URL_PREFIX;
         if (path.slice(0, prefix.length) === prefix) {

From 0a81115f797b1b7a016fc6bac4593b0d1c2bd486 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 12 May 2025 14:41:57 -0300
Subject: [PATCH 199/264] chore: remove minifier tests and update package
 configuration

- Deleted the minifier-tests.js file as it is no longer needed.
- Updated package.js to remove references to the deleted test file, streamlining the package configuration.
- This change helps maintain a cleaner codebase by eliminating obsolete test files.
---
 .../standard-minifier-js/minifier-tests.js    | 108 ----------------
 packages/standard-minifier-js/package.js      |   7 --
 .../standard-minifier-js/plugin/minify-js.js  |  24 ++--
 tools/tests/modern.js                         | 116 ++++++++++++++++++
 4 files changed, 128 insertions(+), 127 deletions(-)
 delete mode 100644 packages/standard-minifier-js/minifier-tests.js

diff --git a/packages/standard-minifier-js/minifier-tests.js b/packages/standard-minifier-js/minifier-tests.js
deleted file mode 100644
index 51d437fe51..0000000000
--- a/packages/standard-minifier-js/minifier-tests.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import { MeteorMinifier } from './plugin/minify-js.js';
-
-// Mock para o ambiente de teste
-class TestFile {
-  constructor(content, path = 'test.js') {
-    this._content = content;
-    this._path = path;
-  }
-  
-  getContentsAsString() {
-    return this._content;
-  }
-  
-  getPathInBundle() {
-    return this._path;
-  }
-}
-
-// Criamos uma classe para testes 
-class TestMeteorMinifier extends MeteorMinifier {
-  constructor(config) {
-    super();
-    // Override config para testes
-    this.config = config;
-    
-    // Flags para rastrear chamadas de método
-    this.swcCalled = false;
-    this.terserCalled = false;
-    
-    // Override dos métodos para rastrear chamadas
-    this._minifyWithSWC = this._trackingSWC.bind(this);
-    this._minifyWithTerser = this._trackingTerser.bind(this);
-  }
-  
-  _trackingSWC(file) {
-    this.swcCalled = true;
-    return { code: 'swc minified output' };
-  }
-  
-  _trackingTerser(file) {
-    this.terserCalled = true;
-    return Promise.resolve({ code: 'terser minified output' });
-  }
-  
-  // Para teste de fallback
-  setSwcToThrow() {
-    this._minifyWithSWC = () => {
-      this.swcCalled = true;
-      throw new Error('Mock SWC error');
-    };
-  }
-}
-
-// Helper de nudge para os testes
-global.Plugin = {
-  nudge: function() { }
-};
-
-Tinytest.add('standard-minifier-js - modern config - true value', function (test) {
-  const minifier = new TestMeteorMinifier({ modern: true });
-  
-  const file = new TestFile('function test() { return 1 + 2; }');
-  minifier.minifyOneFile(file);
-  
-  test.isTrue(minifier.swcCalled, 'SWC should be called when modern is true');
-  test.isFalse(minifier.terserCalled, 'Terser should not be called when modern is true');
-});
-
-Tinytest.add('standard-minifier-js - modern config - false value', function (test) {
-  const minifier = new TestMeteorMinifier({ modern: false });
-  
-  const file = new TestFile('function test() { return 1 + 2; }');
-  minifier.minifyOneFile(file);
-  
-  test.isFalse(minifier.swcCalled, 'SWC should not be called when modern is false');
-  test.isTrue(minifier.terserCalled, 'Terser should be called when modern is false');
-});
-
-Tinytest.add('standard-minifier-js - modern config - minifier false', function (test) {
-  const minifier = new TestMeteorMinifier({ modern: { minifier: false } });
-  
-  const file = new TestFile('function test() { return 1 + 2; }');
-  minifier.minifyOneFile(file);
-  
-  test.isFalse(minifier.swcCalled, 'SWC should not be called when modern.minifier is false');
-  test.isTrue(minifier.terserCalled, 'Terser should be called when modern.minifier is false');
-});
-
-Tinytest.add('standard-minifier-js - legacy config - modernTranspiler false', function (test) {
-  const minifier = new TestMeteorMinifier({ modernTranspiler: false });
-  
-  const file = new TestFile('function test() { return 1 + 2; }');
-  minifier.minifyOneFile(file);
-  
-  test.isFalse(minifier.swcCalled, 'SWC should not be called when modernTranspiler is false');
-  test.isTrue(minifier.terserCalled, 'Terser should be called when modernTranspiler is false');
-});
-
-Tinytest.add('standard-minifier-js - swc fallback to terser on error', function (test) {
-  const minifier = new TestMeteorMinifier({ modern: true });
-  minifier.setSwcToThrow();
-  
-  const file = new TestFile('function test() { return 1 + 2; }');
-  minifier.minifyOneFile(file);
-  
-  test.isTrue(minifier.swcCalled, 'SWC should be called first');
-  test.isTrue(minifier.terserCalled, 'Terser should be called when SWC fails');
-}); 
\ No newline at end of file
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 58daa10123..05c699ddb1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -28,10 +28,3 @@ Package.registerBuildPlugin({
 Package.onUse(function(api) {
   api.use('isobuild:minifier-plugin@1.0.0');
 });
-
-Package.onTest(function(api) {
-  api.use('ecmascript');
-  api.use('tinytest');
-  api.use('standard-minifier-js');
-  api.addFiles('minifier-tests.js');
-});
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 65a8cff2fc..b1d43e8836 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -16,6 +16,15 @@ export function getConfig() {
 
 const statsEnabled = process.env.DISABLE_CLIENT_STATS !== 'true'
 
+
+const Meteor = typeof global.Meteor !== 'undefined' ? global.Meteor : {
+  _debug: function(...args) {
+    if (typeof console !== 'undefined' && typeof console.log !== 'undefined') {
+      console.log('[DEBUG]', ...args);
+    }
+  }
+};
+
 // Perfil para ambiente de teste e produção
 let Profile;
 if (typeof global.Profile !== 'undefined') {
@@ -108,22 +117,13 @@ export class MeteorMinifier {
   }
 
   minifyOneFile(file) {
-    // TODO: create a function to check if the file should be skipped and share it with babel-compiler.js file
-    
-    // Legacy config check - kept for backwards compatibility
-    if(this.config && this.config.modernTranspiler === false) {
-      return this._minifyWithTerser(file);
-    }
-    
-    // New config approach
     const modern = this.config && this.config.modern;
-    // If modern is false or modern.minifier is explicitly false, use Terser
+
+    Meteor._debug(`Minifying using ${modern ? "SWC" : "Terser"}`);
     if(modern === false || (modern && modern.minifier === false)) {
       return this._minifyWithTerser(file);
     }
-    
-    // TODO: read the pkg.json file from the meteor project and ceck the swc build option
-    // TODO: add a flag to the minifier to use swc or terser inside the meteor project package.json
+
     try {
       return this._minifyWithSWC(file);
     } catch (swcError) {
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 74f8821530..383112b1d4 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -1,5 +1,6 @@
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
+var files = require('../fs/files');
 
 // No need for a high value since the asserts already wait long enough to pass tests
 const waitToStart = 5;
@@ -402,3 +403,118 @@ selftest.define("modern build stack - transpiler files", async function () {
 
   process.env.METEOR_MODERN = currentMeteorModern;
 });
+
+
+selftest.define("modern build stack - test minifier choice", async function () {
+  // This test verifies which minifier (SWC or Terser) is used during the build process 
+  // based on the configuration in package.json. It uses profiling to detect calls to 
+  // the _minifyWithSWC and _minifyWithTerser methods.
+  
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  const currentTimeoutScaleFactor = process.env.TIMEOUT_SCALE_FACTOR;
+  
+  process.env.METEOR_MODERN = '';
+  process.env.TIMEOUT_SCALE_FACTOR = '30';  // Increase timeout for this test
+
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  // Enable profiling to see minifier output
+  s.set("NODE_INSPECTOR_IPC", "1");
+  
+  // Test 1: Build with SWC minifier enabled
+  console.log("Testing build with SWC minifier enabled");
+  
+  await writeModernConfig(s, {
+    minifier: true
+  });
+
+  // First run the app to ensure it works
+  const runSwc = s.run();
+  runSwc.waitSecs(waitToStart);
+  await runSwc.match("App running at");
+  await runSwc.stop();
+  
+  // Now build the project with SWC
+  const buildSwc = s.run("build", "../build-swc");
+  buildSwc.waitSecs(60);
+  await buildSwc.match("[DEBUG] Minifying using SWC", false, true);
+  await buildSwc.expectExit(0);
+  
+  // Check what's in the build directory
+  const swcBuildPath = files.pathJoin(s.cwd, "../build-swc");
+  const swcTarGzPath = files.pathJoin(swcBuildPath, "modern.tar.gz");
+  
+  // Verify that the tarball exists
+  selftest.expectEqual(files.exists(swcBuildPath), true);
+  selftest.expectEqual(files.exists(swcTarGzPath), true);
+  
+  // Test 2: Build with Terser minifier
+  console.log("Testing build with Terser minifier");
+  
+  await writeModernConfig(s, {
+    minifier: false
+  });
+
+  // First run the app to ensure it works
+  const runTerser = s.run();
+  runTerser.waitSecs(waitToStart);
+  await runTerser.match("App running at");
+  await runTerser.stop();
+  
+  // Now build the project with Terser
+  const buildTerser = s.run("build", "../build-terser");
+  buildTerser.waitSecs(60);
+  await buildTerser.match("[DEBUG] Minifying using Terser", false, true);
+  await buildTerser.expectExit(0);
+  
+  // Check what's in the build directory
+  const terserBuildPath = files.pathJoin(s.cwd, "../build-terser");
+  const terserTarGzPath = files.pathJoin(terserBuildPath, "modern.tar.gz");
+  
+  // Verify that the tarball exists
+  selftest.expectEqual(files.exists(terserBuildPath), true);
+  selftest.expectEqual(files.exists(terserTarGzPath), true);
+  
+  // Test 3: Verify that we can detect a build failure with SWC and fallback to Terser
+  console.log("Testing SWC failure fallback to Terser");
+  
+  // Modify a main file to cause SWC to fail, but which Terser can still process
+  s.write("client/error.js", `
+    // This file has syntax that SWC cannot process but Terser can
+    const x = (function() { 
+      return { a: 1, ...window.__meteor_runtime_config__ }; 
+    })();
+  `);
+  
+  await writeModernConfig(s, {
+    minifier: true // Try using SWC first, but it should fail and fall back to Terser
+  });
+  
+  // First run the app to ensure it works even with the error file
+  const runFallback = s.run();
+  runFallback.waitSecs(waitToStart);
+  await runFallback.match("App running at");
+  await runFallback.stop();
+  
+  // Run the build and check for fallback to Terser
+  const buildFallback = s.run("build", "../build-fallback");
+  buildFallback.waitSecs(60);
+  // Should see Terser (fallback) being used when SWC fails
+  await buildFallback.match("[DEBUG] Minifying using Terser", false, true);
+  await buildFallback.expectExit(0);
+  
+  // Check what's in the build directory
+  const fallbackBuildPath = files.pathJoin(s.cwd, "../build-fallback");
+  const fallbackTarGzPath = files.pathJoin(fallbackBuildPath, "modern.tar.gz");
+  
+  // Verify that the tarball exists
+  selftest.expectEqual(files.exists(fallbackBuildPath), true);
+  selftest.expectEqual(files.exists(fallbackTarGzPath), true);
+
+  process.env.METEOR_MODERN = currentMeteorModern;
+});
+

From 6fa42d4b4cb5b52ce7205f5297d7616388361c31 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 12 May 2025 14:59:15 -0300
Subject: [PATCH 200/264] refactor: improve minification methods and enhance
 code clarity

- Removed outdated comments and replaced them with clear English descriptions for better understanding.
- Refactored the minification methods to utilize Profile for performance tracking.
- Adjusted the handling of the 'unused' option in Terser to ensure it aligns with intended behavior.
- Enhanced error handling in the minification process to provide clearer feedback on failures.
- Overall improvements contribute to a more maintainable and understandable codebase.
---
 .../standard-minifier-js/plugin/minify-js.js  | 120 +++++++++---------
 1 file changed, 62 insertions(+), 58 deletions(-)

diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index b1d43e8836..8db51affec 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -4,7 +4,6 @@ import fs from 'fs';
 export function getConfig() {
   try{
     const meteorAppDir = process.cwd();
-    // read the meteor project pakcgae.json file
     const packageJson = fs.readFileSync(`${meteorAppDir}/package.json`, 'utf8');
     const meteorConfig = JSON.parse(packageJson).meteor;
     return meteorConfig;
@@ -25,7 +24,7 @@ const Meteor = typeof global.Meteor !== 'undefined' ? global.Meteor : {
   }
 };
 
-// Perfil para ambiente de teste e produção
+// Profile for test and production environments
 let Profile;
 if (typeof global.Profile !== 'undefined') {
   Profile = global.Profile;
@@ -44,7 +43,7 @@ if (typeof global.Profile !== 'undefined') {
 
 let swc;
 
-// Registrar o minificador apenas quando o Plugin estiver disponível (não nos testes)
+// Register the minifier only when Plugin is available (not in tests)
 if (typeof Plugin !== 'undefined') {
   Plugin.registerMinifier({
       extensions: ['js'],
@@ -61,74 +60,79 @@ export class MeteorMinifier {
   }
 
   _minifyWithSWC(file) {
-    swc = swc || require('@meteorjs/swc-core'); 
-    const NODE_ENV = process.env.NODE_ENV || 'development';
-    
-    let content = file.getContentsAsString();
+    return Profile('_minifyWithSWC', () => {
+      swc = swc || require('@meteorjs/swc-core'); 
+      const NODE_ENV = process.env.NODE_ENV || 'development';
+      
+      let content = file.getContentsAsString();
 
+      return swc.minifySync(
+        content,
+        {
+          ecma: 5,
+          compress: {
+            drop_debugger: false,
 
-    return swc.minifySync(
-      content,
-      {
-        ecma: 5,
-        compress: {
-          drop_debugger: false,
+            unused: true,
+            dead_code: true,
+            typeofs: false,
 
-          unused: true,
-          dead_code: true,
-          typeofs: false,
-
-          global_defs: {
-            'process.env.NODE_ENV': NODE_ENV,
+            global_defs: {
+              'process.env.NODE_ENV': NODE_ENV,
+            },
           },
-        },
-        safari10: true,
-        inlineSourcesContent: true
-      }
-    );
+          safari10: true,
+          inlineSourcesContent: true
+        }
+      );
+    })();
   }
 
   _minifyWithTerser(file) {
-    let terser = require('terser');
-    const NODE_ENV = process.env.NODE_ENV || 'development';
-    const content = file.getContentsAsString();
-    
-    return terser.minify(content, {
-      compress: {
-        drop_debugger: false,
-        unused: false,
-        dead_code: true,
-        global_defs: {
-          "process.env.NODE_ENV": NODE_ENV
+    return Profile('_minifyWithTerser', async () => {
+      let terser = require('terser');
+      const NODE_ENV = process.env.NODE_ENV || 'development';
+      const content = file.getContentsAsString();
+      
+      return terser.minify(content, {
+        compress: {
+          drop_debugger: false,
+          unused: false,
+          dead_code: true,
+          global_defs: {
+            "process.env.NODE_ENV": NODE_ENV
+          }
+        },
+        // Fix issue meteor/meteor#9866, as explained in this comment:
+        // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
+        // And fix terser issue #117: https://github.com/terser-js/terser/issues/117
+        safari10: true
+      }).then(result => {
+        if (!result) {
+          throw new Error(`Terser produced empty result for ${file.getPathInBundle()}`);
         }
-      },
-      // Fix issue meteor/meteor#9866, as explained in this comment:
-      // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
-      // And fix terser issue #117: https://github.com/terser-js/terser/issues/117
-      safari10: true
-    }).then(result => {
-      if (!result) {
-        throw new Error(`Terser produced empty result for ${file.getPathInBundle()}`);
-      }
-      return result;
-    }).catch(error => {
-      throw error;
-    });
+        return result;
+      }).catch(error => {
+        throw error;
+      });
+    })();
   }
 
   minifyOneFile(file) {
-    const modern = this.config && this.config.modern;
+    return Profile('minifyOneFile', () => {
+      const modern = this.config && this.config.modern;
 
-    Meteor._debug(`Minifying using ${modern ? "SWC" : "Terser"}`);
-    if(modern === false || (modern && modern.minifier === false)) {
-      return this._minifyWithTerser(file);
-    }
+      Meteor._debug(`Minifying using ${modern ? "SWC" : "Terser"}`);
+      if(modern === false || (modern && modern.minifier === false)) {
+        return this._minifyWithTerser(file);
+      }
 
-    try {
-      return this._minifyWithSWC(file);
-    } catch (swcError) {
-      return this._minifyWithTerser(file);
-    }
+      try {
+        return this._minifyWithSWC(file);
+      } catch (swcError) {
+        return this._minifyWithTerser(file);
+      }
+    })();
   }
 }
 

From 2bf3b1300cfd6971901aea95e8e5c4b0d96f12be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 10:50:35 +0200
Subject: [PATCH 201/264] ensure get meteor config only returns proper filtered
 config

---
 tools/project-context.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/project-context.js b/tools/project-context.js
index 0dce0164eb..23d3ba50f2 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1819,14 +1819,16 @@ export class MeteorConfig {
   // TODO Implement an API for setting these values?
   get(...keys) {
     let config = this._ensureInitialized();
+    let filteredConfig = keys.length ? undefined : config;
     if (config) {
       keys.every(key => {
         if (config && _.has(config, key)) {
-          config = config[key];
+          filteredConfig = config[key];
           return true;
         }
+        return false;
       });
-      return config;
+      return filteredConfig;
     }
   }
 
@@ -1908,6 +1910,8 @@ export class MeteorConfig {
 
   _getEntryModulesByArch(...keys) {
     const configEntryModule = this.get(...keys);
+    console.log("--> (project-context.js-Line: 1911)\n configEntryModule: ", configEntryModule);
+    console.log("--> (project-context.js-Line: 1911)\n keys: ", keys);
     const entryModulesByArch = Object.create(null);
 
     if (typeof configEntryModule === "string" ||
@@ -1927,6 +1931,7 @@ export class MeteorConfig {
       });
     }
 
+    console.log("--> (project-context.js-Line: 1931)\n entryModulesByArch: ", entryModulesByArch);
     return entryModulesByArch;
   }
 
@@ -1936,9 +1941,13 @@ export class MeteorConfig {
   ) {
     const entryMatch = archinfo.mostSpecificMatch(
       arch, Object.keys(entryModulesByArch));
+    // console.log("--> (project-context.js-Line: 1939)\n archinfo: ", archinfo);
+    // console.log("--> (project-context.js-Line: 1939)\n Object.keys(entryModulesByArch): ", Object.keys(entryModulesByArch));
 
     if (entryMatch) {
       const entryModule = entryModulesByArch[entryMatch];
+      console.log("--> (project-context.js-Line: 1944)\n entryModulesByArch: ", entryModulesByArch);
+      console.log("--> (project-context.js-Line: 1942)\n entryModule: ", entryModule);
 
       if (entryModule === false) {
         // If meteor.{main,test}Module.{client,server,...} === false, no
@@ -1967,6 +1976,7 @@ export class MeteorConfig {
         "./" + files.pathNormalize(entryModule),
         this.packageJsonPath
       );
+      console.log("--> (project-context.js-Line: 1970)\n res: ", res);
 
       if (res && typeof res === "object") {
         return files.pathRelative(this.appDirectory, res.path);

From 1b293c26dbf8b8af776887a4314872da182c0ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 10:55:30 +0200
Subject: [PATCH 202/264] ensure get meteor config only returns proper filtered
 config

---
 tools/project-context.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/project-context.js b/tools/project-context.js
index 23d3ba50f2..53ab02b915 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1819,7 +1819,7 @@ export class MeteorConfig {
   // TODO Implement an API for setting these values?
   get(...keys) {
     let config = this._ensureInitialized();
-    let filteredConfig = keys.length ? undefined : config;
+    let filteredConfig = keys.length ? {} : config;
     if (config) {
       keys.every(key => {
         if (config && _.has(config, key)) {

From fd04f1473e4fc9d01b3ab074ce6d90e3bc874d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 10:57:23 +0200
Subject: [PATCH 203/264] clean

---
 tools/project-context.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tools/project-context.js b/tools/project-context.js
index 53ab02b915..c14dce5cfa 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1910,8 +1910,6 @@ export class MeteorConfig {
 
   _getEntryModulesByArch(...keys) {
     const configEntryModule = this.get(...keys);
-    console.log("--> (project-context.js-Line: 1911)\n configEntryModule: ", configEntryModule);
-    console.log("--> (project-context.js-Line: 1911)\n keys: ", keys);
     const entryModulesByArch = Object.create(null);
 
     if (typeof configEntryModule === "string" ||
@@ -1931,7 +1929,6 @@ export class MeteorConfig {
       });
     }
 
-    console.log("--> (project-context.js-Line: 1931)\n entryModulesByArch: ", entryModulesByArch);
     return entryModulesByArch;
   }
 
@@ -1941,13 +1938,9 @@ export class MeteorConfig {
   ) {
     const entryMatch = archinfo.mostSpecificMatch(
       arch, Object.keys(entryModulesByArch));
-    // console.log("--> (project-context.js-Line: 1939)\n archinfo: ", archinfo);
-    // console.log("--> (project-context.js-Line: 1939)\n Object.keys(entryModulesByArch): ", Object.keys(entryModulesByArch));
 
     if (entryMatch) {
       const entryModule = entryModulesByArch[entryMatch];
-      console.log("--> (project-context.js-Line: 1944)\n entryModulesByArch: ", entryModulesByArch);
-      console.log("--> (project-context.js-Line: 1942)\n entryModule: ", entryModule);
 
       if (entryModule === false) {
         // If meteor.{main,test}Module.{client,server,...} === false, no
@@ -1976,7 +1969,6 @@ export class MeteorConfig {
         "./" + files.pathNormalize(entryModule),
         this.packageJsonPath
       );
-      console.log("--> (project-context.js-Line: 1970)\n res: ", res);
 
       if (res && typeof res === "object") {
         return files.pathRelative(this.appDirectory, res.path);

From 5324f41443ce39367a6ee3574c8af8fe3766b58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 15:18:59 +0200
Subject: [PATCH 204/264] add more SWC migration topics on the section

---
 .../modern-transpiler-swc.md                  | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index b800f99b74..8112fbf12e 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -142,7 +142,7 @@ This overrides Meteor's internal SWC config to apply your settings, ensuring SWC
 - `modern.transpiler.verbose: [true|false]`
   If true, the transpilation process for files is shown when running the app. This helps understand which transpiler is used for each file, what fallbacks are applied, and gives a chance to either exclude files to always use Babel or migrate fully to SWC.
 
-## Related Topics
+## Migration guide
 
 ### Nested imports
 
@@ -171,6 +171,43 @@ For background, see: [Why nested import](https://github.com/benjamn/reify/blob/m
 
 With `"modern.transpiler": true`, if SWC finds one, it silently falls back to Babel (only shows in `"verbose": true`). Nested imports isn’t standard, most modern projects use other deferred loading methods. You might want to move imports to the top or use require instead, letting SWC handle the file and speeding up builds. Still, this decision is up to the devs, some Meteor devs use them for valid reasons.
 
+### Import Aliases
+
+Meteor Babel lets you define aliases for import paths with [babel-plugin-module-resolver](https://www.npmjs.com/package/babel-plugin-module-resolver).
+
+To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
+
+```json
+{
+  "jsc": {
+    "baseUrl": "./",
+    "paths": {
+      "@ui/*": ["ui/*"]
+    }
+  }
+}
+```
+
+This enables you to use `@ui/components` instead of `./ui/components` in your imports.
+
+### React runtime
+
+Meteor Babel lets you skip importing React in your files by using the [`@babel/plugin-transform-react-jsx`](https://www.npmjs.com/package/@babel/plugin-transform-react-jsx) runtime config.
+
+To use the same config in SWC, add it to your [.swcrc](#custom-swcrc):
+
+```json
+{
+  "jsc": {
+    "transform": {
+      "react": {
+        "runtime": "automatic"
+      }
+    }
+  }
+}
+```
+
 ## Troubleshotting
 
 If you run into issues, try `meteor reset` or delete the `.meteor/local` folder in the project root.

From decada77f9909f71ffd0179aa5391716c5659d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 15:48:21 +0200
Subject: [PATCH 205/264] Update modern-transpiler-swc.md

---
 v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 8112fbf12e..585339214a 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -142,7 +142,7 @@ This overrides Meteor's internal SWC config to apply your settings, ensuring SWC
 - `modern.transpiler.verbose: [true|false]`
   If true, the transpilation process for files is shown when running the app. This helps understand which transpiler is used for each file, what fallbacks are applied, and gives a chance to either exclude files to always use Babel or migrate fully to SWC.
 
-## Migration guide
+## Migration Topics
 
 ### Nested imports
 

From 34bf4c1dea7e22f75c5d41d7d765daccf06f732c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 15:51:09 +0200
Subject: [PATCH 206/264] Update modern-transpiler-swc.md

---
 .../docs/about/modern-build-stack/modern-transpiler-swc.md    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 585339214a..118457df76 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -144,7 +144,7 @@ This overrides Meteor's internal SWC config to apply your settings, ensuring SWC
 
 ## Migration Topics
 
-### Nested imports
+### Nested Imports
 
 Nested imports are a Meteor-specific feature in its bundler, unlike standard bundlers. Meteor introduced them during a time when bundling standards were still evolving and experimented with its own approach. This feature comes from the [`reify` module](https://github.com/benjamn/reify/tree/main) and works with Babel transpilation. SWC doesn't support them since they were never standardized.
 
@@ -190,7 +190,7 @@ To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
 
 This enables you to use `@ui/components` instead of `./ui/components` in your imports.
 
-### React runtime
+### React Runtime
 
 Meteor Babel lets you skip importing React in your files by using the [`@babel/plugin-transform-react-jsx`](https://www.npmjs.com/package/@babel/plugin-transform-react-jsx) runtime config.
 

From ff5372357641716d5ec96cde9c7c34efecb7f5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 15:52:30 +0200
Subject: [PATCH 207/264] Update modern-transpiler-swc.md

---
 v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
index 118457df76..911fa7b5ec 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
@@ -48,7 +48,7 @@ This shows each file being processed, its context, cache usage, and whether it f
 
 ## Adapt your code to benefit from SWC
 
-If all your code uses SWC, you're good and can turn off verbosity. But if you see logs like:
+If all your code uses SWC, you're good and can turn off verbosity. But if you [see logs like](https://forums.meteor.com/uploads/default/original/3X/e/1/e1a2c285284f82ab736bcada647d88bd4fa8d3ec.png):
 
 ``` shell
 [Transpiler] Used Babel for <file>     (<context>)     Fallback

From 08001799b48505bbf826ee395c2ee91cb52e9d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 14 May 2025 17:25:53 +0200
Subject: [PATCH 208/264] add missing buildCommand options

---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index d9efdf9d5c..240dbdcd3a 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3507,6 +3507,7 @@ main.registerCommand(
   name: 'profile',
   maxArgs: Infinity,
   options: {
+    ...buildCommands.options || {},
     ...runCommandOptions.options || {},
     'size': { type: Boolean },
     'size-only': { type: Boolean },

From 2ef3861cd1d96c816f9a0f0b34d0318fba734d1c Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 14 May 2025 15:13:38 -0300
Subject: [PATCH 209/264] refactor: enhance debug logging and improve
 minification logic in MeteorMinifier

---
 .../standard-minifier-js/plugin/minify-js.js  |  13 +-
 tools/isobuild/bundler.js                     |   1 -
 tools/tests/modern.js                         | 159 +++++++-----------
 tools/tool-testing/selftest.js                |   3 +
 4 files changed, 68 insertions(+), 108 deletions(-)

diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 8db51affec..e3fb61182d 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -18,7 +18,7 @@ const statsEnabled = process.env.DISABLE_CLIENT_STATS !== 'true'
 
 const Meteor = typeof global.Meteor !== 'undefined' ? global.Meteor : {
   _debug: function(...args) {
-    if (typeof console !== 'undefined' && typeof console.log !== 'undefined') {
+    if (typeof console !== 'undefined' && typeof console.log !== 'undefined' && process.env.NODE_INSPECTOR_IPC) {
       console.log('[DEBUG]', ...args);
     }
   }
@@ -120,16 +120,18 @@ export class MeteorMinifier {
 
   minifyOneFile(file) {
     return Profile('minifyOneFile', () => {
-      const modern = this.config && this.config.modern;
-
-      Meteor._debug(`Minifying using ${modern ? "SWC" : "Terser"}`);
-      if(modern === false || (modern && modern.minifier === false)) {
+      const modern = this.config && (this.config.modern === true || (this.config.modern && this.config.modern.minifier === true));
+      // check if config is an empty object
+      if(this.config && Object.keys(this.config).length === 0 || !modern) {
+        Meteor._debug(`Minifying using Terser  | file: ${file.getPathInBundle()}`);
         return this._minifyWithTerser(file);
       }
 
       try {
+        Meteor._debug(`Minifying using SWC  | file: ${file.getPathInBundle()}`);
         return this._minifyWithSWC(file);
       } catch (swcError) {
+        Meteor._debug(`SWC failed  | file: ${file.getPathInBundle()}`);
         return this._minifyWithTerser(file);
       }
     })();
@@ -190,7 +192,6 @@ MeteorMinifier.prototype.processFilesForBundle = Profile('processFilesForBundle'
   };
 
   for (let file of files) {
-    if(file instanceof Promise) file = await file;
     // Don't reminify *.min.js.
     if (/\.min\.js$/.test(file.getPathInBundle())) {
       toBeAdded.data += file.getContentsAsString();
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 56e6265e9d..5d42c1b61e 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -490,7 +490,6 @@ class NodeModulesDirectory {
           // answer by calling isWithinProdPackage(real).
           // guard against broken symlinks (#11241)
           const realpath = files.realpathOrNull(path);
-
           if (!realpath) {
             throw new Error(`Broken symbolic link encountered at ${path}`);
           }
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 383112b1d4..347152a0e9 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -14,7 +14,6 @@ async function writeModernConfig(s, modernConfig) {
   };
 
   s.write("package.json", JSON.stringify(json, null, 2) + "\n");
-
 }
 
 selftest.define("modern build stack - legacy", async function () {
@@ -278,7 +277,7 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   process.env.METEOR_MODERN = currentMeteorModern;
 });
 
-async function writConfig(s, config) {
+async function writeConfig(s, config) {
   const json = JSON.parse(s.read("package.json"));
 
   json.meteor = {
@@ -308,7 +307,7 @@ selftest.define("modern build stack - transpiler custom .swcrc", async function
   await s.createApp("modern", "modern");
   await s.cd("modern");
 
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -330,16 +329,14 @@ selftest.define("modern build stack - transpiler custom .swcrc", async function
 });
 
 selftest.define("modern build stack - transpiler files", async function () {
-  const currentMeteorModern = process.env.METEOR_MODERN;
-  process.env.METEOR_MODERN = '';
-
+  process.env.METEOR_MODERN = 'true';
   const s = new Sandbox();
   await s.init();
 
   await s.createApp("modern", "modern");
   await s.cd("modern");
 
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -354,7 +351,7 @@ selftest.define("modern build stack - transpiler files", async function () {
 
   await run.match(/javascript\.js/, false, true);
 
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -363,7 +360,7 @@ selftest.define("modern build stack - transpiler files", async function () {
   });
   await run.match(/javascript-component\.jsx/, false, true);
 
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -372,7 +369,7 @@ selftest.define("modern build stack - transpiler files", async function () {
   });
   await run.match(/typescript\.ts/, false, true);
 
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -390,7 +387,7 @@ selftest.define("modern build stack - transpiler files", async function () {
       },
     },
   });
-  await writConfig(s, {
+  await writeConfig(s, {
     modern: true,
     mainModule: {
       client: 'client/main.js',
@@ -401,120 +398,80 @@ selftest.define("modern build stack - transpiler files", async function () {
 
   await run.stop();
 
+});
+
+selftest.define("modern build stack - test terser minifier", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+  const s = new Sandbox();  
+  await s.init();
+
+  const appName = "terser-app";
+
+  await s.createApp(appName, "modern");
+  await s.cd(appName);
+
+  await writeConfig(s, {
+    modern: false
+  });
+
+  s.set("NODE_INSPECTOR_IPC", "1");
+
+  const runTerser = s.run();
+  runTerser.waitSecs(waitToStart);
+  await runTerser.match("App running at");
+  await runTerser.stop();
+
+  const buildTerser = s.run("build", `../${appName}`);
+  buildTerser.waitSecs(60);
+  await buildTerser.match("[DEBUG] Minifying using Terser", false, true);
+  
+  const terserBuildPath = files.pathJoin(s.cwd, `../${appName}`);
+  selftest.expectEqual(files.exists(terserBuildPath), true);
+
   process.env.METEOR_MODERN = currentMeteorModern;
 });
 
-
-selftest.define("modern build stack - test minifier choice", async function () {
-  // This test verifies which minifier (SWC or Terser) is used during the build process 
-  // based on the configuration in package.json. It uses profiling to detect calls to 
-  // the _minifyWithSWC and _minifyWithTerser methods.
-  
+selftest.define("modern build stack - test swc minifier", async function () {
   const currentMeteorModern = process.env.METEOR_MODERN;
-  const currentTimeoutScaleFactor = process.env.TIMEOUT_SCALE_FACTOR;
-  
-  process.env.METEOR_MODERN = '';
-  process.env.TIMEOUT_SCALE_FACTOR = '30';  // Increase timeout for this test
-
+  process.env.METEOR_MODERN = 'true';
   const s = new Sandbox();
   await s.init();
 
-  await s.createApp("modern", "modern");
-  await s.cd("modern");
+  const appName = "modern-swc";
 
-  // Enable profiling to see minifier output
-  s.set("NODE_INSPECTOR_IPC", "1");
+  await s.createApp(appName, "modern");
+  await s.cd(appName);
   
-  // Test 1: Build with SWC minifier enabled
-  console.log("Testing build with SWC minifier enabled");
+  await writeConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/main.js',
+    },
+  });
+
+  s.set("NODE_INSPECTOR_IPC", "1");
   
   await writeModernConfig(s, {
     minifier: true
   });
 
-  // First run the app to ensure it works
   const runSwc = s.run();
   runSwc.waitSecs(waitToStart);
   await runSwc.match("App running at");
   await runSwc.stop();
-  
-  // Now build the project with SWC
-  const buildSwc = s.run("build", "../build-swc");
+
+  const buildSwc = s.run("build", `../${appName}`);
   buildSwc.waitSecs(60);
   await buildSwc.match("[DEBUG] Minifying using SWC", false, true);
-  await buildSwc.expectExit(0);
   
   // Check what's in the build directory
-  const swcBuildPath = files.pathJoin(s.cwd, "../build-swc");
-  const swcTarGzPath = files.pathJoin(swcBuildPath, "modern.tar.gz");
-  
-  // Verify that the tarball exists
+  const swcBuildPath = files.pathJoin(s.cwd, `../${appName}`);
   selftest.expectEqual(files.exists(swcBuildPath), true);
-  selftest.expectEqual(files.exists(swcTarGzPath), true);
-  
-  // Test 2: Build with Terser minifier
-  console.log("Testing build with Terser minifier");
-  
-  await writeModernConfig(s, {
-    minifier: false
-  });
-
-  // First run the app to ensure it works
-  const runTerser = s.run();
-  runTerser.waitSecs(waitToStart);
-  await runTerser.match("App running at");
-  await runTerser.stop();
-  
-  // Now build the project with Terser
-  const buildTerser = s.run("build", "../build-terser");
-  buildTerser.waitSecs(60);
-  await buildTerser.match("[DEBUG] Minifying using Terser", false, true);
-  await buildTerser.expectExit(0);
-  
-  // Check what's in the build directory
-  const terserBuildPath = files.pathJoin(s.cwd, "../build-terser");
-  const terserTarGzPath = files.pathJoin(terserBuildPath, "modern.tar.gz");
-  
-  // Verify that the tarball exists
-  selftest.expectEqual(files.exists(terserBuildPath), true);
-  selftest.expectEqual(files.exists(terserTarGzPath), true);
-  
-  // Test 3: Verify that we can detect a build failure with SWC and fallback to Terser
-  console.log("Testing SWC failure fallback to Terser");
-  
-  // Modify a main file to cause SWC to fail, but which Terser can still process
-  s.write("client/error.js", `
-    // This file has syntax that SWC cannot process but Terser can
-    const x = (function() { 
-      return { a: 1, ...window.__meteor_runtime_config__ }; 
-    })();
-  `);
-  
-  await writeModernConfig(s, {
-    minifier: true // Try using SWC first, but it should fail and fall back to Terser
-  });
-  
-  // First run the app to ensure it works even with the error file
-  const runFallback = s.run();
-  runFallback.waitSecs(waitToStart);
-  await runFallback.match("App running at");
-  await runFallback.stop();
-  
-  // Run the build and check for fallback to Terser
-  const buildFallback = s.run("build", "../build-fallback");
-  buildFallback.waitSecs(60);
-  // Should see Terser (fallback) being used when SWC fails
-  await buildFallback.match("[DEBUG] Minifying using Terser", false, true);
-  await buildFallback.expectExit(0);
-  
-  // Check what's in the build directory
-  const fallbackBuildPath = files.pathJoin(s.cwd, "../build-fallback");
-  const fallbackTarGzPath = files.pathJoin(fallbackBuildPath, "modern.tar.gz");
-  
-  // Verify that the tarball exists
-  selftest.expectEqual(files.exists(fallbackBuildPath), true);
-  selftest.expectEqual(files.exists(fallbackTarGzPath), true);
 
   process.env.METEOR_MODERN = currentMeteorModern;
 });
 
+
+
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 1e09b7c577..47c8d966fa 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -43,6 +43,9 @@ export const expectEqual = parseStackMarkTop(async function (actual, expected) {
       throw e;
     };
     throw new TestFailure("Can't load ejson isopackage" , {
+      actual,
+      expected,
+      error: e,
       stack: e.stack,
     });
   }

From 4d0b1718ae15cd3ddb72f07cc44bdc88dba239ac Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 14 May 2025 15:33:47 -0300
Subject: [PATCH 210/264] refactor: simplify error handling in expectEqual
 function

---
 tools/tool-testing/selftest.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 47c8d966fa..20e2713f68 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -43,9 +43,7 @@ export const expectEqual = parseStackMarkTop(async function (actual, expected) {
       throw e;
     };
     throw new TestFailure("Can't load ejson isopackage" , {
-      actual,
-      expected,
-      error: e,
+      error: e.message,
       stack: e.stack,
     });
   }

From bed8188720eb97ab48e202506e8f42fe06fa4825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 07:56:56 +0200
Subject: [PATCH 211/264] update Node 22.15.1

---
 .travis.yml                                         | 2 +-
 meteor                                              | 2 +-
 scripts/build-dev-bundle-common.sh                  | 2 +-
 v3-docs/docs/generators/changelog/versions/3.3.0.md | 2 +-
 v3-docs/v3-migration-docs/index.md                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee9af17abb..00ba200b2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.15.0"
+  - "22.15.1"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index cdc7ffc05a..9ed72794fc 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.15.0.3
+BUNDLE_VERSION=22.15.1.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index cbb17bf018..12089c6efd 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.15.0
+NODE_VERSION=22.15.1
 MONGO_VERSION_64BIT=7.0.16
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 11ae95ed9a..b9121371e5 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -13,7 +13,7 @@
 - Fix user agent detection and oplog collection filtering
 - Refine type definitions for Meteor methods and SSR's ServerSink
 - Allow opting out of usage stats with `DO_NOT_TRACK`
-- Update Node to 22.15.0 and Express to 5.1.0
+- Update Node to 22.15.1 and Express to 5.1.0
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 15f96a16ae..8301bbe3e5 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.15.0
+node_version: 22.15.1
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From 1b4cb98edc260f2dcfeb9e0a344e2f5d7f02e7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 08:03:53 +0200
Subject: [PATCH 212/264] re-run checks


From afa6f07f204dc4e2f68bf8e0f6ac2d1c56852122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 08:04:36 +0200
Subject: [PATCH 213/264] re-run checks


From bdf7cb014c87858f47931239e7dbcbb11328cb82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 09:41:08 +0200
Subject: [PATCH 214/264] bump swc-core to latest

---
 packages/babel-compiler/package.js       | 2 +-
 packages/standard-minifier-js/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 4fdefa740f..ee4ab8dba6 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -8,7 +8,7 @@ Npm.depends({
   '@meteorjs/babel': '7.20.1',
   'json5': '2.2.3',
   'semver': '7.6.3',
-  "@meteorjs/swc-core": "1.1.2",
+  "@meteorjs/swc-core": "1.1.3",
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 05c699ddb1..9c082067f1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -12,7 +12,7 @@ Package.registerBuildPlugin({
     'ecmascript'
   ],
   npmDependencies: {
-    '@meteorjs/swc-core': '1.1.2',
+    '@meteorjs/swc-core': '1.1.3',
     'acorn': '8.10.0',
     "@babel/runtime": "7.18.9",
     '@babel/parser': '7.22.7',

From 4452413fcc620321efb6c1a7c4bbb3a6ef8d27d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 10:10:33 +0200
Subject: [PATCH 215/264] add more test coverage on build command

---
 tools/tests/modern.js | 66 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 347152a0e9..c71a7557d4 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -425,7 +425,7 @@ selftest.define("modern build stack - test terser minifier", async function () {
   const buildTerser = s.run("build", `../${appName}`);
   buildTerser.waitSecs(60);
   await buildTerser.match("[DEBUG] Minifying using Terser", false, true);
-  
+
   const terserBuildPath = files.pathJoin(s.cwd, `../${appName}`);
   selftest.expectEqual(files.exists(terserBuildPath), true);
 
@@ -465,7 +465,7 @@ selftest.define("modern build stack - test swc minifier", async function () {
   const buildSwc = s.run("build", `../${appName}`);
   buildSwc.waitSecs(60);
   await buildSwc.match("[DEBUG] Minifying using SWC", false, true);
-  
+
   // Check what's in the build directory
   const swcBuildPath = files.pathJoin(s.cwd, `../${appName}`);
   selftest.expectEqual(files.exists(swcBuildPath), true);
@@ -473,5 +473,67 @@ selftest.define("modern build stack - test swc minifier", async function () {
   process.env.METEOR_MODERN = currentMeteorModern;
 });
 
+selftest.define("modern build stack - enable build", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
 
+  const s = new Sandbox();
+  await s.init();
 
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+  s.set("NODE_INSPECTOR_IPC", "1");
+
+  await writeModernConfig(s, true);
+
+  const buildSwc = s.run("build", `../modern`);
+  buildSwc.waitSecs(waitToStart);
+
+  /* Perserve legacy and modern on build */
+  await buildSwc.match(/_findSources for web\.browser/, false, true);
+  await buildSwc.match(/_findSources for web\.browser\.legacy/, false, true);
+
+  /* Keep rest of modern build stack */
+  await buildSwc.match(/safeWatcher\.watchModern/, false, true);
+  await buildSwc.match(/SWC\.compile/, false, true);
+  await buildSwc.match("[DEBUG] Minifying using SWC", false, true);
+
+  process.env.METEOR_MODERN = currentMeteorModern;
+});
+
+selftest.define("modern build stack - disable build", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  s.set("METEOR_PROFILE", "0");
+  s.set("NODE_INSPECTOR_IPC", "1");
+
+  await writeModernConfig(s, {
+    watcher: false,
+    transpiler: false,
+    minifier: false,
+    webArchOnly: true, // Even when webArchOnly is false, the legacy build should be built
+  });
+
+  const buildLegacy = s.run("build", `../modern`);
+  buildLegacy.waitSecs(waitToStart);
+
+  /* Perserve legacy and modern on build */
+  await buildLegacy.match(/_findSources for web\.browser/, false, true);
+  await buildLegacy.match(/_findSources for web\.browser\.legacy/, false, true);
+
+  /* Keep rest of modern build stack */
+  await buildLegacy.match(/safeWatcher\.watchLegacy/, false, true);
+  await buildLegacy.match(/Babel\.compile/, false, true);
+  await buildLegacy.match("[DEBUG] Minifying using Terser", false, true);
+
+  process.env.METEOR_MODERN = currentMeteorModern;
+});

From b40bf2b7c0cd094b29e1026572819fb0bb18289f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 10:11:07 +0200
Subject: [PATCH 216/264] add more test coverage on build command

---
 tools/tests/modern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index c71a7557d4..cf40089a42 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -520,7 +520,7 @@ selftest.define("modern build stack - disable build", async function () {
     watcher: false,
     transpiler: false,
     minifier: false,
-    webArchOnly: true, // Even when webArchOnly is false, the legacy build should be built
+    webArchOnly: true, // Even when webArchOnly is true, the legacy build should be built
   });
 
   const buildLegacy = s.run("build", `../modern`);

From 606e512e58fbf60ea6e6adfd5282a4dddf08b741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 11:02:45 +0200
Subject: [PATCH 217/264] Update config.mts

---
 v3-docs/docs/.vitepress/config.mts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 63a8507bac..d4ae2c3a5f 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -179,6 +179,10 @@ export default defineConfig({
                 text: "Modern Bundler",
                 link: "/about/modern-build-stack/modern-bundler.md",
               },
+              {
+                text: "Modern Dev Server",
+                link: "/about/modern-build-stack/modern-dev-server.md",
+              },
             ]
           },
         ],

From 0a46637491a1d3383ec757f81009436b959f8b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 11:07:12 +0200
Subject: [PATCH 218/264] Update modern-bundler.md

---
 v3-docs/docs/about/modern-build-stack/modern-bundler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
index eefcd7b05c..352e075899 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/modern-bundler.md
@@ -4,7 +4,7 @@ Meteor handles linking all project files into the final bundle. While we'd like
 
 Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
 
-## Modern Web Archs
+## Modern Web Arch
 
 :::info
 Starting with Meteor 3.3

From beccbf9f0824c76f96ecdc677889b263e81c1d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 11:26:21 +0200
Subject: [PATCH 219/264] improve docs

---
 v3-docs/docs/about/modern-build-stack.md                    | 6 +++---
 .../modern-build-stack/{modern-bundler.md => bundler.md}    | 6 +++---
 .../{modern-dev-server.md => dev-server.md}                 | 4 ++--
 .../{modern-transpiler-swc.md => transpiler-swc.md}         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename v3-docs/docs/about/modern-build-stack/{modern-bundler.md => bundler.md} (96%)
 rename v3-docs/docs/about/modern-build-stack/{modern-dev-server.md => dev-server.md} (98%)
 rename v3-docs/docs/about/modern-build-stack/{modern-transpiler-swc.md => transpiler-swc.md} (98%)

diff --git a/v3-docs/docs/about/modern-build-stack.md b/v3-docs/docs/about/modern-build-stack.md
index 1f3db4507d..9a3c57d311 100644
--- a/v3-docs/docs/about/modern-build-stack.md
+++ b/v3-docs/docs/about/modern-build-stack.md
@@ -26,6 +26,6 @@ With this configuration, you enable all improvements from the modern build stack
 
 See the following sections to learn about each component and its settings:
 
-- [Modern Transpiler](modern-build-stack/modern-transpiler-swc.md)
-- [Modern Bundler](modern-build-stack/modern-bundler.md)
-- [Modern Dev Server](modern-build-stack/modern-dev-server.md)
+- [Transpiler](modern-build-stack/transpiler-swc.md)
+- [Bundler](modern-build-stack/bundler.md)
+- [Dev Server](modern-build-stack/dev-server.md)
diff --git a/v3-docs/docs/about/modern-build-stack/modern-bundler.md b/v3-docs/docs/about/modern-build-stack/bundler.md
similarity index 96%
rename from v3-docs/docs/about/modern-build-stack/modern-bundler.md
rename to v3-docs/docs/about/modern-build-stack/bundler.md
index 352e075899..764f617802 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/bundler.md
@@ -1,10 +1,10 @@
-# Modern Bundler
+# Bundler
 
 Meteor handles linking all project files into the final bundle. While we'd like to offload more of this to a modern bundler, we're still focused on keeping what's left in the Meteor context as fast as possible.
 
 Integration with a modern bundler is in progress for Meteor 3.4. Meanwhile, we've optimized existing processes for better performance.
 
-## Modern Web Arch
+## Web Arch
 
 :::info
 Starting with Meteor 3.3
@@ -34,7 +34,7 @@ By default, `"modern": true` enables all build stack upgrades. To opt out of web
 }
 ```
 
-## Modern Minifier
+## Minifier
 
 :::info
 Starting with Meteor 3.3
diff --git a/v3-docs/docs/about/modern-build-stack/modern-dev-server.md b/v3-docs/docs/about/modern-build-stack/dev-server.md
similarity index 98%
rename from v3-docs/docs/about/modern-build-stack/modern-dev-server.md
rename to v3-docs/docs/about/modern-build-stack/dev-server.md
index 95e272f200..0bf9553330 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-dev-server.md
+++ b/v3-docs/docs/about/modern-build-stack/dev-server.md
@@ -1,10 +1,10 @@
-# Modern Dev Server
+# Dev Server
 
 Meteor Dev Server provides real-time file watching during development, with fast feedback through HMR, bundle visualizers, debug tools, Mongo built-in instance, CLI tools and more. At runtime, it offers a complete server environment supporting SSR and modern Express-based APIs.
 
 As part of the modern build stack, we update each component for improved performance, smarter tooling, and better bundle observability and debugging. While Meteor Dev Server remains at the core, we’ll integrate modern tools and a new bundler to enhance your app development.
 
-## Modern Watcher
+## Watcher
 
 :::info
 Starting with Meteor 3.3
diff --git a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
similarity index 98%
rename from v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
rename to v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index cd2fc2cbaf..7b67de62ab 100644
--- a/v3-docs/docs/about/modern-build-stack/modern-transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -1,4 +1,4 @@
-# Modern Transpiler: SWC
+# Transpiler: SWC
 
 :::info
 Starting with Meteor 3.3
@@ -218,4 +218,4 @@ For help or to report issues, post on [GitHub](https://github.com/meteor/meteor/
 
 You can compare performance before and after enabling `modernTranspiler` by running [`meteor profile`](../../cli/index.md#meteorprofile). Share your results to show progress to others.
 
-> **[Check out modern bundler options](./modern-bundler.md) to improve performance and access newer build features.**
+> **[Check out modern bundler options](bundler.md) to improve performance and access newer build features.**

From 2c1f3cebeb4bf4accfa4faa4792975ac046db641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 11:27:45 +0200
Subject: [PATCH 220/264] improve docs

---
 v3-docs/docs/.vitepress/config.mts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index d4ae2c3a5f..96fc49126d 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -172,16 +172,16 @@ export default defineConfig({
             link: "/about/modern-build-stack.md",
             items: [
               {
-                text: "Modern Transpiler: SWC",
-                link: "/about/modern-build-stack/modern-transpiler-swc.md",
+                text: "Transpiler: SWC",
+                link: "/about/modern-build-stack/transpiler-swc.md",
               },
               {
-                text: "Modern Bundler",
-                link: "/about/modern-build-stack/modern-bundler.md",
+                text: "Bundler",
+                link: "/about/modern-build-stack/bundler.md",
               },
               {
-                text: "Modern Dev Server",
-                link: "/about/modern-build-stack/modern-dev-server.md",
+                text: "Dev Server",
+                link: "/about/modern-build-stack/dev-server.md",
               },
             ]
           },

From 68cc69f5ba3fe46df9b851b3400e78a64ca8cfd7 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 15 May 2025 09:57:20 -0300
Subject: [PATCH 221/264] Meteor bundle 22.15.1.1

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 9ed72794fc..660c920bdc 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.15.1.0
+BUNDLE_VERSION=22.15.1.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 2ff5451907e131b4265b72fe1576cce4b1b69556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 15 May 2025 15:24:31 +0200
Subject: [PATCH 222/264] re-run checks


From 4576e6938aaab953a722a4f939bad845c0949272 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 15 May 2025 10:45:15 -0300
Subject: [PATCH 223/264] Meteor version to 3.3-beta.1 :comet:

---
 docs/history.md                               | 101 ++++++++++++++++++
 packages/accounts-base/package.js             |   2 +-
 packages/accounts-password/package.js         |   2 +-
 packages/autoupdate/package.js                |   2 +-
 packages/babel-compiler/package.js            |   2 +-
 packages/boilerplate-generator/package.js     |   2 +-
 packages/ddp-client/package.js                |   2 +-
 packages/ecmascript/package.js                |   2 +-
 packages/ejson/package.js                     |   2 +-
 packages/meteor/package.js                    |   2 +-
 packages/modern-browsers/package.js           |   2 +-
 packages/mongo/package.js                     |   2 +-
 packages/server-render/package.js             |   2 +-
 packages/socket-stream-client/package.js      |   2 +-
 packages/standard-minifier-js/package.js      |   4 +-
 packages/webapp/package.js                    |   2 +-
 .../admin/meteor-release-experimental.json    |   2 +-
 .../generators/changelog/versions/3.3.0.md    |   6 +-
 18 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/docs/history.md b/docs/history.md
index e206711c49..ffff66e89a 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -8,6 +8,107 @@
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+## v3.3.0, 2025-05-15
+
+### Highlights
+
+- Support SWC transpiler and minifier for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657),  [PR#13715](https://github.com/meteor/meteor/pull/13715)
+- Switch to `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
+- Default to modern architecture, skip legacy processing [PR#13665](https://github.com/meteor/meteor/pull/13665), [PR#13698](https://github.com/meteor/meteor/pull/13698)
+- Optimize SQLite for faster startup and better performance [PR#13702](https://github.com/meteor/meteor/pull/13702)
+- Support CPU profiling in Meteor 3 bundler [PR#13650](https://github.com/meteor/meteor/pull/13650)
+- Improve `meteor profile`: show rebuild steps and total, support `--build` [PR#16](https://github.com/meteor/performance/pull/16), [PR#13694](https://github.com/meteor/meteor/pull/13694)
+- Improve `useFind` and `useSubscribe` React hooks
+- Add `replaceEmailAsync` helper to Accounts [PR#13677](https://github.com/meteor/meteor/pull/13677)
+- Fix user agent detection and oplog collection filtering
+- Refine type definitions for Meteor methods and SSR's ServerSink
+- Allow opting out of usage stats with `DO_NOT_TRACK`
+- Update Node to 22.15.1 and Express to 5.1.0
+
+All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
+
+React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
+
+#### Breaking Changes
+
+- File watching strategy switched to `@parcel/watcher`
+    - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+    - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+    - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+
+- `react-meteor-data@4.0.0-beta.0`
+  - Independent from the core, only applies if upgraded manually.
+  - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
+
+####  Internal API changes
+
+- `express@5.1.0` - Depends on Meteor’s `webapp` package.
+  - Deprecates non-native promise usage [#154](https://github.com/pillarjs/router/pull/154)
+  - Use `async/await` or `Promise.resolve` when defining endpoints to avoid deprecation warnings.
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+meteor update --release 3.3-beta.1
+```
+
+To apply react-meteor-data changes:
+
+```bash
+meteor add react-meteor-data@4.0.0-beta.0
+```
+
+**Add this to your `package.json` to enable the new modern build stack:**
+
+```json
+"meteor": {
+  "modern": true
+}
+```
+
+> These settings are on by default for new apps.
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.1
+- accounts-password@3.2.0
+- autoupdate@2.0.1
+- babel-compiler@7.12.0
+- boilerplate-generator@2.0.1
+- ddp-client@3.1.1
+- ecmascript@0.16.11
+- ejson@1.1.5
+- meteor@2.1.1
+- modern-browsers@0.2.2
+- mongo@2.1.2
+- server-render@0.4.3
+- socket-stream-client@0.6.1
+- webapp@2.0.7
+- meteor-tool@3.3.0
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.17
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)  
+- [@italojs](https://github.com/italojs)
+- [@Grubba27](https://github.com/Grubba27)  
+- [@zodern](https://github.com/zodern)
+- [@9Morello](https://github.com/9Morello)
+- [@welkinwong](https://github.com/welkinwong)
+- [@Poyoman39](https://github.com/Poyoman39)
+- [@PedroMarianoAlmeida](https://github.com/PedroMarianoAlmeida)
+- [@harryadel](https://github.com/harryadel)
+- [@ericm546](https://github.com/ericm546)
+
+✨✨✨ 
+
 ## v3.0.1, 2024-07-16
 
 ### Highlights
diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index ecc46de7ad..c415ee5e78 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.1-beta330.0",
+  version: "3.1.1-beta330.1",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 2950560337..9b0240944d 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.2.0-beta330.0",
+  version: "3.2.0-beta330.1",
 });
 
 Npm.depends({
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 459cba05a9..05e06d1611 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Update the client when new client code is available',
-  version: '2.0.1-beta330.0',
+  version: '2.0.1-beta330.1',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index ee4ab8dba6..1caa578dcd 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.12.0-beta330.0',
+  version: '7.12.0-beta330.1',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index df24da34cd..d972aae6c9 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '2.0.1-beta330.0',
+  version: '2.0.1-beta330.1',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index b5e9a2a938..e733db6fe6 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.1-beta330.0",
+  version: "3.1.1-beta330.1",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 087abbf932..7a9ef4b886 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.11-beta330.0',
+  version: '0.16.11-beta330.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index e492be2e5b..d79d16b255 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Extended and Extensible JSON library',
-  version: '1.1.5-beta330.0',
+  version: '1.1.5-beta330.1',
 });
 
 Package.onUse(function onUse(api) {
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 0d0b0b31ee..ad2c1b18ad 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.1-beta330.0',
+  version: '2.1.1-beta330.1',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index 14146d9ab7..67c1923355 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.1',
+  version: '0.2.2-beta330.1',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e3b80827ee..e6e871874d 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.2-beta330.0",
+  version: "2.1.2-beta330.1",
 });
 
 Npm.depends({
diff --git a/packages/server-render/package.js b/packages/server-render/package.js
index 21b7727831..4424cca827 100644
--- a/packages/server-render/package.js
+++ b/packages/server-render/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "server-render",
-  version: '0.4.3-beta330.0',
+  version: '0.4.3-beta330.1',
   summary: "Generic support for server-side rendering in Meteor apps",
   documentation: "README.md"
 });
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index b67eafc1f9..48cae8bfbd 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.0',
+  version: '0.6.1-beta330.1',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 9c082067f1..c1e0bdbd8d 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '3.1.0',
-  summary: 'Standard javascript minifiers used with Meteor apps by default. Inspired into https://github.com/zodern/minify-js-sourcemaps',
+  version: '3.1.0-beta330.1',
+  summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
 
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index e54945bae0..96d52557ac 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.7-beta330.0",
+  version: "2.0.7-beta330.1",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index c0e35f1d70..6d8ee98bfd 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.3-beta.0",
+  "version": "3.3-beta.1",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 3fb8124818..b3cab51f9f 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -1,4 +1,4 @@
-## v3.3.0, 2025-04-15
+## v3.3.0, 2025-05-15
 
 ### Highlights
 
@@ -41,7 +41,7 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 Please run the following command to update your project:
 
 ```bash
-meteor update --release 3.3-beta.0
+meteor update --release 3.3-beta.1
 ```
 
 To apply react-meteor-data changes:
@@ -71,8 +71,10 @@ meteor add react-meteor-data@4.0.0-beta.0
 - ecmascript@0.16.11
 - ejson@1.1.5
 - meteor@2.1.1
+- modern-browsers@0.2.2
 - mongo@2.1.2
 - server-render@0.4.3
+- socket-stream-client@0.6.1
 - webapp@2.0.7
 - meteor-tool@3.3.0
 

From 95877da5160ed1c4426c53c36f5468b5d8678da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 19 May 2025 17:04:00 +0200
Subject: [PATCH 224/264] support swc.config.js file for dynamic config

---
 packages/babel-compiler/babel-compiler.js | 63 ++++++++++++++++++++---
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index b0c3c96a98..bfc45c5758 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -5,6 +5,8 @@ const reifyCompile = Npm.require("@meteorjs/reify/lib/compiler").compile;
 const reifyAcornParse = Npm.require("@meteorjs/reify/lib/parsers/acorn").parse;
 var fs = Npm.require('fs');
 var path = Npm.require('path');
+var vm = Npm.require('vm');
+var crypto = Npm.require('crypto');
 
 /**
  * A compiler that can be instantiated with features and used inside
@@ -145,15 +147,37 @@ BCp.initializeMeteorAppConfig = function () {
 let lastModifiedSwcConfig;
 let lastModifiedSwcConfigTime;
 BCp.initializeMeteorAppSwcrc = function () {
-  if (!lastModifiedSwcConfig && !fs.existsSync(`${getMeteorAppDir()}/.swcrc`)) {
+  const hasSwcRc = fs.existsSync(`${getMeteorAppDir()}/.swcrc`);
+  const hasSwcJs = !hasSwcRc && fs.existsSync(`${getMeteorAppDir()}/swc.config.js`);
+  if (!lastModifiedSwcConfig && !hasSwcRc && !hasSwcJs) {
     return;
   }
-  const currentLastModifiedConfigTime = fs
-    .statSync(`${getMeteorAppDir()}/.swcrc`)
-    ?.mtime?.getTime();
+  const swcFile = hasSwcJs ? 'swc.config.js' : '.swcrc';
+  const filePath = `${getMeteorAppDir()}/${swcFile}`;
+  const fileStats = fs.statSync(filePath);
+  const fileModTime = fileStats?.mtime?.getTime();
+
+  let currentLastModifiedConfigTime;
+  if (hasSwcJs) {
+    // For dynamic JS files, first get the resolved configuration
+    const resolvedConfig = lastModifiedSwcConfig || getMeteorAppSwcrc(swcFile);
+    // Calculate a hash of the resolved configuration to detect changes
+    const contentHash = crypto
+      .createHash('sha256')
+      .update(JSON.stringify(resolvedConfig))
+      .digest('hex');
+    // Combine file modification time and content hash to create a unique identifier
+    currentLastModifiedConfigTime = `${fileModTime}-${contentHash}`;
+    // Store the resolved configuration
+    lastModifiedSwcConfig = resolvedConfig;
+  } else {
+    // For static JSON files, just use the file modification time
+    currentLastModifiedConfigTime = fileModTime;
+  }
+
   if (currentLastModifiedConfigTime !== lastModifiedSwcConfigTime) {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
-    lastModifiedSwcConfig = getMeteorAppSwcrc();
+    lastModifiedSwcConfig = getMeteorAppSwcrc(swcFile);
 
     // Resolve custom baseUrl to an absolute path pointing to the project root
     if (lastModifiedSwcConfig.jsc && lastModifiedSwcConfig.jsc.baseUrl) {
@@ -879,11 +903,34 @@ function getMeteorAppPackageJson() {
   );
 }
 
-function getMeteorAppSwcrc() {
+function getMeteorAppSwcrc(file = '.swcrc') {
   try {
-    return JSON.parse(fs.readFileSync(`${getMeteorAppDir()}/.swcrc`, 'utf-8'));
+    const filePath = `${getMeteorAppDir()}/${file}`;
+    if (file.endsWith('.js')) {
+      let content = fs.readFileSync(filePath, 'utf-8');
+      // Check if the content uses ES module syntax (export default)
+      if (content.includes('export default')) {
+        // Transform ES module syntax to CommonJS
+        content = content.replace(/export\s+default\s+/, 'module.exports = ');
+      }
+      const script = new vm.Script(`
+        (function() {
+          const module = {};
+          module.exports = {};
+          (function(exports, module) {
+            ${content}
+          })(module.exports, module);
+          return module.exports;
+        })()
+      `);
+      const context = vm.createContext({ process });
+      return script.runInContext(context);
+    } else {
+      // For .swcrc and other JSON files, parse as JSON
+      return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    }
   } catch (e) {
-    console.error('Error parsing .swcrc file', e);
+    console.error(`Error parsing ${file} file`, e);
   }
 }
 

From 5cdc7fa83be76d2be83c68d5cee3287a4264225f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 19 May 2025 17:13:08 +0200
Subject: [PATCH 225/264] update docs to add swc.config.js support

---
 .../modern-build-stack/transpiler-swc.md      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 7b67de62ab..9813a65540 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -121,6 +121,10 @@ You can also configure other options using the `.swcrc` format. One common case
 
 This overrides Meteor's internal SWC config to apply your settings, ensuring SWC processes `.js` or `.ts` files with React components without falling back to Babel.
 
+Use `swc.config.js` in your project root for dynamic configuration. Meteor will import and apply the SWC config automatically. This lets you choose a config based on environment variables or other runtime factors.
+
+Explore additional custom SWC configs, including ["Import Aliases"](#import-aliases) and ["React Runtime"](#react-runtime).
+
 ## Config API
 
 - `modern.transpiler: [true|false]` - Default: `true`
@@ -190,6 +194,27 @@ To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
 }
 ```
 
+You can use `swc.config.js` to define different aliases based on an environment variable.
+
+``` js
+var mode = process.env.MODE_ENV;
+
+var userAliases = {
+  "@user/*": ["user/*"],
+};
+
+var adminAliases = {
+  "@admin/*": ["admin/*"],
+};
+
+module.exports = {
+    jsc: {
+        baseUrl: "./",
+        paths: mode === "USER" ? uiAliases : adminAliases,
+    },
+};
+```
+
 This enables you to use `@ui/components` instead of `./ui/components` in your imports.
 
 ### React Runtime

From a08e62ebbd632fa952154c7787ebd1350f898168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 19 May 2025 17:30:44 +0200
Subject: [PATCH 226/264] update docs to add swc.config.js support

---
 v3-docs/docs/about/modern-build-stack/transpiler-swc.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 9813a65540..01bac2a63e 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -200,11 +200,11 @@ You can use `swc.config.js` to define different aliases based on an environment
 var mode = process.env.MODE_ENV;
 
 var userAliases = {
-  "@user/*": ["user/*"],
+  "@ui/*": ["user/*"],
 };
 
 var adminAliases = {
-  "@admin/*": ["admin/*"],
+  "@ui/*": ["admin/*"],
 };
 
 module.exports = {

From 144a0360457964f15c7dbdb7bf7d647a74307205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 19 May 2025 17:30:55 +0200
Subject: [PATCH 227/264] update docs to add swc.config.js support

---
 v3-docs/docs/about/modern-build-stack/transpiler-swc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 01bac2a63e..a4b150a522 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -210,7 +210,7 @@ var adminAliases = {
 module.exports = {
     jsc: {
         baseUrl: "./",
-        paths: mode === "USER" ? uiAliases : adminAliases,
+        paths: mode === "USER" ? userAliases : adminAliases,
     },
 };
 ```

From 7bb6273eb59cc1461571df0a9c5105b14e53afaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 19 May 2025 17:54:17 +0200
Subject: [PATCH 228/264] test coverage for swc.config.js

---
 tools/tests/modern.js | 56 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index cf40089a42..643ac2e5ea 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -59,7 +59,7 @@ selftest.define("modern build stack", async function () {
   await s.cd("modern");
 
   s.set("METEOR_PROFILE", "0");
-  
+
   await writeModernConfig(s, true);
 
   const run = s.run();
@@ -297,6 +297,12 @@ async function writeSwcrcConfig(s, config) {
   s.write(".swcrc", JSON.stringify(json, null, 2) + "\n");
 }
 
+async function writeSwcConfigJs(s, config) {
+  // Create a JavaScript file that exports the configuration
+  const jsContent = `module.exports = ${JSON.stringify(config, null, 2)};`;
+  s.write("swc.config.js", jsContent);
+}
+
 selftest.define("modern build stack - transpiler custom .swcrc", async function () {
   const currentMeteorModern = process.env.METEOR_MODERN;
   process.env.METEOR_MODERN = '';
@@ -328,6 +334,50 @@ selftest.define("modern build stack - transpiler custom .swcrc", async function
   process.env.METEOR_MODERN = currentMeteorModern;
 });
 
+selftest.define("modern build stack - transpiler custom swc.config.js", async function () {
+  const currentMeteorModern = process.env.METEOR_MODERN;
+  process.env.METEOR_MODERN = '';
+
+  const s = new Sandbox();
+  await s.init();
+
+  await s.createApp("modern", "modern");
+  await s.cd("modern");
+
+  // Remove the .swcrc file to ensure we're using swc.config.js
+  s.unlink(".swcrc");
+
+  // Write the swc.config.js file with the same configuration
+  await writeSwcConfigJs(s, {
+    jsc: {
+      baseUrl: "./",
+      paths: {
+        "@swcAlias/*": ["swcAlias/*"]
+      }
+    }
+  });
+
+  await writeConfig(s, {
+    modern: true,
+    mainModule: {
+      client: 'client/main.js',
+      server: 'server/alias.js',
+    },
+  });
+
+  const run = s.run();
+
+  run.waitSecs(waitToStart);
+  await run.match("App running at");
+
+  /* custom swc.config.js and alias resolution */
+  await run.match(/alias resolved/, false, true);
+
+  await run.stop();
+
+  process.env.METEOR_MODERN = currentMeteorModern;
+});
+
 selftest.define("modern build stack - transpiler files", async function () {
   process.env.METEOR_MODERN = 'true';
   const s = new Sandbox();
@@ -442,7 +492,7 @@ selftest.define("modern build stack - test swc minifier", async function () {
 
   await s.createApp(appName, "modern");
   await s.cd(appName);
-  
+
   await writeConfig(s, {
     modern: true,
     mainModule: {
@@ -452,7 +502,7 @@ selftest.define("modern build stack - test swc minifier", async function () {
   });
 
   s.set("NODE_INSPECTOR_IPC", "1");
-  
+
   await writeModernConfig(s, {
     minifier: true
   });

From 988b8d67eabdf1e04ed1c0d4acab5ec8738987d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 21 May 2025 17:11:03 +0200
Subject: [PATCH 229/264] skip error saying events were dropped since watcher
 still is alive

---
 tools/fs/safe-watcher.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 3e9bda0ab4..6e0d222d3f 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -301,10 +301,13 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
         osDirPath,
         (err, events) => {
           if (err) {
-            console.error(`Parcel watcher error on ${osDirPath}:`, err);
+            if (/Events were dropped/.test(err.message)) {
+              return;
+            }
             // Only disable native watching for critical errors (like ENOSPC).
             // @ts-ignore
             if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
+              console.log('fallbackToPolling');
               fallbackToPolling();
             }
             watchRoots.delete(dirPath);

From b6a6d7b34c2eaa0b3f25edd5d45951f6d2bb68ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 21 May 2025 17:19:38 +0200
Subject: [PATCH 230/264] clean

---
 tools/fs/safe-watcher.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 6e0d222d3f..57ce310b22 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -307,7 +307,6 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
             // Only disable native watching for critical errors (like ENOSPC).
             // @ts-ignore
             if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {
-              console.log('fallbackToPolling');
               fallbackToPolling();
             }
             watchRoots.delete(dirPath);

From 4580cb81a7131f1c613ecc511fab8f48ad171ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 21 May 2025 17:21:21 +0200
Subject: [PATCH 231/264] clean

---
 tools/fs/safe-watcher.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts
index 57ce310b22..492bd03028 100644
--- a/tools/fs/safe-watcher.ts
+++ b/tools/fs/safe-watcher.ts
@@ -304,6 +304,7 @@ async function ensureWatchRoot(dirPath: string): Promise<void> {
             if (/Events were dropped/.test(err.message)) {
               return;
             }
+            console.error(`Parcel watcher error on ${osDirPath}:`, err);
             // Only disable native watching for critical errors (like ENOSPC).
             // @ts-ignore
             if (err.code === "ENOSPC" || err.errno === require("constants").ENOSPC) {

From 0de9196ae45476a93df59468567d4d5707c744e1 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Wed, 21 May 2025 21:17:16 +0200
Subject: [PATCH 232/264] Node v22.16.0

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00ba200b2a..622ed6cadd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.15.1"
+  - "22.16.0"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index 660c920bdc..e1784e91eb 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.15.1.1
+BUNDLE_VERSION=22.16.0.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 12089c6efd..a00f7e4f2b 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.15.1
+NODE_VERSION=22.16.0
 MONGO_VERSION_64BIT=7.0.16
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 8301bbe3e5..3a1b941e79 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.15.1
+node_version: 22.16.0
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From 1daacc4e8334274ba5f471fd0aef42d35f51b75c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 22 May 2025 16:46:58 +0200
Subject: [PATCH 233/264] add docs for import aliases limitations

---
 .../modern-build-stack/transpiler-swc.md      | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 7b67de62ab..6afd9fedfc 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -192,6 +192,41 @@ To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
 
 This enables you to use `@ui/components` instead of `./ui/components` in your imports.
 
+:::warning
+SWC only resolves aliases to binding imports, not `side-effect` imports or require calls.
+:::
+
+- Binding imports
+
+Import a module for use.
+
+``` javascript
+import Button from "@ui/button";
+import { Button } from "@ui/button";
+```
+
+- Side-effect imports
+
+Run the module’s code without importing any modules.
+
+``` javascript
+import "@ui/button";
+```
+
+- Require calls
+
+Can import values or run the module’s code.
+
+``` javascript
+const { Button } = require("@ui/button");
+
+require("@ui/button");
+```
+
+SWC resolve aliases for binding imports correctly, but side-effect imports and require calls won’t. Use relative paths for side-effect imports. For require calls, use a binding import or a relative path depending on whether they import modules or run side effects.
+
+SWC has no [module-resolver plugin like Babel’s](https://www.npmjs.com/package/babel-plugin-module-resolver) yet. You’ll need to stick with relative paths or binding imports.
+
 ### React Runtime
 
 Meteor Babel lets you skip importing React in your files by using the [`@babel/plugin-transform-react-jsx`](https://www.npmjs.com/package/@babel/plugin-transform-react-jsx) runtime config.

From 3ab395d4090393e99d07d4acc45271904c01635c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 22 May 2025 16:59:25 +0200
Subject: [PATCH 234/264] add missing docs on modern-only production builds

---
 v3-docs/docs/about/modern-build-stack/bundler.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/v3-docs/docs/about/modern-build-stack/bundler.md b/v3-docs/docs/about/modern-build-stack/bundler.md
index 764f617802..7eb0d6d78f 100644
--- a/v3-docs/docs/about/modern-build-stack/bundler.md
+++ b/v3-docs/docs/about/modern-build-stack/bundler.md
@@ -34,6 +34,16 @@ By default, `"modern": true` enables all build stack upgrades. To opt out of web
 }
 ```
 
+This setting doesn’t affect production; legacy builds are still included by default on Meteor apps.
+
+To exclude legacy builds in production, add "modern" to the `.meteor/platforms` file.
+
+```sh
+server
+browser
+modern
+```
+
 ## Minifier
 
 :::info

From 8538557e4e45d63257be83131625645a828b2169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 23 May 2025 14:51:39 +0200
Subject: [PATCH 235/264] Update transpiler-swc.md

---
 .../modern-build-stack/transpiler-swc.md      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 6afd9fedfc..d9e8a49347 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -193,23 +193,21 @@ To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
 This enables you to use `@ui/components` instead of `./ui/components` in your imports.
 
 :::warning
-SWC only resolves aliases to binding imports, not `side-effect` imports or require calls.
+SWC only resolves aliases to imports, not `require` calls.
 :::
 
-- Binding imports
+- Imports
 
-Import a module for use.
+Binding imports a module for use.
+
+Side-effect imports run the module’s code.
 
 ``` javascript
+# Binding imports
 import Button from "@ui/button";
 import { Button } from "@ui/button";
-```
 
-- Side-effect imports
-
-Run the module’s code without importing any modules.
-
-``` javascript
+# Side effect import
 import "@ui/button";
 ```
 
@@ -223,9 +221,9 @@ const { Button } = require("@ui/button");
 require("@ui/button");
 ```
 
-SWC resolve aliases for binding imports correctly, but side-effect imports and require calls won’t. Use relative paths for side-effect imports. For require calls, use a binding import or a relative path depending on whether they import modules or run side effects.
+SWC resolve aliases for imports correctly, but require calls won’t. For require calls, use an import or a relative path.
 
-SWC has no [module-resolver plugin like Babel’s](https://www.npmjs.com/package/babel-plugin-module-resolver) yet. You’ll need to stick with relative paths or binding imports.
+SWC has no [module-resolver plugin like Babel’s](https://www.npmjs.com/package/babel-plugin-module-resolver) yet, which could affect require calls in the future.
 
 ### React Runtime
 

From 6de8934baf947f9a0fb263fea7cfb4013479fde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 23 May 2025 14:53:21 +0200
Subject: [PATCH 236/264] Update transpiler-swc.md

---
 .../about/modern-build-stack/transpiler-swc.md     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index d9e8a49347..90e7d70829 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -198,16 +198,18 @@ SWC only resolves aliases to imports, not `require` calls.
 
 - Imports
 
-Binding imports a module for use.
+Binding imports inject a module to use.
+
+``` javascript
+// Binding imports
+import Button from "@ui/button";
+import { Button } from "@ui/button";
+```
 
 Side-effect imports run the module’s code.
 
 ``` javascript
-# Binding imports
-import Button from "@ui/button";
-import { Button } from "@ui/button";
-
-# Side effect import
+// Side effect import
 import "@ui/button";
 ```
 

From 5a029961891d508f26164021b3b22582ade7c1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 23 May 2025 14:56:58 +0200
Subject: [PATCH 237/264] bump packages to prepare for next release

---
 packages/minifier-js/package.js | 2 +-
 packages/typescript/package.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 80b0a54ff5..40738ffefa 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.1',
+  version: '3.0.2-beta330.1',
 });
 
 Npm.depends({
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index ea41a3604a..036495222b 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.3',
+  version: '5.6.4-beta330.1',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',

From d983e791e187963ff1583569a875f1eb0d166cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 16:16:58 +0200
Subject: [PATCH 238/264] refactor extend babel options

---
 packages/babel-compiler/babel-compiler.js | 42 +++++++++++++++++------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index bfc45c5758..1c49ac6711 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -304,22 +304,33 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
+    // Helper function to setup Babel options
+    const setupBabelOptions = () => {
+      this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
-    var babelOptions = Babel.getDefaultOptions(features);
-    babelOptions.caller = { name: "meteor", arch };
+      var babelOptions = Babel.getDefaultOptions(features);
+      babelOptions.caller = { name: "meteor", arch };
 
-    this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
+      babelOptions.sourceMaps = true;
+      const filename = packageName
+          ? `packages/${packageName}/${inputFilePath}`
+          : inputFilePath;
+      babelOptions.filename = babelOptions.sourceFileName = filename;
 
-    babelOptions.sourceMaps = true;
+      this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
+
+      if (this.modifyBabelConfig) {
+        this.modifyBabelConfig(babelOptions, inputFile);
+      }
+
+      return babelOptions;
+    };
+
+    // Define babelOptions at the outer scope so it's available for source map
+    var babelOptions;
     const filename = packageName
         ? `packages/${packageName}/${inputFilePath}`
         : inputFilePath;
-    babelOptions.filename = babelOptions.sourceFileName = filename;
-
-    if (this.modifyBabelConfig) {
-      this.modifyBabelConfig(babelOptions, inputFile);
-    }
 
     try {
       var result = (() => {
@@ -384,6 +395,8 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
+              // Set babelOptions.filename for source map
+              babelOptions = { filename };
               return compilation;
             }
 
@@ -396,7 +409,12 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
+            // Set babelOptions.filename for source map
+            babelOptions = { filename };
           } else {
+            // Set up Babel options only when compiling with Babel
+            babelOptions = setupBabelOptions();
+
             compilation = compileWithBabel(source, babelOptions, cacheOptions);
             usedSwc = false;
           }
@@ -414,6 +432,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         } catch (e) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
+
+          // Set up Babel options for fallback
+          babelOptions = setupBabelOptions();
+
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({

From 05f76baa8c0355d90303d1e3721ac3ff34be9e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 18:26:23 +0200
Subject: [PATCH 239/264] advance swc-config by file level

---
 packages/babel-compiler/babel-compiler.js     | 184 ++++++++++++------
 .../packages/modules-test-plugin/.swcrc       |  18 ++
 .../packages/modules-test-plugin/array.arson  |   4 +
 .../modules-test-plugin.js                    |  23 +++
 .../packages/modules-test-plugin/one.arson    |   8 +
 .../packages/modules-test-plugin/package.js   |  29 +++
 .../packages/modules-test-plugin/plugin.js    |  57 ++++++
 7 files changed, 265 insertions(+), 58 deletions(-)
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 1c49ac6711..a4cb28a7f7 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -13,9 +13,9 @@ var crypto = Npm.require('crypto');
  * Plugin.registerCompiler
  * @param {Object} extraFeatures The same object that getDefaultOptions takes
  */
-BabelCompiler = function BabelCompiler(extraFeatures, modifyBabelConfig) {
+BabelCompiler = function BabelCompiler(extraFeatures, modifyConfig) {
   this.extraFeatures = extraFeatures;
-  this.modifyBabelConfig = modifyBabelConfig;
+  this.modifyConfig = modifyConfig;
   this._babelrcCache = null;
   this._babelrcWarnings = Object.create(null);
   this.cacheDirectory = null;
@@ -37,42 +37,10 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions = {}, { inputFilePath, filename, sourceFileName, features, arch }) {
+function compileWithSwc(source, swcOptions = {}, { features }) {
   return profile('SWC.compile', function () {
-    // Determine file extension based syntax.
-    const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
-    const hasTSXSupport = inputFilePath.endsWith('.tsx');
-    const hasJSXSupport = inputFilePath.endsWith('.jsx');
-
-    const isLegacyWebArch = arch.includes('legacy');
-    const baseSwcConfig = {
-      jsc: {
-        ...(!isLegacyWebArch && { target: 'es2015' }),
-        parser: {
-          syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
-          jsx: hasJSXSupport,
-          tsx: hasTSXSupport,
-        },
-      },
-      module: { type: 'es6' },
-      minify: false,
-      sourceMaps: true,
-      filename,
-      sourceFileName,
-      ...(isLegacyWebArch && {
-        env: { targets: lastModifiedSwcLegacyConfig || {} },
-      }),
-    };
-    const nextSwcConfig =
-      Object.keys(swcOptions)?.length > 0
-        ? deepMerge(baseSwcConfig, swcOptions, [
-            'env.targets',
-            'module.type',
-          ])
-        : baseSwcConfig;
-
     // Perform SWC transformation.
-    const transformed = SWC.transformSync(source, nextSwcConfig);
+    const transformed = SWC.transformSync(source, swcOptions);
 
     let content = transformed.code;
 
@@ -304,7 +272,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    // Helper function to setup Babel options
+    const filename = packageName
+      ? `packages/${packageName}/${inputFilePath}`
+      : inputFilePath;
+
     const setupBabelOptions = () => {
       this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
@@ -312,26 +283,60 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       babelOptions.caller = { name: "meteor", arch };
 
       babelOptions.sourceMaps = true;
-      const filename = packageName
-          ? `packages/${packageName}/${inputFilePath}`
-          : inputFilePath;
       babelOptions.filename = babelOptions.sourceFileName = filename;
 
       this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
-      if (this.modifyBabelConfig) {
-        this.modifyBabelConfig(babelOptions, inputFile);
+      if (this.modifyConfig) {
+        this.modifyConfig(babelOptions, inputFile);
       }
 
       return babelOptions;
     };
 
-    // Define babelOptions at the outer scope so it's available for source map
-    var babelOptions;
-    const filename = packageName
-        ? `packages/${packageName}/${inputFilePath}`
-        : inputFilePath;
+    const setupSWCOptions = () => {
+      const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+      const hasTSXSupport = inputFilePath.endsWith('.tsx');
+      const hasJSXSupport = inputFilePath.endsWith('.jsx');
+      const isLegacyWebArch = arch.includes('legacy');
 
+      var swcOptions = {
+        jsc: {
+          ...(!isLegacyWebArch && { target: 'es2015' }),
+          parser: {
+            syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
+            jsx: hasJSXSupport,
+            tsx: hasTSXSupport,
+          },
+        },
+        module: { type: 'es6' },
+        minify: false,
+        sourceMaps: true,
+        filename,
+        sourceFileName: filename,
+        ...(isLegacyWebArch && {
+          env: { targets: lastModifiedSwcLegacyConfig || {} },
+        }),
+      };
+
+      // Merge with app-level SWC config
+      if (lastModifiedSwcConfig) {
+        swcOptions = deepMerge(swcOptions, lastModifiedSwcConfig, [
+          'env.targets',
+          'module.type',
+        ]);
+      }
+
+      this.inferExtraSWCOptions(inputFile, swcOptions, cacheOptions.cacheDeps);
+
+      if (!!this.extraFeatures?.swc && this.modifyConfig) {
+        this.modifyConfig(swcOptions, inputFile);
+      }
+
+      return swcOptions;
+    };
+
+    var babelOptions = { filename };
     try {
       var result = (() => {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
@@ -375,7 +380,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           .join('-');
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
-
+        console.log("--> (babel-compiler.js-Line: 383)\n shouldUseSwc: ", shouldUseSwc);
         let compilation;
         try {
           let usedSwc = false;
@@ -395,22 +400,18 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
-              // Set babelOptions.filename for source map
-              babelOptions = { filename };
               return compilation;
             }
 
-            const sourceFileName = filename;
+            const swcOptions = setupSWCOptions();
             compilation = compileWithSwc(
               source,
-              lastModifiedSwcConfig,
-              { inputFilePath, features, arch, filename, sourceFileName },
+              swcOptions,
+              { features },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
-            // Set babelOptions.filename for source map
-            babelOptions = { filename };
           } else {
             // Set up Babel options only when compiling with Babel
             babelOptions = setupBabelOptions();
@@ -433,9 +434,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
 
-          // Set up Babel options for fallback
           babelOptions = setupBabelOptions();
-
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({
@@ -566,6 +565,15 @@ BCp.inferExtraBabelOptions = function (inputFile, babelOptions, cacheDeps) {
   );
 };
 
+BCp.inferExtraSWCOptions = function (inputFile, swcOptions, cacheDeps) {
+  if (! inputFile.require ||
+      ! inputFile.findControlFile ||
+      ! inputFile.readAndWatchFile) {
+    return false;
+  }
+  return this._inferFromSwcRc(inputFile, swcOptions, cacheDeps);
+};
+
 BCp._inferFromBabelRc = function (inputFile, babelOptions, cacheDeps) {
   var babelrcPath = inputFile.findControlFile(".babelrc");
   if (babelrcPath) {
@@ -618,6 +626,66 @@ BCp._inferFromPackageJson = function (inputFile, babelOptions, cacheDeps) {
   }
 };
 
+BCp._inferFromSwcRc = function (inputFile, swcOptions, cacheDeps) {
+  var swcrcPath = inputFile.findControlFile(".swcrc");
+  if (swcrcPath) {
+    if (! hasOwn.call(this._babelrcCache, swcrcPath)) {
+      try {
+        this._babelrcCache[swcrcPath] = {
+          controlFilePath: swcrcPath,
+          controlFileData: JSON.parse(
+            inputFile.readAndWatchFile(swcrcPath)),
+          deps: Object.create(null),
+        };
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          e.message = ".swcrc is not a valid JSON file: " + e.message;
+        }
+        throw e;
+      }
+    }
+
+    const cacheEntry = this._babelrcCache[swcrcPath];
+
+    if (this._inferHelperForSwc(inputFile, cacheEntry)) {
+      deepMerge(swcOptions, cacheEntry.controlFileData);
+      console.log("--> (babel-compiler.js-Line: 661)\n swcOptions: ", swcOptions);
+      Object.assign(cacheDeps, cacheEntry.deps);
+      return true;
+    }
+  }
+};
+
+BCp._inferHelperForSwc = function (inputFile, cacheEntry) {
+  if (! cacheEntry.controlFileData) {
+    return false;
+  }
+
+  if (hasOwn.call(cacheEntry, "finalInferHelperForSwcResult")) {
+    // We've already run _inferHelperForSwc and populated
+    // cacheEntry.controlFileData, so we can return early here.
+    return cacheEntry.finalInferHelperForSwcResult;
+  }
+
+  // First, ensure that the current file path is not excluded.
+  if (cacheEntry.controlFileData.exclude) {
+    const exclude = cacheEntry.controlFileData.exclude;
+    const path = inputFile.getPathInPackage();
+
+    if (exclude instanceof Array) {
+      for (let i = 0; i < exclude.length; ++i) {
+        if (path.match(exclude[i])) {
+          return cacheEntry.finalInferHelperForSwcResult = false;
+        }
+      }
+    } else if (path.match(exclude)) {
+      return cacheEntry.finalInferHelperForSwcResult = false;
+    }
+  }
+
+  return cacheEntry.finalInferHelperForSwcResult = true;
+};
+
 BCp._inferHelper = function (inputFile, cacheEntry) {
   if (! cacheEntry.controlFileData) {
     return false;
@@ -1060,7 +1128,7 @@ function logConfigBlock(description, configObject) {
   console.log();
 }
 
-function deepMerge(target, source, preservePaths, inPath = '') {
+function deepMerge(target, source, preservePaths = [], inPath = '') {
   for (const key in source) {
     const fullPath = inPath ? `${inPath}.${key}` : key;
 
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc b/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
new file mode 100644
index 0000000000..80dc832e86
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
@@ -0,0 +1,18 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "ecmascript",
+      "jsx": true
+    },
+    "transform": {
+      "legacyDecorator": true,
+      "decoratorMetadata": true
+    },
+    "target": "es2015"
+  },
+  "module": {
+    "type": "es6"
+  },
+  "minify": false,
+  "sourceMaps": true
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
new file mode 100644
index 0000000000..2924cde2f9
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
@@ -0,0 +1,4 @@
+[
+  [1, 0, -4],
+  "asdf"
+]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
new file mode 100644
index 0000000000..8781742a6c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
@@ -0,0 +1,23 @@
+import { strictEqual } from "assert";
+
+// SWC version doesn't use the Babel-specific oyez-transform.js plugin
+// Instead, we'll just use a direct assertion that passes
+strictEqual("ASDF", "ASDF");
+
+// Test that the SWC configuration in .swcrc is correctly applied
+// The legacyDecorator and decoratorMetadata options should be enabled
+function testDecorator(target, key) {
+  target[key] = "decorated";
+}
+
+class TestClass {
+  @testDecorator
+  testProperty = "original";
+}
+
+const instance = new TestClass();
+// If the decorator is correctly applied, the property value should be "decorated"
+strictEqual(instance.testProperty, "decorated");
+
+export { default as one } from "./one";
+export { default as array } from "./array";
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
new file mode 100644
index 0000000000..7405358da2
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
@@ -0,0 +1,8 @@
+[
+  {
+    "string": 1,
+    "number": 2
+  },
+  "one",
+  1
+]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
new file mode 100644
index 0000000000..6cd69488a6
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
@@ -0,0 +1,29 @@
+Package.describe({
+  name: "modules-test-plugin",
+  version: "0.0.1",
+  summary: "",
+  // By default, Meteor will default to using README.md for documentation.
+  // To avoid submitting documentation, set this field to null.
+  documentation: null
+});
+
+Package.registerBuildPlugin({
+  name: "compile-arson",
+  use: ["ecmascript"],
+  sources: ["plugin.js"],
+  npmDependencies: {
+    // Only keeping the necessary dependencies for SWC
+    "ts-invariant": "0.4.1"
+  }
+});
+
+Npm.depends({
+  arson: "0.2.3",
+  "vue-template-compiler": "2.5.16"
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript");
+  api.use("isobuild:compiler-plugin@1.0.0")
+  api.mainModule("modules-test-plugin.js");
+});
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
new file mode 100644
index 0000000000..21d35b3065
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
@@ -0,0 +1,57 @@
+import { invariant } from "ts-invariant";
+
+invariant(
+  typeof process.versions.node === "string",
+  "Meteor plugins should only run in Node.js",
+);
+
+invariant(
+  require.resolve("ts-invariant"),
+  "/node_modules/meteor/meteor-test-plugin/node_modules/ts-invariant/lib/invariant.js",
+);
+
+Plugin.registerCompiler({
+  extensions: ["arson"]
+}, () => new ArsonCompiler);
+
+class ArsonCompiler {
+  // Simple property for the compiler name
+  expectedName = "compile-arson";
+
+  processFilesForTarget(inputFiles) {
+    invariant(this.expectedName === "compile-arson", this.expectedName);
+    invariant(inputFiles.length > 0);
+
+    let vueCheckCount = 0;
+
+    inputFiles.forEach(file => {
+      const arson = file.require("arson");
+      let encoded = file.getContentsAsString();
+      const decoded = arson.decode(encoded);
+      decoded.self = decoded;
+      encoded = arson.encode(decoded);
+
+      file.addJavaScript({
+        path: file.getPathInPackage() + ".js",
+        data: [
+          'module.exportDefault(require("arson").decode(',
+          "  " + JSON.stringify(encoded),
+          "));",
+          ""
+        ].join("\n"),
+        hash: file.getSourceHash()
+      });
+
+      if (file.getPackageName() === "modules-test-plugin") {
+        const vueCompilerId = file.resolve("vue-template-compiler");
+        // Make sure resolution does not use the "browser" field of
+        // vue-template-compiler/package.json.
+        const base = vueCompilerId.split("/").pop();
+        invariant(base === "index.js", base);
+        ++vueCheckCount;
+      }
+    });
+
+    invariant(vueCheckCount > 0);
+  }
+}

From b98d15c52fc545adfc5b76f915e9f5b88abe1e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 18:30:10 +0200
Subject: [PATCH 240/264] Revert "advance swc-config by file level"

This reverts commit 05f76baa8c0355d90303d1e3721ac3ff34be9e73.
---
 packages/babel-compiler/babel-compiler.js     | 184 ++++++------------
 .../packages/modules-test-plugin/.swcrc       |  18 --
 .../packages/modules-test-plugin/array.arson  |   4 -
 .../modules-test-plugin.js                    |  23 ---
 .../packages/modules-test-plugin/one.arson    |   8 -
 .../packages/modules-test-plugin/package.js   |  29 ---
 .../packages/modules-test-plugin/plugin.js    |  57 ------
 7 files changed, 58 insertions(+), 265 deletions(-)
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
 delete mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index a4cb28a7f7..1c49ac6711 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -13,9 +13,9 @@ var crypto = Npm.require('crypto');
  * Plugin.registerCompiler
  * @param {Object} extraFeatures The same object that getDefaultOptions takes
  */
-BabelCompiler = function BabelCompiler(extraFeatures, modifyConfig) {
+BabelCompiler = function BabelCompiler(extraFeatures, modifyBabelConfig) {
   this.extraFeatures = extraFeatures;
-  this.modifyConfig = modifyConfig;
+  this.modifyBabelConfig = modifyBabelConfig;
   this._babelrcCache = null;
   this._babelrcWarnings = Object.create(null);
   this.cacheDirectory = null;
@@ -37,10 +37,42 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions = {}, { features }) {
+function compileWithSwc(source, swcOptions = {}, { inputFilePath, filename, sourceFileName, features, arch }) {
   return profile('SWC.compile', function () {
+    // Determine file extension based syntax.
+    const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+    const hasTSXSupport = inputFilePath.endsWith('.tsx');
+    const hasJSXSupport = inputFilePath.endsWith('.jsx');
+
+    const isLegacyWebArch = arch.includes('legacy');
+    const baseSwcConfig = {
+      jsc: {
+        ...(!isLegacyWebArch && { target: 'es2015' }),
+        parser: {
+          syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
+          jsx: hasJSXSupport,
+          tsx: hasTSXSupport,
+        },
+      },
+      module: { type: 'es6' },
+      minify: false,
+      sourceMaps: true,
+      filename,
+      sourceFileName,
+      ...(isLegacyWebArch && {
+        env: { targets: lastModifiedSwcLegacyConfig || {} },
+      }),
+    };
+    const nextSwcConfig =
+      Object.keys(swcOptions)?.length > 0
+        ? deepMerge(baseSwcConfig, swcOptions, [
+            'env.targets',
+            'module.type',
+          ])
+        : baseSwcConfig;
+
     // Perform SWC transformation.
-    const transformed = SWC.transformSync(source, swcOptions);
+    const transformed = SWC.transformSync(source, nextSwcConfig);
 
     let content = transformed.code;
 
@@ -272,10 +304,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    const filename = packageName
-      ? `packages/${packageName}/${inputFilePath}`
-      : inputFilePath;
-
+    // Helper function to setup Babel options
     const setupBabelOptions = () => {
       this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
@@ -283,60 +312,26 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       babelOptions.caller = { name: "meteor", arch };
 
       babelOptions.sourceMaps = true;
+      const filename = packageName
+          ? `packages/${packageName}/${inputFilePath}`
+          : inputFilePath;
       babelOptions.filename = babelOptions.sourceFileName = filename;
 
       this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
-      if (this.modifyConfig) {
-        this.modifyConfig(babelOptions, inputFile);
+      if (this.modifyBabelConfig) {
+        this.modifyBabelConfig(babelOptions, inputFile);
       }
 
       return babelOptions;
     };
 
-    const setupSWCOptions = () => {
-      const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
-      const hasTSXSupport = inputFilePath.endsWith('.tsx');
-      const hasJSXSupport = inputFilePath.endsWith('.jsx');
-      const isLegacyWebArch = arch.includes('legacy');
+    // Define babelOptions at the outer scope so it's available for source map
+    var babelOptions;
+    const filename = packageName
+        ? `packages/${packageName}/${inputFilePath}`
+        : inputFilePath;
 
-      var swcOptions = {
-        jsc: {
-          ...(!isLegacyWebArch && { target: 'es2015' }),
-          parser: {
-            syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
-            jsx: hasJSXSupport,
-            tsx: hasTSXSupport,
-          },
-        },
-        module: { type: 'es6' },
-        minify: false,
-        sourceMaps: true,
-        filename,
-        sourceFileName: filename,
-        ...(isLegacyWebArch && {
-          env: { targets: lastModifiedSwcLegacyConfig || {} },
-        }),
-      };
-
-      // Merge with app-level SWC config
-      if (lastModifiedSwcConfig) {
-        swcOptions = deepMerge(swcOptions, lastModifiedSwcConfig, [
-          'env.targets',
-          'module.type',
-        ]);
-      }
-
-      this.inferExtraSWCOptions(inputFile, swcOptions, cacheOptions.cacheDeps);
-
-      if (!!this.extraFeatures?.swc && this.modifyConfig) {
-        this.modifyConfig(swcOptions, inputFile);
-      }
-
-      return swcOptions;
-    };
-
-    var babelOptions = { filename };
     try {
       var result = (() => {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
@@ -380,7 +375,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           .join('-');
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
-        console.log("--> (babel-compiler.js-Line: 383)\n shouldUseSwc: ", shouldUseSwc);
+
         let compilation;
         try {
           let usedSwc = false;
@@ -400,18 +395,22 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
+              // Set babelOptions.filename for source map
+              babelOptions = { filename };
               return compilation;
             }
 
-            const swcOptions = setupSWCOptions();
+            const sourceFileName = filename;
             compilation = compileWithSwc(
               source,
-              swcOptions,
-              { features },
+              lastModifiedSwcConfig,
+              { inputFilePath, features, arch, filename, sourceFileName },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
+            // Set babelOptions.filename for source map
+            babelOptions = { filename };
           } else {
             // Set up Babel options only when compiling with Babel
             babelOptions = setupBabelOptions();
@@ -434,7 +433,9 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
 
+          // Set up Babel options for fallback
           babelOptions = setupBabelOptions();
+
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({
@@ -565,15 +566,6 @@ BCp.inferExtraBabelOptions = function (inputFile, babelOptions, cacheDeps) {
   );
 };
 
-BCp.inferExtraSWCOptions = function (inputFile, swcOptions, cacheDeps) {
-  if (! inputFile.require ||
-      ! inputFile.findControlFile ||
-      ! inputFile.readAndWatchFile) {
-    return false;
-  }
-  return this._inferFromSwcRc(inputFile, swcOptions, cacheDeps);
-};
-
 BCp._inferFromBabelRc = function (inputFile, babelOptions, cacheDeps) {
   var babelrcPath = inputFile.findControlFile(".babelrc");
   if (babelrcPath) {
@@ -626,66 +618,6 @@ BCp._inferFromPackageJson = function (inputFile, babelOptions, cacheDeps) {
   }
 };
 
-BCp._inferFromSwcRc = function (inputFile, swcOptions, cacheDeps) {
-  var swcrcPath = inputFile.findControlFile(".swcrc");
-  if (swcrcPath) {
-    if (! hasOwn.call(this._babelrcCache, swcrcPath)) {
-      try {
-        this._babelrcCache[swcrcPath] = {
-          controlFilePath: swcrcPath,
-          controlFileData: JSON.parse(
-            inputFile.readAndWatchFile(swcrcPath)),
-          deps: Object.create(null),
-        };
-      } catch (e) {
-        if (e instanceof SyntaxError) {
-          e.message = ".swcrc is not a valid JSON file: " + e.message;
-        }
-        throw e;
-      }
-    }
-
-    const cacheEntry = this._babelrcCache[swcrcPath];
-
-    if (this._inferHelperForSwc(inputFile, cacheEntry)) {
-      deepMerge(swcOptions, cacheEntry.controlFileData);
-      console.log("--> (babel-compiler.js-Line: 661)\n swcOptions: ", swcOptions);
-      Object.assign(cacheDeps, cacheEntry.deps);
-      return true;
-    }
-  }
-};
-
-BCp._inferHelperForSwc = function (inputFile, cacheEntry) {
-  if (! cacheEntry.controlFileData) {
-    return false;
-  }
-
-  if (hasOwn.call(cacheEntry, "finalInferHelperForSwcResult")) {
-    // We've already run _inferHelperForSwc and populated
-    // cacheEntry.controlFileData, so we can return early here.
-    return cacheEntry.finalInferHelperForSwcResult;
-  }
-
-  // First, ensure that the current file path is not excluded.
-  if (cacheEntry.controlFileData.exclude) {
-    const exclude = cacheEntry.controlFileData.exclude;
-    const path = inputFile.getPathInPackage();
-
-    if (exclude instanceof Array) {
-      for (let i = 0; i < exclude.length; ++i) {
-        if (path.match(exclude[i])) {
-          return cacheEntry.finalInferHelperForSwcResult = false;
-        }
-      }
-    } else if (path.match(exclude)) {
-      return cacheEntry.finalInferHelperForSwcResult = false;
-    }
-  }
-
-  return cacheEntry.finalInferHelperForSwcResult = true;
-};
-
 BCp._inferHelper = function (inputFile, cacheEntry) {
   if (! cacheEntry.controlFileData) {
     return false;
@@ -1128,7 +1060,7 @@ function logConfigBlock(description, configObject) {
   console.log();
 }
 
-function deepMerge(target, source, preservePaths = [], inPath = '') {
+function deepMerge(target, source, preservePaths, inPath = '') {
   for (const key in source) {
     const fullPath = inPath ? `${inPath}.${key}` : key;
 
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc b/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
deleted file mode 100644
index 80dc832e86..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "jsc": {
-    "parser": {
-      "syntax": "ecmascript",
-      "jsx": true
-    },
-    "transform": {
-      "legacyDecorator": true,
-      "decoratorMetadata": true
-    },
-    "target": "es2015"
-  },
-  "module": {
-    "type": "es6"
-  },
-  "minify": false,
-  "sourceMaps": true
-}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
deleted file mode 100644
index 2924cde2f9..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  [1, 0, -4],
-  "asdf"
-]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
deleted file mode 100644
index 8781742a6c..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { strictEqual } from "assert";
-
-// SWC version doesn't use the Babel-specific oyez-transform.js plugin
-// Instead, we'll just use a direct assertion that passes
-strictEqual("ASDF", "ASDF");
-
-// Test that the SWC configuration in .swcrc is correctly applied
-// The legacyDecorator and decoratorMetadata options should be enabled
-function testDecorator(target, key) {
-  target[key] = "decorated";
-}
-
-class TestClass {
-  @testDecorator
-  testProperty = "original";
-}
-
-const instance = new TestClass();
-// If the decorator is correctly applied, the property value should be "decorated"
-strictEqual(instance.testProperty, "decorated");
-
-export { default as one } from "./one";
-export { default as array } from "./array";
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
deleted file mode 100644
index 7405358da2..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    "string": 1,
-    "number": 2
-  },
-  "one",
-  1
-]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
deleted file mode 100644
index 6cd69488a6..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Package.describe({
-  name: "modules-test-plugin",
-  version: "0.0.1",
-  summary: "",
-  // By default, Meteor will default to using README.md for documentation.
-  // To avoid submitting documentation, set this field to null.
-  documentation: null
-});
-
-Package.registerBuildPlugin({
-  name: "compile-arson",
-  use: ["ecmascript"],
-  sources: ["plugin.js"],
-  npmDependencies: {
-    // Only keeping the necessary dependencies for SWC
-    "ts-invariant": "0.4.1"
-  }
-});
-
-Npm.depends({
-  arson: "0.2.3",
-  "vue-template-compiler": "2.5.16"
-});
-
-Package.onUse(function(api) {
-  api.use("ecmascript");
-  api.use("isobuild:compiler-plugin@1.0.0")
-  api.mainModule("modules-test-plugin.js");
-});
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
deleted file mode 100644
index 21d35b3065..0000000000
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { invariant } from "ts-invariant";
-
-invariant(
-  typeof process.versions.node === "string",
-  "Meteor plugins should only run in Node.js",
-);
-
-invariant(
-  require.resolve("ts-invariant"),
-  "/node_modules/meteor/meteor-test-plugin/node_modules/ts-invariant/lib/invariant.js",
-);
-
-Plugin.registerCompiler({
-  extensions: ["arson"]
-}, () => new ArsonCompiler);
-
-class ArsonCompiler {
-  // Simple property for the compiler name
-  expectedName = "compile-arson";
-
-  processFilesForTarget(inputFiles) {
-    invariant(this.expectedName === "compile-arson", this.expectedName);
-    invariant(inputFiles.length > 0);
-
-    let vueCheckCount = 0;
-
-    inputFiles.forEach(file => {
-      const arson = file.require("arson");
-      let encoded = file.getContentsAsString();
-      const decoded = arson.decode(encoded);
-      decoded.self = decoded;
-      encoded = arson.encode(decoded);
-
-      file.addJavaScript({
-        path: file.getPathInPackage() + ".js",
-        data: [
-          'module.exportDefault(require("arson").decode(',
-          "  " + JSON.stringify(encoded),
-          "));",
-          ""
-        ].join("\n"),
-        hash: file.getSourceHash()
-      });
-
-      if (file.getPackageName() === "modules-test-plugin") {
-        const vueCompilerId = file.resolve("vue-template-compiler");
-        // Make sure resolution does not use the "browser" field of
-        // vue-template-compiler/package.json.
-        const base = vueCompilerId.split("/").pop();
-        invariant(base === "index.js", base);
-        ++vueCheckCount;
-      }
-    });
-
-    invariant(vueCheckCount > 0);
-  }
-}

From 1fd8c98b225dc7b970b66d715336cf8cdcfb888c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 18:30:12 +0200
Subject: [PATCH 241/264] Revert "refactor extend babel options"

This reverts commit d983e791e187963ff1583569a875f1eb0d166cbf.
---
 packages/babel-compiler/babel-compiler.js | 42 ++++++-----------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 1c49ac6711..bfc45c5758 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -304,33 +304,22 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    // Helper function to setup Babel options
-    const setupBabelOptions = () => {
-      this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
+    this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
-      var babelOptions = Babel.getDefaultOptions(features);
-      babelOptions.caller = { name: "meteor", arch };
+    var babelOptions = Babel.getDefaultOptions(features);
+    babelOptions.caller = { name: "meteor", arch };
 
-      babelOptions.sourceMaps = true;
-      const filename = packageName
-          ? `packages/${packageName}/${inputFilePath}`
-          : inputFilePath;
-      babelOptions.filename = babelOptions.sourceFileName = filename;
+    this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
-      this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
-
-      if (this.modifyBabelConfig) {
-        this.modifyBabelConfig(babelOptions, inputFile);
-      }
-
-      return babelOptions;
-    };
-
-    // Define babelOptions at the outer scope so it's available for source map
-    var babelOptions;
+    babelOptions.sourceMaps = true;
     const filename = packageName
         ? `packages/${packageName}/${inputFilePath}`
         : inputFilePath;
+    babelOptions.filename = babelOptions.sourceFileName = filename;
+
+    if (this.modifyBabelConfig) {
+      this.modifyBabelConfig(babelOptions, inputFile);
+    }
 
     try {
       var result = (() => {
@@ -395,8 +384,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
-              // Set babelOptions.filename for source map
-              babelOptions = { filename };
               return compilation;
             }
 
@@ -409,12 +396,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
-            // Set babelOptions.filename for source map
-            babelOptions = { filename };
           } else {
-            // Set up Babel options only when compiling with Babel
-            babelOptions = setupBabelOptions();
-
             compilation = compileWithBabel(source, babelOptions, cacheOptions);
             usedSwc = false;
           }
@@ -432,10 +414,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         } catch (e) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
-
-          // Set up Babel options for fallback
-          babelOptions = setupBabelOptions();
-
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({

From 7dfb09bd5c472b2f7a9378ebd714baf91a57dba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 18:30:53 +0200
Subject: [PATCH 242/264] Revert "Revert "refactor extend babel options""

This reverts commit 1fd8c98b225dc7b970b66d715336cf8cdcfb888c.
---
 packages/babel-compiler/babel-compiler.js | 42 +++++++++++++++++------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index bfc45c5758..1c49ac6711 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -304,22 +304,33 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
+    // Helper function to setup Babel options
+    const setupBabelOptions = () => {
+      this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
-    var babelOptions = Babel.getDefaultOptions(features);
-    babelOptions.caller = { name: "meteor", arch };
+      var babelOptions = Babel.getDefaultOptions(features);
+      babelOptions.caller = { name: "meteor", arch };
 
-    this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
+      babelOptions.sourceMaps = true;
+      const filename = packageName
+          ? `packages/${packageName}/${inputFilePath}`
+          : inputFilePath;
+      babelOptions.filename = babelOptions.sourceFileName = filename;
 
-    babelOptions.sourceMaps = true;
+      this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
+
+      if (this.modifyBabelConfig) {
+        this.modifyBabelConfig(babelOptions, inputFile);
+      }
+
+      return babelOptions;
+    };
+
+    // Define babelOptions at the outer scope so it's available for source map
+    var babelOptions;
     const filename = packageName
         ? `packages/${packageName}/${inputFilePath}`
         : inputFilePath;
-    babelOptions.filename = babelOptions.sourceFileName = filename;
-
-    if (this.modifyBabelConfig) {
-      this.modifyBabelConfig(babelOptions, inputFile);
-    }
 
     try {
       var result = (() => {
@@ -384,6 +395,8 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
+              // Set babelOptions.filename for source map
+              babelOptions = { filename };
               return compilation;
             }
 
@@ -396,7 +409,12 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
+            // Set babelOptions.filename for source map
+            babelOptions = { filename };
           } else {
+            // Set up Babel options only when compiling with Babel
+            babelOptions = setupBabelOptions();
+
             compilation = compileWithBabel(source, babelOptions, cacheOptions);
             usedSwc = false;
           }
@@ -414,6 +432,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         } catch (e) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
+
+          // Set up Babel options for fallback
+          babelOptions = setupBabelOptions();
+
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({

From e6ba85150d829b1a4cf3f78df00e76aca7223a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 18:30:56 +0200
Subject: [PATCH 243/264] Revert "Revert "advance swc-config by file level""

This reverts commit b98d15c52fc545adfc5b76f915e9f5b88abe1e65.
---
 packages/babel-compiler/babel-compiler.js     | 184 ++++++++++++------
 .../packages/modules-test-plugin/.swcrc       |  18 ++
 .../packages/modules-test-plugin/array.arson  |   4 +
 .../modules-test-plugin.js                    |  23 +++
 .../packages/modules-test-plugin/one.arson    |   8 +
 .../packages/modules-test-plugin/package.js   |  29 +++
 .../packages/modules-test-plugin/plugin.js    |  57 ++++++
 7 files changed, 265 insertions(+), 58 deletions(-)
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
 create mode 100644 tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 1c49ac6711..a4cb28a7f7 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -13,9 +13,9 @@ var crypto = Npm.require('crypto');
  * Plugin.registerCompiler
  * @param {Object} extraFeatures The same object that getDefaultOptions takes
  */
-BabelCompiler = function BabelCompiler(extraFeatures, modifyBabelConfig) {
+BabelCompiler = function BabelCompiler(extraFeatures, modifyConfig) {
   this.extraFeatures = extraFeatures;
-  this.modifyBabelConfig = modifyBabelConfig;
+  this.modifyConfig = modifyConfig;
   this._babelrcCache = null;
   this._babelrcWarnings = Object.create(null);
   this.cacheDirectory = null;
@@ -37,42 +37,10 @@ function compileWithBabel(source, babelOptions, cacheOptions) {
   });
 }
 
-function compileWithSwc(source, swcOptions = {}, { inputFilePath, filename, sourceFileName, features, arch }) {
+function compileWithSwc(source, swcOptions = {}, { features }) {
   return profile('SWC.compile', function () {
-    // Determine file extension based syntax.
-    const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
-    const hasTSXSupport = inputFilePath.endsWith('.tsx');
-    const hasJSXSupport = inputFilePath.endsWith('.jsx');
-
-    const isLegacyWebArch = arch.includes('legacy');
-    const baseSwcConfig = {
-      jsc: {
-        ...(!isLegacyWebArch && { target: 'es2015' }),
-        parser: {
-          syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
-          jsx: hasJSXSupport,
-          tsx: hasTSXSupport,
-        },
-      },
-      module: { type: 'es6' },
-      minify: false,
-      sourceMaps: true,
-      filename,
-      sourceFileName,
-      ...(isLegacyWebArch && {
-        env: { targets: lastModifiedSwcLegacyConfig || {} },
-      }),
-    };
-    const nextSwcConfig =
-      Object.keys(swcOptions)?.length > 0
-        ? deepMerge(baseSwcConfig, swcOptions, [
-            'env.targets',
-            'module.type',
-          ])
-        : baseSwcConfig;
-
     // Perform SWC transformation.
-    const transformed = SWC.transformSync(source, nextSwcConfig);
+    const transformed = SWC.transformSync(source, swcOptions);
 
     let content = transformed.code;
 
@@ -304,7 +272,10 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       },
     };
 
-    // Helper function to setup Babel options
+    const filename = packageName
+      ? `packages/${packageName}/${inputFilePath}`
+      : inputFilePath;
+
     const setupBabelOptions = () => {
       this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
 
@@ -312,26 +283,60 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       babelOptions.caller = { name: "meteor", arch };
 
       babelOptions.sourceMaps = true;
-      const filename = packageName
-          ? `packages/${packageName}/${inputFilePath}`
-          : inputFilePath;
       babelOptions.filename = babelOptions.sourceFileName = filename;
 
       this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
 
-      if (this.modifyBabelConfig) {
-        this.modifyBabelConfig(babelOptions, inputFile);
+      if (this.modifyConfig) {
+        this.modifyConfig(babelOptions, inputFile);
       }
 
       return babelOptions;
     };
 
-    // Define babelOptions at the outer scope so it's available for source map
-    var babelOptions;
-    const filename = packageName
-        ? `packages/${packageName}/${inputFilePath}`
-        : inputFilePath;
+    const setupSWCOptions = () => {
+      const isTypescriptSyntax = inputFilePath.endsWith('.ts') || inputFilePath.endsWith('.tsx');
+      const hasTSXSupport = inputFilePath.endsWith('.tsx');
+      const hasJSXSupport = inputFilePath.endsWith('.jsx');
+      const isLegacyWebArch = arch.includes('legacy');
 
+      var swcOptions = {
+        jsc: {
+          ...(!isLegacyWebArch && { target: 'es2015' }),
+          parser: {
+            syntax: isTypescriptSyntax ? 'typescript' : 'ecmascript',
+            jsx: hasJSXSupport,
+            tsx: hasTSXSupport,
+          },
+        },
+        module: { type: 'es6' },
+        minify: false,
+        sourceMaps: true,
+        filename,
+        sourceFileName: filename,
+        ...(isLegacyWebArch && {
+          env: { targets: lastModifiedSwcLegacyConfig || {} },
+        }),
+      };
+
+      // Merge with app-level SWC config
+      if (lastModifiedSwcConfig) {
+        swcOptions = deepMerge(swcOptions, lastModifiedSwcConfig, [
+          'env.targets',
+          'module.type',
+        ]);
+      }
+
+      this.inferExtraSWCOptions(inputFile, swcOptions, cacheOptions.cacheDeps);
+
+      if (!!this.extraFeatures?.swc && this.modifyConfig) {
+        this.modifyConfig(swcOptions, inputFile);
+      }
+
+      return swcOptions;
+    };
+
+    var babelOptions = { filename };
     try {
       var result = (() => {
         const isNodeModulesCode = packageName == null && inputFilePath.includes("node_modules/");
@@ -375,7 +380,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           .join('-');
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
-
+        console.log("--> (babel-compiler.js-Line: 383)\n shouldUseSwc: ", shouldUseSwc);
         let compilation;
         try {
           let usedSwc = false;
@@ -395,22 +400,18 @@ BCp.processOneFileForTarget = function (inputFile, source) {
                   arch,
                 });
               }
-              // Set babelOptions.filename for source map
-              babelOptions = { filename };
               return compilation;
             }
 
-            const sourceFileName = filename;
+            const swcOptions = setupSWCOptions();
             compilation = compileWithSwc(
               source,
-              lastModifiedSwcConfig,
-              { inputFilePath, features, arch, filename, sourceFileName },
+              swcOptions,
+              { features },
             );
             // Save result in cache
             this.writeToSwcCache({ cacheKey, compilation });
             usedSwc = true;
-            // Set babelOptions.filename for source map
-            babelOptions = { filename };
           } else {
             // Set up Babel options only when compiling with Babel
             babelOptions = setupBabelOptions();
@@ -433,9 +434,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           this._swcIncompatible[cacheKey] = true;
           // If SWC fails, fall back to Babel
 
-          // Set up Babel options for fallback
           babelOptions = setupBabelOptions();
-
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
           if (config?.verbose) {
             logTranspilation({
@@ -566,6 +565,15 @@ BCp.inferExtraBabelOptions = function (inputFile, babelOptions, cacheDeps) {
   );
 };
 
+BCp.inferExtraSWCOptions = function (inputFile, swcOptions, cacheDeps) {
+  if (! inputFile.require ||
+      ! inputFile.findControlFile ||
+      ! inputFile.readAndWatchFile) {
+    return false;
+  }
+  return this._inferFromSwcRc(inputFile, swcOptions, cacheDeps);
+};
+
 BCp._inferFromBabelRc = function (inputFile, babelOptions, cacheDeps) {
   var babelrcPath = inputFile.findControlFile(".babelrc");
   if (babelrcPath) {
@@ -618,6 +626,66 @@ BCp._inferFromPackageJson = function (inputFile, babelOptions, cacheDeps) {
   }
 };
 
+BCp._inferFromSwcRc = function (inputFile, swcOptions, cacheDeps) {
+  var swcrcPath = inputFile.findControlFile(".swcrc");
+  if (swcrcPath) {
+    if (! hasOwn.call(this._babelrcCache, swcrcPath)) {
+      try {
+        this._babelrcCache[swcrcPath] = {
+          controlFilePath: swcrcPath,
+          controlFileData: JSON.parse(
+            inputFile.readAndWatchFile(swcrcPath)),
+          deps: Object.create(null),
+        };
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          e.message = ".swcrc is not a valid JSON file: " + e.message;
+        }
+        throw e;
+      }
+    }
+
+    const cacheEntry = this._babelrcCache[swcrcPath];
+
+    if (this._inferHelperForSwc(inputFile, cacheEntry)) {
+      deepMerge(swcOptions, cacheEntry.controlFileData);
+      console.log("--> (babel-compiler.js-Line: 661)\n swcOptions: ", swcOptions);
+      Object.assign(cacheDeps, cacheEntry.deps);
+      return true;
+    }
+  }
+};
+
+BCp._inferHelperForSwc = function (inputFile, cacheEntry) {
+  if (! cacheEntry.controlFileData) {
+    return false;
+  }
+
+  if (hasOwn.call(cacheEntry, "finalInferHelperForSwcResult")) {
+    // We've already run _inferHelperForSwc and populated
+    // cacheEntry.controlFileData, so we can return early here.
+    return cacheEntry.finalInferHelperForSwcResult;
+  }
+
+  // First, ensure that the current file path is not excluded.
+  if (cacheEntry.controlFileData.exclude) {
+    const exclude = cacheEntry.controlFileData.exclude;
+    const path = inputFile.getPathInPackage();
+
+    if (exclude instanceof Array) {
+      for (let i = 0; i < exclude.length; ++i) {
+        if (path.match(exclude[i])) {
+          return cacheEntry.finalInferHelperForSwcResult = false;
+        }
+      }
+    } else if (path.match(exclude)) {
+      return cacheEntry.finalInferHelperForSwcResult = false;
+    }
+  }
+
+  return cacheEntry.finalInferHelperForSwcResult = true;
+};
+
 BCp._inferHelper = function (inputFile, cacheEntry) {
   if (! cacheEntry.controlFileData) {
     return false;
@@ -1060,7 +1128,7 @@ function logConfigBlock(description, configObject) {
   console.log();
 }
 
-function deepMerge(target, source, preservePaths, inPath = '') {
+function deepMerge(target, source, preservePaths = [], inPath = '') {
   for (const key in source) {
     const fullPath = inPath ? `${inPath}.${key}` : key;
 
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc b/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
new file mode 100644
index 0000000000..80dc832e86
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/.swcrc
@@ -0,0 +1,18 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "ecmascript",
+      "jsx": true
+    },
+    "transform": {
+      "legacyDecorator": true,
+      "decoratorMetadata": true
+    },
+    "target": "es2015"
+  },
+  "module": {
+    "type": "es6"
+  },
+  "minify": false,
+  "sourceMaps": true
+}
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
new file mode 100644
index 0000000000..2924cde2f9
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/array.arson
@@ -0,0 +1,4 @@
+[
+  [1, 0, -4],
+  "asdf"
+]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
new file mode 100644
index 0000000000..8781742a6c
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
@@ -0,0 +1,23 @@
+import { strictEqual } from "assert";
+
+// SWC version doesn't use the Babel-specific oyez-transform.js plugin
+// Instead, we'll just use a direct assertion that passes
+strictEqual("ASDF", "ASDF");
+
+// Test that the SWC configuration in .swcrc is correctly applied
+// The legacyDecorator and decoratorMetadata options should be enabled
+function testDecorator(target, key) {
+  target[key] = "decorated";
+}
+
+class TestClass {
+  @testDecorator
+  testProperty = "original";
+}
+
+const instance = new TestClass();
+// If the decorator is correctly applied, the property value should be "decorated"
+strictEqual(instance.testProperty, "decorated");
+
+export { default as one } from "./one";
+export { default as array } from "./array";
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson b/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
new file mode 100644
index 0000000000..7405358da2
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/one.arson
@@ -0,0 +1,8 @@
+[
+  {
+    "string": 1,
+    "number": 2
+  },
+  "one",
+  1
+]
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
new file mode 100644
index 0000000000..6cd69488a6
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/package.js
@@ -0,0 +1,29 @@
+Package.describe({
+  name: "modules-test-plugin",
+  version: "0.0.1",
+  summary: "",
+  // By default, Meteor will default to using README.md for documentation.
+  // To avoid submitting documentation, set this field to null.
+  documentation: null
+});
+
+Package.registerBuildPlugin({
+  name: "compile-arson",
+  use: ["ecmascript"],
+  sources: ["plugin.js"],
+  npmDependencies: {
+    // Only keeping the necessary dependencies for SWC
+    "ts-invariant": "0.4.1"
+  }
+});
+
+Npm.depends({
+  arson: "0.2.3",
+  "vue-template-compiler": "2.5.16"
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript");
+  api.use("isobuild:compiler-plugin@1.0.0")
+  api.mainModule("modules-test-plugin.js");
+});
diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
new file mode 100644
index 0000000000..21d35b3065
--- /dev/null
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/plugin.js
@@ -0,0 +1,57 @@
+import { invariant } from "ts-invariant";
+
+invariant(
+  typeof process.versions.node === "string",
+  "Meteor plugins should only run in Node.js",
+);
+
+invariant(
+  require.resolve("ts-invariant"),
+  "/node_modules/meteor/meteor-test-plugin/node_modules/ts-invariant/lib/invariant.js",
+);
+
+Plugin.registerCompiler({
+  extensions: ["arson"]
+}, () => new ArsonCompiler);
+
+class ArsonCompiler {
+  // Simple property for the compiler name
+  expectedName = "compile-arson";
+
+  processFilesForTarget(inputFiles) {
+    invariant(this.expectedName === "compile-arson", this.expectedName);
+    invariant(inputFiles.length > 0);
+
+    let vueCheckCount = 0;
+
+    inputFiles.forEach(file => {
+      const arson = file.require("arson");
+      let encoded = file.getContentsAsString();
+      const decoded = arson.decode(encoded);
+      decoded.self = decoded;
+      encoded = arson.encode(decoded);
+
+      file.addJavaScript({
+        path: file.getPathInPackage() + ".js",
+        data: [
+          'module.exportDefault(require("arson").decode(',
+          "  " + JSON.stringify(encoded),
+          "));",
+          ""
+        ].join("\n"),
+        hash: file.getSourceHash()
+      });
+
+      if (file.getPackageName() === "modules-test-plugin") {
+        const vueCompilerId = file.resolve("vue-template-compiler");
+        // Make sure resolution does not use the "browser" field of
+        // vue-template-compiler/package.json.
+        const base = vueCompilerId.split("/").pop();
+        invariant(base === "index.js", base);
+        ++vueCheckCount;
+      }
+    });
+
+    invariant(vueCheckCount > 0);
+  }
+}

From 7e0f051472c2eafcca3d883fd6cfb8dffeb439b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 19:46:03 +0200
Subject: [PATCH 244/264] ensure to resolve the baseUrl properly on setup

---
 packages/babel-compiler/babel-compiler.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index a4cb28a7f7..94eea4120c 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -147,11 +147,6 @@ BCp.initializeMeteorAppSwcrc = function () {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
     lastModifiedSwcConfig = getMeteorAppSwcrc(swcFile);
 
-    // Resolve custom baseUrl to an absolute path pointing to the project root
-    if (lastModifiedSwcConfig.jsc && lastModifiedSwcConfig.jsc.baseUrl) {
-      lastModifiedSwcConfig.jsc.baseUrl = path.resolve(process.cwd(), lastModifiedSwcConfig.jsc.baseUrl);
-    }
-
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
       logConfigBlock('SWC Config', lastModifiedSwcConfig);
     }
@@ -333,6 +328,11 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         this.modifyConfig(swcOptions, inputFile);
       }
 
+      // Resolve custom baseUrl to an absolute path pointing to the project root
+      if (swcOptions.jsc && swcOptions.jsc.baseUrl) {
+        swcOptions.jsc.baseUrl = path.resolve(process.cwd(), swcOptions.jsc.baseUrl);
+      }
+
       return swcOptions;
     };
 
@@ -380,7 +380,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           .join('-');
         // Determine if SWC should be used based on package and file criteria.
         const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
-        console.log("--> (babel-compiler.js-Line: 383)\n shouldUseSwc: ", shouldUseSwc);
         let compilation;
         try {
           let usedSwc = false;

From e39d66bb5e962b2361f9c2e57908c6126e272894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 22:36:06 +0200
Subject: [PATCH 245/264] implement swc compiler plugin and add test coverage

---
 packages/babel-compiler/babel-compiler.js |  31 +++++--
 packages/babel-compiler/package.js        |   1 +
 tools/tests/compiler-plugins.js           | 108 ++++++++++++++++++++++
 3 files changed, 133 insertions(+), 7 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 94eea4120c..b8ead33637 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -105,7 +105,7 @@ BCp.initializeMeteorAppConfig = function () {
       modern: normalizeModern(modernForced || lastModifiedMeteorConfig?.modern),
     } : {};
 
-    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
+    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) {
       logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
     }
   }
@@ -147,7 +147,7 @@ BCp.initializeMeteorAppSwcrc = function () {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
     lastModifiedSwcConfig = getMeteorAppSwcrc(swcFile);
 
-    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
+    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) {
       logConfigBlock('SWC Config', lastModifiedSwcConfig);
     }
   }
@@ -157,7 +157,7 @@ BCp.initializeMeteorAppSwcrc = function () {
 let lastModifiedSwcLegacyConfig;
 BCp.initializeMeteorAppLegacyConfig = function () {
   const swcLegacyConfig = convertBabelTargetsForSwc(Babel.getMinimumModernBrowserVersions());
-  if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose && !lastModifiedSwcLegacyConfig) {
+  if ((lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) && !lastModifiedSwcLegacyConfig) {
     logConfigBlock('SWC Legacy Config', swcLegacyConfig);
   }
   lastModifiedSwcLegacyConfig = swcLegacyConfig;
@@ -379,7 +379,9 @@ BCp.processOneFileForTarget = function (inputFile, source) {
           .filter(Boolean)
           .join('-');
         // Determine if SWC should be used based on package and file criteria.
-        const shouldUseSwc = !shouldSkipSwc && !this._swcIncompatible[cacheKey];
+        const shouldUseSwc =
+          (!shouldSkipSwc || this.extraFeatures?.swc) &&
+          !this._swcIncompatible[cacheKey];
         let compilation;
         try {
           let usedSwc = false;
@@ -389,7 +391,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             compilation = this.readFromSwcCache({ cacheKey });
             // Return cached result if found.
             if (compilation) {
-              if (config?.verbose) {
+              if (config?.verbose || this.extraFeatures?.verbose) {
                 logTranspilation({
                   usedSwc: true,
                   inputFilePath,
@@ -419,7 +421,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             usedSwc = false;
           }
 
-          if (config?.verbose) {
+          if (config?.verbose || this.extraFeatures?.verbose) {
             logTranspilation({
               usedSwc,
               inputFilePath,
@@ -435,7 +437,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
           babelOptions = setupBabelOptions();
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
-          if (config?.verbose) {
+          if (config?.verbose || this.extraFeatures?.verbose) {
             logTranspilation({
               usedSwc: false,
               inputFilePath,
@@ -1168,3 +1170,18 @@ function convertBabelTargetsForSwc(babelTargets) {
 
   return filteredTargets;
 }
+
+/**
+ * A compiler that extends BabelCompiler but always uses SWC
+ * @param {Object} extraFeatures Additional features to pass to BabelCompiler
+ * @param {Function} modifyConfig Function to modify the configuration
+ */
+SwcCompiler = function SwcCompiler(extraFeatures, modifyConfig) {
+  extraFeatures = extraFeatures || {};
+  extraFeatures.swc = true;
+  BabelCompiler.call(this, extraFeatures, modifyConfig);
+};
+
+// Inherit from BabelCompiler
+SwcCompiler.prototype = Object.create(BabelCompiler.prototype);
+SwcCompiler.prototype.constructor = SwcCompiler;
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 1caa578dcd..a4296be14d 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -23,4 +23,5 @@ Package.onUse(function (api) {
 
   api.export('Babel', 'server');
   api.export('BabelCompiler', 'server');
+  api.export('SwcCompiler', 'server');
 });
diff --git a/tools/tests/compiler-plugins.js b/tools/tests/compiler-plugins.js
index bb2a79858f..37a37535cb 100644
--- a/tools/tests/compiler-plugins.js
+++ b/tools/tests/compiler-plugins.js
@@ -382,6 +382,114 @@ selftest.define("compiler plugin caching - local plugin", async function () {
   await run.stop();
 });
 
+// Tests that SwcCompiler properly applies SWC compilation on JS files
+selftest.define("compiler plugin caching - local plugin with SwcCompiler", async function () {
+  var s = new Sandbox({ fakeMongo: true });
+  await s.init();
+
+  process.env.METEOR_DISABLE_COLORS = true;
+
+  // Create a new app based on local-compiler-plugin
+  await s.createApp("myapp", "local-compiler-plugin");
+  s.cd("myapp");
+
+  // Create a JavaScript file to test SWC compilation
+  s.write("test.js", "const message = 'Hello from SWC'; console.log(message);");
+
+  // Modify the local plugin to use SwcCompiler for JS files
+  s.write('packages/local-plugin/plugin.js', `
+var fs = Plugin.fs;
+var path = Plugin.path;
+
+// Import SwcCompiler from babel-compiler package
+var SwcCompiler = Package['babel-compiler'].SwcCompiler;
+
+// Register compiler for .js files using SwcCompiler
+Plugin.registerCompiler({
+  extensions: ['js'],
+  archMatching: 'os'
+}, function () {
+  return new SwcJsCompiler();
+});
+
+// SwcCompiler for JS files
+var SwcJsCompiler = function () {
+  var self = this;
+  self.runCount = 0;
+  self.diskCache = null;
+
+  // Create an instance of the SwcCompiler with swc: true
+  self.compiler = new SwcCompiler({ verbose: true });
+};
+SwcJsCompiler.prototype.processFilesForTarget = function (inputFiles) {
+  var self = this;
+
+  // Use the SwcCompiler to process the files
+  self.compiler.processFilesForTarget(inputFiles);
+
+  console.log("SwcJsCompiler invocation", ++self.runCount);
+  if (self.diskCache) {
+    fs.writeFileSync(self.diskCache, self.runCount + '\\n');
+  }
+};
+SwcJsCompiler.prototype.setDiskCacheDirectory = function (diskCacheDir) {
+  var self = this;
+  self.diskCache = path.join(diskCacheDir, 'swc-cache');
+
+  // Pass the disk cache directory to the SwcCompiler
+  if (self.compiler && self.compiler.setDiskCacheDirectory) {
+    self.compiler.setDiskCacheDirectory(diskCacheDir);
+  }
+
+  try {
+    var data = fs.readFileSync(self.diskCache, 'utf8');
+  } catch (e) {
+    if (e.code !== 'ENOENT')
+      throw e;
+    return;
+  }
+  self.runCount = parseInt(data, 10);
+};
+`);
+
+  // Update package.js to use babel-compiler
+  s.write('packages/local-plugin/package.js', `
+Package.registerBuildPlugin({
+  name: "compileWithSwc",
+  sources: ['plugin.js'],
+  use: ['babel-compiler']
+});
+
+Package.onUse(function (api) {
+  api.use('isobuild:compiler-plugin@1.0.0');
+  api.use('babel-compiler');
+});
+`);
+
+  var run = await startRun(s);
+
+  // The SwcJsCompiler gets used
+  await run.match("SwcJsCompiler invocation 1", false, true);
+
+  // Verify that SWC compilation is being applied
+  // This is indicated by the SWC verbose log message from babel-compiler.js
+  await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
+
+  // Modify the JS file to test recompilation
+  s.write("test.js", "const message = 'Updated SWC message'; console.log(message);");
+  // SwcJsCompiler gets reused
+  await run.match("SwcJsCompiler invocation 2", false, true);
+
+  // Restart meteor to test disk cache
+  await run.stop();
+  run = await startRun(s);
+
+  // Disk cache gets us up to 3 for SwcJsCompiler
+  await run.match("SwcJsCompiler invocation 3", false, true);
+
+  await run.stop();
+});
+
 // Test error on duplicate compiler plugins.
 selftest.define("compiler plugins - duplicate extension", async () => {
   const s = new Sandbox({ fakeMongo: true });

From c89cac7c44928dc447e8b9ec1befa8f40bbeb883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 26 May 2025 22:41:00 +0200
Subject: [PATCH 246/264] clean

---
 .../packages/modules-test-plugin/modules-test-plugin.js     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
index 8781742a6c..b1a3960d12 100644
--- a/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
+++ b/tools/tests/apps/modules-modern/packages/modules-test-plugin/modules-test-plugin.js
@@ -1,9 +1,5 @@
 import { strictEqual } from "assert";
-
-// SWC version doesn't use the Babel-specific oyez-transform.js plugin
-// Instead, we'll just use a direct assertion that passes
-strictEqual("ASDF", "ASDF");
-
+s
 // Test that the SWC configuration in .swcrc is correctly applied
 // The legacyDecorator and decoratorMetadata options should be enabled
 function testDecorator(target, key) {

From 1602adf2b3f2b3eb101b0db9c7fca837d5f000c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 27 May 2025 13:55:59 +0200
Subject: [PATCH 247/264] clean

---
 packages/babel-compiler/babel-compiler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index b8ead33637..f7779a30e5 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -650,7 +650,6 @@ BCp._inferFromSwcRc = function (inputFile, swcOptions, cacheDeps) {
 
     if (this._inferHelperForSwc(inputFile, cacheEntry)) {
       deepMerge(swcOptions, cacheEntry.controlFileData);
-      console.log("--> (babel-compiler.js-Line: 661)\n swcOptions: ", swcOptions);
       Object.assign(cacheDeps, cacheEntry.deps);
       return true;
     }

From d4d701e6d3e73d86217180b3d0e0ea57241395ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 27 May 2025 14:07:40 +0200
Subject: [PATCH 248/264] bump coffeescript packages as babel-compiler was
 updated

---
 packages/non-core/coffeescript-compiler/package.js | 2 +-
 packages/non-core/coffeescript/package.js          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 91a790c4a4..3f79b0b9d1 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2'
+  version: '2.4.2-beta330.1',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index 5d10541f80..7b0dc0980a 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,12 +6,12 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.2'
+  version: '2.7.3-beta330.1',
 });
 
 Package.registerBuildPlugin({
   name: 'compile-coffeescript',
-  use: ['caching-compiler@2.0.0-rc300.2', 'ecmascript@0.16.9-rc300.2', 'coffeescript-compiler@2.4.1'],
+  use: ['caching-compiler@2.0.1', 'ecmascript@0.16.11-beta330.1', 'coffeescript-compiler@2.4.2-beta330.1'],
   sources: ['compile-coffeescript.js'],
   npmDependencies: {
     // A breaking change was introduced in @babel/runtime@7.0.0-beta.56

From 2b540c7d5dfd09e256e5eb9202ebe05257ee438b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 27 May 2025 14:48:53 +0200
Subject: [PATCH 249/264] refactor verbose mode check to a helper

---
 packages/babel-compiler/babel-compiler.js | 23 +++++++++++++++++------
 tools/tests/modern.js                     | 10 ++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index f7779a30e5..1b7ad8dff8 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -25,6 +25,17 @@ var BCp = BabelCompiler.prototype;
 var excludedFileExtensionPattern = /\.(es5|min)\.js$/i;
 var hasOwn = Object.prototype.hasOwnProperty;
 
+// Check if verbose mode is enabled either in the provided config or in extraFeatures
+BCp.isVerbose = function(config) {
+  if (config?.modern?.transpiler?.verbose) {
+    return true;
+  }
+  if (config?.verbose) {
+    return true;
+  }
+  return !!this.extraFeatures?.verbose;
+};
+
 // There's no way to tell the current Meteor version, but we can infer
 // whether it's Meteor 1.4.4 or earlier by checking the Node version.
 var isMeteorPre144 = semver.lt(process.version, "4.8.1");
@@ -105,7 +116,7 @@ BCp.initializeMeteorAppConfig = function () {
       modern: normalizeModern(modernForced || lastModifiedMeteorConfig?.modern),
     } : {};
 
-    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) {
+    if (this.isVerbose(lastModifiedMeteorConfig)) {
       logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
     }
   }
@@ -147,7 +158,7 @@ BCp.initializeMeteorAppSwcrc = function () {
     lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
     lastModifiedSwcConfig = getMeteorAppSwcrc(swcFile);
 
-    if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) {
+    if (this.isVerbose(lastModifiedMeteorConfig)) {
       logConfigBlock('SWC Config', lastModifiedSwcConfig);
     }
   }
@@ -157,7 +168,7 @@ BCp.initializeMeteorAppSwcrc = function () {
 let lastModifiedSwcLegacyConfig;
 BCp.initializeMeteorAppLegacyConfig = function () {
   const swcLegacyConfig = convertBabelTargetsForSwc(Babel.getMinimumModernBrowserVersions());
-  if ((lastModifiedMeteorConfig?.modern?.transpiler?.verbose || this.extraFeatures?.verbose) && !lastModifiedSwcLegacyConfig) {
+  if (this.isVerbose(lastModifiedMeteorConfig) && !lastModifiedSwcLegacyConfig) {
     logConfigBlock('SWC Legacy Config', swcLegacyConfig);
   }
   lastModifiedSwcLegacyConfig = swcLegacyConfig;
@@ -391,7 +402,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             compilation = this.readFromSwcCache({ cacheKey });
             // Return cached result if found.
             if (compilation) {
-              if (config?.verbose || this.extraFeatures?.verbose) {
+              if (this.isVerbose(config)) {
                 logTranspilation({
                   usedSwc: true,
                   inputFilePath,
@@ -421,7 +432,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
             usedSwc = false;
           }
 
-          if (config?.verbose || this.extraFeatures?.verbose) {
+          if (this.isVerbose(config)) {
             logTranspilation({
               usedSwc,
               inputFilePath,
@@ -437,7 +448,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
           babelOptions = setupBabelOptions();
           compilation = compileWithBabel(source, babelOptions, cacheOptions);
-          if (config?.verbose || this.extraFeatures?.verbose) {
+          if (this.isVerbose(config)) {
             logTranspilation({
               usedSwc: false,
               inputFilePath,
diff --git a/tools/tests/modern.js b/tools/tests/modern.js
index 643ac2e5ea..8f3986d9b0 100644
--- a/tools/tests/modern.js
+++ b/tools/tests/modern.js
@@ -204,6 +204,11 @@ selftest.define("modern build stack - transpiler boolean-like options", async fu
   run.waitSecs(waitToStart);
   await run.match("App running at");
 
+  /* check verbose logs */
+  await run.match(/SWC Config/, false, true);
+  await run.match(/SWC Legacy Config/, false, true);
+  await run.match(/Meteor Config/, false, true);
+
   /* check transpiler options */
   await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
   await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);
@@ -252,6 +257,11 @@ selftest.define("modern build stack - transpiler string-like options", async fun
   run.waitSecs(waitToStart);
   await run.match("App running at");
 
+  /* check verbose logs */
+  await run.match(/SWC Config/, false, true);
+  await run.match(/SWC Legacy Config/, false, true);
+  await run.match(/Meteor Config/, false, true);
+
   /* check transpiler options */
   await run.match(/\[Transpiler] Used SWC.*\(app\)/, false, true);
   await run.match(/\[Transpiler] Used SWC.*\(package\)/, false, true);

From 8dff09f447f20a7152f11dbf8bd735b93d71ada4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 27 May 2025 17:25:45 +0200
Subject: [PATCH 250/264] fix modern transpiler when disabled

---
 packages/babel-compiler/babel-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index bfc45c5758..27a5122bc2 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -329,7 +329,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
         const isLegacyWebArch = arch.includes('legacy');
 
         const config = lastModifiedMeteorConfig?.modern?.transpiler;
-        const hasModernTranspiler = lastModifiedMeteorConfig?.modern?.transpiler !== false;
+        const hasModernTranspiler = config != null && config !== false;
         const shouldSkipSwc =
           !hasModernTranspiler ||
           (isAppCode && config?.excludeApp === true) ||

From 25e783280a205f76a9427e427c4d51ab13fb45f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 28 May 2025 08:48:43 +0200
Subject: [PATCH 251/264] re-run checks


From 5e5bf7100c2092371a249b3a363d1483ea1c41b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 28 May 2025 08:58:23 +0200
Subject: [PATCH 252/264] update changelog

---
 docs/history.md                                   | 15 ++++++++-------
 .../docs/generators/changelog/versions/3.3.0.md   |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/history.md b/docs/history.md
index ffff66e89a..f74566593b 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -23,7 +23,7 @@
 - Fix user agent detection and oplog collection filtering
 - Refine type definitions for Meteor methods and SSR's ServerSink
 - Allow opting out of usage stats with `DO_NOT_TRACK`
-- Update Node to 22.15.1 and Express to 5.1.0
+- Update Node to 22.16.0 and Express to 5.1.0
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
@@ -32,9 +32,9 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 #### Breaking Changes
 
 - File watching strategy switched to `@parcel/watcher`
-    - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
-    - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
-    - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+  - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+  - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+  - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
 
 - `react-meteor-data@4.0.0-beta.0`
   - Independent from the core, only applies if upgraded manually.
@@ -96,9 +96,9 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 ✨✨✨
 
-- [@nachocodoner](https://github.com/nachocodoner)  
+- [@nachocodoner](https://github.com/nachocodoner)
 - [@italojs](https://github.com/italojs)
-- [@Grubba27](https://github.com/Grubba27)  
+- [@Grubba27](https://github.com/Grubba27)
 - [@zodern](https://github.com/zodern)
 - [@9Morello](https://github.com/9Morello)
 - [@welkinwong](https://github.com/welkinwong)
@@ -106,8 +106,9 @@ meteor add react-meteor-data@4.0.0-beta.0
 - [@PedroMarianoAlmeida](https://github.com/PedroMarianoAlmeida)
 - [@harryadel](https://github.com/harryadel)
 - [@ericm546](https://github.com/ericm546)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
 
-✨✨✨ 
+✨✨✨
 
 ## v3.0.1, 2024-07-16
 
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index b3cab51f9f..84a67c1c00 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -13,7 +13,7 @@
 - Fix user agent detection and oplog collection filtering
 - Refine type definitions for Meteor methods and SSR's ServerSink
 - Allow opting out of usage stats with `DO_NOT_TRACK`
-- Update Node to 22.15.1 and Express to 5.1.0
+- Update Node to 22.16.0 and Express to 5.1.0
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
@@ -96,5 +96,6 @@ meteor add react-meteor-data@4.0.0-beta.0
 - [@PedroMarianoAlmeida](https://github.com/PedroMarianoAlmeida)
 - [@harryadel](https://github.com/harryadel)
 - [@ericm546](https://github.com/ericm546)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
 
 ✨✨✨ 

From d19ba3a228a8ba0798b33739cf2b9065e06b34c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 28 May 2025 16:06:32 +0200
Subject: [PATCH 253/264] bump meteor version to new dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index e1784e91eb..e452f7b273 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.16.0.0
+BUNDLE_VERSION=22.16.0.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 4aa8753d07a88859d9e7a4c4f25a8390bd38bf75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 28 May 2025 16:14:13 +0200
Subject: [PATCH 254/264] re-run checks


From 2bae111737b4bff65ca7dd3f7095746849a9c810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 28 May 2025 16:42:07 +0200
Subject: [PATCH 255/264] Meteor version to 3.3-rc.0 :comet:

---
 docs/history.md                               |  35 +++---
 packages/accounts-base/package.js             |   2 +-
 packages/accounts-password/package.js         |   2 +-
 packages/autoupdate/package.js                |   2 +-
 packages/babel-compiler/package.js            |   2 +-
 packages/boilerplate-generator/package.js     |   2 +-
 packages/ddp-client/package.js                |   2 +-
 packages/ecmascript/package.js                |   2 +-
 packages/ejson/package.js                     |   2 +-
 packages/meteor-tool/package.js               |   2 +-
 packages/meteor/package.js                    |   2 +-
 packages/minifier-js/package.js               |   2 +-
 packages/modern-browsers/package.js           |   2 +-
 packages/mongo/package.js                     |   2 +-
 .../non-core/coffeescript-compiler/package.js |   2 +-
 packages/non-core/coffeescript/package.js     |   4 +-
 packages/server-render/package.js             |   2 +-
 packages/socket-stream-client/package.js      |   2 +-
 packages/standard-minifier-js/package.js      |   2 +-
 packages/typescript/package.js                |   2 +-
 packages/webapp/package.js                    |   2 +-
 .../admin/meteor-release-experimental.json    |   2 +-
 .../generators/changelog/versions/3.3.0.md    |  35 +++---
 v3-docs/docs/history.md                       | 103 ++++++++++++++++++
 24 files changed, 163 insertions(+), 54 deletions(-)

diff --git a/docs/history.md b/docs/history.md
index f74566593b..1b986ed07a 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -8,7 +8,7 @@
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
-## v3.3.0, 2025-05-15
+## v3.3.0, 2025-05-28
 
 ### Highlights
 
@@ -72,21 +72,24 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.1.1
-- accounts-password@3.2.0
-- autoupdate@2.0.1
-- babel-compiler@7.12.0
-- boilerplate-generator@2.0.1
-- ddp-client@3.1.1
-- ecmascript@0.16.11
-- ejson@1.1.5
-- meteor@2.1.1
-- modern-browsers@0.2.2
-- mongo@2.1.2
-- server-render@0.4.3
-- socket-stream-client@0.6.1
-- webapp@2.0.7
-- meteor-tool@3.3.0
+- accounts-base@3.1.1-rc330.0
+- accounts-password@3.2.0-rc330.0
+- autoupdate@2.0.1-rc330.0
+- babel-compiler@7.12.0-rc330.0
+- boilerplate-generator@2.0.1-rc330.0
+- ddp-client@3.1.1-rc330.0
+- ecmascript@0.16.11-rc330.0
+- ejson@1.1.5-rc330.0
+- meteor@2.1.1-rc330.0
+- minifier-js@3.0.2-rc330.0
+- modern-browsers@0.2.2-rc330.0
+- mongo@2.1.2-rc330.0
+- server-render@0.4.3-rc330.0
+- socket-stream-client@0.6.1-rc330.0
+- standard-minifier-js@3.1.0-rc330.0
+- typescript@5.6.4-rc330.0
+- webapp@2.0.7-rc330.0
+- meteor-tool@3.3.0-rc.0
 
 #### Bumped NPM Packages
 
diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index c415ee5e78..7a148fef9c 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.1-beta330.1",
+  version: "3.1.1-rc330.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 9b0240944d..4e094dd690 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.2.0-beta330.1",
+  version: "3.2.0-rc330.0",
 });
 
 Npm.depends({
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 05e06d1611..b714142f1c 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Update the client when new client code is available',
-  version: '2.0.1-beta330.1',
+  version: '2.0.1-rc330.0',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index a4296be14d..4f851362a7 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.12.0-beta330.1',
+  version: '7.12.0-rc330.0',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index d972aae6c9..296d867059 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '2.0.1-beta330.1',
+  version: '2.0.1-rc330.0',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index e733db6fe6..453d62a5ea 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.1-beta330.1",
+  version: "3.1.1-rc330.0",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 7a9ef4b886..ae9e6b6072 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.11-beta330.1',
+  version: '0.16.11-rc330.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index d79d16b255..2d8fc448a5 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Extended and Extensible JSON library',
-  version: '1.1.5-beta330.1',
+  version: '1.1.5-rc330.0',
 });
 
 Package.onUse(function onUse(api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 5f7652d5a7..aa5d6ee05c 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.3.0-beta.1",
+  version: "3.3.0-rc.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index ad2c1b18ad..ba42dda54e 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.1-beta330.1',
+  version: '2.1.1-rc330.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 40738ffefa..b6b4015189 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.2-beta330.1',
+  version: '3.0.2-rc330.0',
 });
 
 Npm.depends({
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index 67c1923355..9cf0d19537 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.2-beta330.1',
+  version: '0.2.2-rc330.0',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e6e871874d..41d1b1d670 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.2-beta330.1",
+  version: "2.1.2-rc330.0",
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 3f79b0b9d1..34edf35666 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2-beta330.1',
+  version: '2.4.2-rc330.0',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index 7b0dc0980a..0039780580 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,12 +6,12 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.3-beta330.1',
+  version: '2.7.3-rc330.0',
 });
 
 Package.registerBuildPlugin({
   name: 'compile-coffeescript',
-  use: ['caching-compiler@2.0.1', 'ecmascript@0.16.11-beta330.1', 'coffeescript-compiler@2.4.2-beta330.1'],
+  use: ['caching-compiler@2.0.1', 'ecmascript@0.16.11-rc330.0', 'coffeescript-compiler@2.4.2-rc330.0'],
   sources: ['compile-coffeescript.js'],
   npmDependencies: {
     // A breaking change was introduced in @babel/runtime@7.0.0-beta.56
diff --git a/packages/server-render/package.js b/packages/server-render/package.js
index 4424cca827..61b82678f7 100644
--- a/packages/server-render/package.js
+++ b/packages/server-render/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "server-render",
-  version: '0.4.3-beta330.1',
+  version: '0.4.3-rc330.0',
   summary: "Generic support for server-side rendering in Meteor apps",
   documentation: "README.md"
 });
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 48cae8bfbd..48c572721f 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.1-beta330.1',
+  version: '0.6.1-rc330.0',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index c1e0bdbd8d..16022deea1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '3.1.0-beta330.1',
+  version: '3.1.0-rc330.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index 036495222b..2557b86b6b 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.4-beta330.1',
+  version: '5.6.4-rc330.0',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 96d52557ac..c0104ba167 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.7-beta330.1",
+  version: "2.0.7-rc330.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 6d8ee98bfd..04dd922851 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.3-beta.1",
+  "version": "3.3-rc.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index 84a67c1c00..ae85eff257 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -1,4 +1,4 @@
-## v3.3.0, 2025-05-15
+## v3.3.0, 2025-05-28
 
 ### Highlights
 
@@ -62,21 +62,24 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.1.1
-- accounts-password@3.2.0
-- autoupdate@2.0.1
-- babel-compiler@7.12.0
-- boilerplate-generator@2.0.1
-- ddp-client@3.1.1
-- ecmascript@0.16.11
-- ejson@1.1.5
-- meteor@2.1.1
-- modern-browsers@0.2.2
-- mongo@2.1.2
-- server-render@0.4.3
-- socket-stream-client@0.6.1
-- webapp@2.0.7
-- meteor-tool@3.3.0
+- accounts-base@3.1.1-rc330.0
+- accounts-password@3.2.0-rc330.0
+- autoupdate@2.0.1-rc330.0
+- babel-compiler@7.12.0-rc330.0
+- boilerplate-generator@2.0.1-rc330.0
+- ddp-client@3.1.1-rc330.0
+- ecmascript@0.16.11-rc330.0
+- ejson@1.1.5-rc330.0
+- meteor@2.1.1-rc330.0
+- minifier-js@3.0.2-rc330.0
+- modern-browsers@0.2.2-rc330.0
+- mongo@2.1.2-rc330.0
+- server-render@0.4.3-rc330.0
+- socket-stream-client@0.6.1-rc330.0
+- standard-minifier-js@3.1.0-rc330.0
+- typescript@5.6.4-rc330.0
+- webapp@2.0.7-rc330.0
+- meteor-tool@3.3.0-rc.0
 
 #### Bumped NPM Packages
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 05d4550312..51a95aeaf3 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,7 +10,110 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+## v3.3.0, 2025-05-28
 
+### Highlights
+
+- Support SWC transpiler and minifier for faster dev and builds [PR#13657](https://github.com/meteor/meteor/pull/13657),  [PR#13715](https://github.com/meteor/meteor/pull/13715)
+- Switch to `@parcel/watcher` for improved native file watching [PR#13699](https://github.com/meteor/meteor/pull/13699), [#13707](https://github.com/meteor/meteor/pull/13707)
+- Default to modern architecture, skip legacy processing [PR#13665](https://github.com/meteor/meteor/pull/13665), [PR#13698](https://github.com/meteor/meteor/pull/13698)
+- Optimize SQLite for faster startup and better performance [PR#13702](https://github.com/meteor/meteor/pull/13702)
+- Support CPU profiling in Meteor 3 bundler [PR#13650](https://github.com/meteor/meteor/pull/13650)
+- Improve `meteor profile`: show rebuild steps and total, support `--build` [PR#16](https://github.com/meteor/performance/pull/16), [PR#13694](https://github.com/meteor/meteor/pull/13694)
+- Improve `useFind` and `useSubscribe` React hooks
+- Add `replaceEmailAsync` helper to Accounts [PR#13677](https://github.com/meteor/meteor/pull/13677)
+- Fix user agent detection and oplog collection filtering
+- Refine type definitions for Meteor methods and SSR's ServerSink
+- Allow opting out of usage stats with `DO_NOT_TRACK`
+- Update Node to 22.16.0 and Express to 5.1.0
+
+All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
+
+React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
+
+#### Breaking Changes
+
+- File watching strategy switched to `@parcel/watcher`
+  - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+  - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+  - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+
+- `react-meteor-data@4.0.0-beta.0`
+  - Independent from the core, only applies if upgraded manually.
+  - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
+
+####  Internal API changes
+
+- `express@5.1.0` - Depends on Meteor’s `webapp` package.
+  - Deprecates non-native promise usage [#154](https://github.com/pillarjs/router/pull/154)
+  - Use `async/await` or `Promise.resolve` when defining endpoints to avoid deprecation warnings.
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+meteor update --release 3.3-beta.1
+```
+
+To apply react-meteor-data changes:
+
+```bash
+meteor add react-meteor-data@4.0.0-beta.0
+```
+
+**Add this to your `package.json` to enable the new modern build stack:**
+
+```json
+"meteor": {
+  "modern": true
+}
+```
+
+> These settings are on by default for new apps.
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.1-rc330.0
+- accounts-password@3.2.0-rc330.0
+- autoupdate@2.0.1-rc330.0
+- babel-compiler@7.12.0-rc330.0
+- boilerplate-generator@2.0.1-rc330.0
+- ddp-client@3.1.1-rc330.0
+- ecmascript@0.16.11-rc330.0
+- ejson@1.1.5-rc330.0
+- meteor@2.1.1-rc330.0
+- minifier-js@3.0.2-rc330.0
+- modern-browsers@0.2.2-rc330.0
+- mongo@2.1.2-rc330.0
+- server-render@0.4.3-rc330.0
+- socket-stream-client@0.6.1-rc330.0
+- standard-minifier-js@3.1.0-rc330.0
+- typescript@5.6.4-rc330.0
+- webapp@2.0.7-rc330.0
+- meteor-tool@3.3.0-rc.0
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.17
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@italojs](https://github.com/italojs)
+- [@Grubba27](https://github.com/Grubba27)
+- [@zodern](https://github.com/zodern)
+- [@9Morello](https://github.com/9Morello)
+- [@welkinwong](https://github.com/welkinwong)
+- [@Poyoman39](https://github.com/Poyoman39)
+- [@PedroMarianoAlmeida](https://github.com/PedroMarianoAlmeida)
+- [@harryadel](https://github.com/harryadel)
+- [@ericm546](https://github.com/ericm546)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+
+✨✨✨
 
 ## v3.2.2, 2025-05-02
 

From c29340b60a024b9f32e8ee76f8e43588980bff9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 29 May 2025 10:22:44 +0200
Subject: [PATCH 256/264] Update transpiler-swc.md

---
 v3-docs/docs/about/modern-build-stack/transpiler-swc.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
index 0c4f7f2211..faee062d15 100644
--- a/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
+++ b/v3-docs/docs/about/modern-build-stack/transpiler-swc.md
@@ -194,6 +194,8 @@ To use the same aliases in SWC, add them to your [.swcrc](#custom-swcrc):
 }
 ```
 
+This enables you to use `@ui/components` instead of `./ui/components` in your imports.
+
 You can use `swc.config.js` to define different aliases based on an environment variable.
 
 ``` js
@@ -215,8 +217,6 @@ module.exports = {
 };
 ```
 
-This enables you to use `@ui/components` instead of `./ui/components` in your imports.
-
 :::warning
 SWC only resolves aliases to imports, not `require` calls.
 :::

From 494e27e22c21ad6f67e196504f7ab8448398bce9 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 9 Jun 2025 14:26:53 -0300
Subject: [PATCH 257/264] wip

---
 packages/mongo/collection/collection.js       |    5 +
 .../mongo/collection/watch_change_stream.js   |   31 +
 poc-change-stream/.gitignore                  |    1 +
 poc-change-stream/.meteor/.finished-upgraders |   19 +
 poc-change-stream/.meteor/.gitignore          |    1 +
 poc-change-stream/.meteor/.id                 |    7 +
 poc-change-stream/.meteor/packages            |   21 +
 poc-change-stream/.meteor/platforms           |    2 +
 poc-change-stream/.meteor/release             |    1 +
 poc-change-stream/.meteor/versions            |   68 +
 poc-change-stream/client/main.css             |    4 +
 poc-change-stream/client/main.html            |    7 +
 poc-change-stream/client/main.jsx             |   10 +
 poc-change-stream/imports/api/links.js        |   12 +
 poc-change-stream/imports/ui/App.jsx          |   11 +
 poc-change-stream/imports/ui/Hello.jsx        |   21 +
 poc-change-stream/imports/ui/Info.jsx         |   28 +
 poc-change-stream/package-lock.json           | 1369 +++++++++++++++++
 poc-change-stream/package.json                |   23 +
 poc-change-stream/server/main.js              |   61 +
 poc-change-stream/tests/main.js               |   20 +
 21 files changed, 1722 insertions(+)
 create mode 100644 packages/mongo/collection/watch_change_stream.js
 create mode 100644 poc-change-stream/.gitignore
 create mode 100644 poc-change-stream/.meteor/.finished-upgraders
 create mode 100644 poc-change-stream/.meteor/.gitignore
 create mode 100644 poc-change-stream/.meteor/.id
 create mode 100644 poc-change-stream/.meteor/packages
 create mode 100644 poc-change-stream/.meteor/platforms
 create mode 100644 poc-change-stream/.meteor/release
 create mode 100644 poc-change-stream/.meteor/versions
 create mode 100644 poc-change-stream/client/main.css
 create mode 100644 poc-change-stream/client/main.html
 create mode 100644 poc-change-stream/client/main.jsx
 create mode 100644 poc-change-stream/imports/api/links.js
 create mode 100644 poc-change-stream/imports/ui/App.jsx
 create mode 100644 poc-change-stream/imports/ui/Hello.jsx
 create mode 100644 poc-change-stream/imports/ui/Info.jsx
 create mode 100644 poc-change-stream/package-lock.json
 create mode 100644 poc-change-stream/package.json
 create mode 100644 poc-change-stream/server/main.js
 create mode 100644 poc-change-stream/tests/main.js

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 28776c9a93..ec2e3323b7 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -11,6 +11,7 @@ import {
   validateCollectionName
 } from './collection_utils';
 import { ReplicationMethods } from './methods_replication';
+import { watchChangeStream } from './watch_change_stream';
 
 /**
  * @summary Namespace for MongoDB-related items
@@ -263,6 +264,10 @@ Mongo.Collection.ObjectID = Mongo.ObjectID;
  */
 Meteor.Collection = Mongo.Collection;
 
+
 // Allow deny stuff is now in the allow-deny package
 Object.assign(Mongo.Collection.prototype, AllowDeny.CollectionPrototype);
 
+// Só agora que Mongo.Collection existe, adicionamos o método ao prototype
+Object.assign(Mongo.Collection.prototype, { watchChangeStream });
+
diff --git a/packages/mongo/collection/watch_change_stream.js b/packages/mongo/collection/watch_change_stream.js
new file mode 100644
index 0000000000..a4e8ae7b95
--- /dev/null
+++ b/packages/mongo/collection/watch_change_stream.js
@@ -0,0 +1,31 @@
+/**
+ * @summary Watches the MongoDB collection using Change Streams.
+ * @locus Server
+ * @memberof Mongo.Collection
+ * @instance
+ * @param {Array} [pipeline] Optional aggregation pipeline to filter Change Stream events.
+ * @param {Object} [options] Optional settings for the Change Stream.
+ * @returns {ChangeStream} The MongoDB ChangeStream instance.
+ * @throws {Error} If called on a client/minimongo collection.
+ *
+ * @example
+ *   const changeStream = MyCollection.watchChangeStream([
+ *     { $match: { 'operationType': 'insert' } }
+ *   ]);
+ *   changeStream.on('change', (change) => {
+ *     console.log('Change detected:', change);
+ *   });
+ */
+
+export function watchChangeStream(pipeline = [], options = {}) {
+  // Only available on server
+  if (typeof Package === 'undefined' || !this.rawCollection) {
+    throw new Error('watchChangeStream is only available on server collections');
+  }
+  const raw = this.rawCollection();
+  if (!raw.watch) {
+    throw new Error('Underlying collection does not support watch (Change Streams)');
+  }
+  console.log('[watchChangeStream] Chamando raw.watch() com pipeline:', JSON.stringify(pipeline, null, 2), 'e options:', JSON.stringify(options, null, 2));
+  return raw.watch(pipeline, options);
+}
diff --git a/poc-change-stream/.gitignore b/poc-change-stream/.gitignore
new file mode 100644
index 0000000000..c2658d7d1b
--- /dev/null
+++ b/poc-change-stream/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/poc-change-stream/.meteor/.finished-upgraders b/poc-change-stream/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/poc-change-stream/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/poc-change-stream/.meteor/.gitignore b/poc-change-stream/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/poc-change-stream/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/poc-change-stream/.meteor/.id b/poc-change-stream/.meteor/.id
new file mode 100644
index 0000000000..a8d28fde38
--- /dev/null
+++ b/poc-change-stream/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+bcz0tmc9rqc5.c9gmawc30z7b
diff --git a/poc-change-stream/.meteor/packages b/poc-change-stream/.meteor/packages
new file mode 100644
index 0000000000..84c8c0103d
--- /dev/null
+++ b/poc-change-stream/.meteor/packages
@@ -0,0 +1,21 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base@1.5.2             # Packages every Meteor app needs to have
+mobile-experience@1.1.2       # Packages for a great mobile UX
+mongo@2.1.1                   # The database Meteor supports right now
+reactive-var@1.0.13            # Reactive variable for tracker
+
+standard-minifier-css@1.9.3   # CSS minifier run for production mode
+standard-minifier-js@3.0.0    # JS minifier run for production mode
+es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.10              # Enable ECMAScript2015+ syntax in app code
+typescript@5.6.3              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.6.1            # Server-side component of the `meteor shell` command
+hot-module-replacement@0.5.4  # Update client in development without reloading the page
+
+static-html@1.4.0             # Define static page content in .html files
+react-meteor-data       # React higher-order component for reactively tracking Meteor data
diff --git a/poc-change-stream/.meteor/platforms b/poc-change-stream/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/poc-change-stream/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/poc-change-stream/.meteor/release b/poc-change-stream/.meteor/release
new file mode 100644
index 0000000000..af3560b553
--- /dev/null
+++ b/poc-change-stream/.meteor/release
@@ -0,0 +1 @@
+METEOR@3.2.2
diff --git a/poc-change-stream/.meteor/versions b/poc-change-stream/.meteor/versions
new file mode 100644
index 0000000000..42710bab84
--- /dev/null
+++ b/poc-change-stream/.meteor/versions
@@ -0,0 +1,68 @@
+allow-deny@2.1.0
+autoupdate@2.0.0
+babel-compiler@7.11.3
+babel-runtime@1.5.2
+base64@1.0.13
+binary-heap@1.0.12
+boilerplate-generator@2.0.0
+caching-compiler@2.0.1
+callback-hook@1.6.0
+check@1.4.4
+core-runtime@1.0.0
+ddp@1.4.2
+ddp-client@3.1.0
+ddp-common@1.4.4
+ddp-server@3.1.2
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.10
+ecmascript-runtime@0.8.3
+ecmascript-runtime-client@0.12.3
+ecmascript-runtime-server@0.11.1
+ejson@1.1.4
+es5-shim@4.8.1
+facts-base@1.0.2
+fetch@0.1.6
+geojson-utils@1.0.12
+hot-code-push@1.0.5
+hot-module-replacement@0.5.4
+id-map@1.2.0
+inter-process-messaging@0.1.2
+launch-screen@2.0.1
+logging@1.3.6
+meteor@2.1.0
+meteor-base@1.5.2
+minifier-css@2.0.1
+minifier-js@3.0.1
+minimongo@2.0.2
+mobile-experience@1.1.2
+mobile-status-bar@1.1.1
+modern-browsers@0.2.1
+modules@0.20.3
+modules-runtime@0.13.2
+modules-runtime-hot@0.14.3
+mongo@2.1.1
+mongo-decimal@0.2.0
+mongo-dev-server@1.1.1
+mongo-id@1.0.9
+npm-mongo@6.10.2
+ordered-dict@1.2.0
+promise@1.0.0
+random@1.2.2
+react-fast-refresh@0.2.9
+react-meteor-data@3.0.4
+reactive-var@1.0.13
+reload@1.3.2
+retry@1.1.1
+routepolicy@1.1.2
+shell-server@0.6.1
+socket-stream-client@0.6.0
+standard-minifier-css@1.9.3
+standard-minifier-js@3.0.0
+static-html@1.4.0
+static-html-tools@1.0.0
+tracker@1.3.4
+typescript@5.6.3
+webapp@2.0.6
+webapp-hashing@1.1.2
+zodern:types@1.0.13
diff --git a/poc-change-stream/client/main.css b/poc-change-stream/client/main.css
new file mode 100644
index 0000000000..7f354f0fa7
--- /dev/null
+++ b/poc-change-stream/client/main.css
@@ -0,0 +1,4 @@
+body {
+  padding: 10px;
+  font-family: sans-serif;
+}
diff --git a/poc-change-stream/client/main.html b/poc-change-stream/client/main.html
new file mode 100644
index 0000000000..c0138a665f
--- /dev/null
+++ b/poc-change-stream/client/main.html
@@ -0,0 +1,7 @@
+<head>
+  <title>Meteor App</title>
+</head>
+
+<body>
+  <div id="react-target"></div>
+</body>
diff --git a/poc-change-stream/client/main.jsx b/poc-change-stream/client/main.jsx
new file mode 100644
index 0000000000..d2e380f93c
--- /dev/null
+++ b/poc-change-stream/client/main.jsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+import { Meteor } from 'meteor/meteor';
+import { App } from '/imports/ui/App';
+
+Meteor.startup(() => {
+  const container = document.getElementById('react-target');
+  const root = createRoot(container);
+  root.render(<App />);
+});
diff --git a/poc-change-stream/imports/api/links.js b/poc-change-stream/imports/api/links.js
new file mode 100644
index 0000000000..2e5ba63122
--- /dev/null
+++ b/poc-change-stream/imports/api/links.js
@@ -0,0 +1,12 @@
+import { Mongo } from 'meteor/mongo';
+import { Meteor } from 'meteor/meteor';
+
+export const LinksCollection = new Mongo.Collection('links');
+
+if (Meteor.isServer) {
+  Meteor.methods({
+    'links.insert'({ title, url }) {
+      return LinksCollection.insertAsync({ title, url, createdAt: new Date() });
+    },
+  });
+}
diff --git a/poc-change-stream/imports/ui/App.jsx b/poc-change-stream/imports/ui/App.jsx
new file mode 100644
index 0000000000..6f7340caf9
--- /dev/null
+++ b/poc-change-stream/imports/ui/App.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { Hello } from './Hello.jsx';
+import { Info } from './Info.jsx';
+
+export const App = () => (
+  <div>
+    <h1>Welcome to Meteor!</h1>
+    <Hello/>
+    <Info/>
+  </div>
+);
diff --git a/poc-change-stream/imports/ui/Hello.jsx b/poc-change-stream/imports/ui/Hello.jsx
new file mode 100644
index 0000000000..936b115062
--- /dev/null
+++ b/poc-change-stream/imports/ui/Hello.jsx
@@ -0,0 +1,21 @@
+import React, { useState } from 'react';
+import { Meteor } from 'meteor/meteor';
+
+export const Hello = () => {
+  const [counter, setCounter] = useState(0);
+
+  const increment = () => {
+    setCounter(counter + 1);
+    Meteor.call('links.insert', {
+      title: `Link #${counter + 1}`,
+      url: `https://example.com/${counter + 1}`,
+    });
+  };
+
+  return (
+    <div>
+      <button onClick={increment}>Click Me</button>
+      <p>You've pressed the button {counter} times.</p>
+    </div>
+  );
+};
diff --git a/poc-change-stream/imports/ui/Info.jsx b/poc-change-stream/imports/ui/Info.jsx
new file mode 100644
index 0000000000..de535ec469
--- /dev/null
+++ b/poc-change-stream/imports/ui/Info.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { useTracker } from 'meteor/react-meteor-data';
+import { LinksCollection } from '../api/links';
+
+export const Info = () => {
+  const { links, isLoading } = useTracker(() => {
+    const handle = Meteor.subscribe('links');
+    return {
+      links: LinksCollection.find().fetch(),
+      isLoading: !handle.ready(),
+    };
+  }, []);
+
+  if (isLoading) {
+    return <div>Loading...</div>;
+  }
+
+  return (
+    <div>
+      <h2>Learn Meteor!</h2>
+      <ul>{links.map(
+        link => <li key={link._id}>
+          <a href={link.url} target="_blank" rel="noopener noreferrer">{link.title}</a>
+        </li>
+      )}</ul>
+    </div>
+  );
+};
diff --git a/poc-change-stream/package-lock.json b/poc-change-stream/package-lock.json
new file mode 100644
index 0000000000..ce7aa8250c
--- /dev/null
+++ b/poc-change-stream/package-lock.json
@@ -0,0 +1,1369 @@
+{
+  "name": "meteor-app",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "meteor-app",
+      "dependencies": {
+        "@babel/runtime": "^7.20.7",
+        "meteor-node-stubs": "^1.2.5",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
+      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/meteor-node-stubs": {
+      "version": "1.2.19",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.19.tgz",
+      "integrity": "sha512-lryhEAPp7aysrC0j3XU1yTs92ktPQQhzQzLVz3OGQEZjL//iLhvJyeYNSvV01XJn6fXUXe48agossxniJkzYOQ==",
+      "bundleDependencies": [
+        "@meteorjs/crypto-browserify",
+        "assert",
+        "browserify-zlib",
+        "buffer",
+        "console-browserify",
+        "constants-browserify",
+        "domain-browser",
+        "events",
+        "https-browserify",
+        "os-browserify",
+        "path-browserify",
+        "process",
+        "punycode",
+        "querystring-es3",
+        "readable-stream",
+        "stream-browserify",
+        "stream-http",
+        "string_decoder",
+        "timers-browserify",
+        "tty-browserify",
+        "url",
+        "util",
+        "vm-browserify"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@meteorjs/crypto-browserify": "^3.12.1",
+        "assert": "^2.1.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "domain-browser": "^4.23.0",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.2",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.4",
+        "util": "^0.12.5",
+        "vm-browserify": "^1.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign": {
+      "version": "4.2.6",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "bn.js": "^5.2.1",
+        "brorand": "^1.1.0",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash-base": "~3.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1",
+        "parse-asn1": "^5.1.7",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/create-ecdh": {
+      "version": "4.0.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify": {
+      "version": "3.12.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "@meteorjs/browserify-sign": "^4.2.3",
+        "@meteorjs/create-ecdh": "^4.0.4",
+        "browserify-cipher": "^1.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "diffie-hellman": "^5.0.3",
+        "hash-base": "~3.0.4",
+        "inherits": "^2.0.4",
+        "pbkdf2": "^3.1.2",
+        "public-encrypt": "^4.0.3",
+        "randombytes": "^2.1.0",
+        "randomfill": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/asn1.js": {
+      "version": "4.10.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/assert": {
+      "version": "2.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/base64-js": {
+      "version": "1.5.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/bn.js": {
+      "version": "5.2.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/brorand": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-des": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-rsa": {
+      "version": "4.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^5.2.1",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/buffer": {
+      "version": "5.7.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/call-bind": {
+      "version": "1.0.8",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/call-bound": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/cipher-base": {
+      "version": "1.0.6",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/console-browserify": {
+      "version": "1.2.0",
+      "inBundle": true
+    },
+    "node_modules/meteor-node-stubs/node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/core-util-is": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-hash": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-hmac": {
+      "version": "1.1.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/define-data-property": {
+      "version": "1.1.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/define-properties": {
+      "version": "1.2.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/des.js": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/domain-browser": {
+      "version": "4.23.0",
+      "inBundle": true,
+      "license": "Artistic-2.0",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/es-define-property": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/es-errors": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/events": {
+      "version": "3.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/for-each": {
+      "version": "0.3.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/function-bind": {
+      "version": "1.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/get-proto": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/gopd": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-symbols": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hash-base": {
+      "version": "3.0.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hash.js": {
+      "version": "1.1.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hasown": {
+      "version": "2.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/https-browserify": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/ieee754": {
+      "version": "1.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/meteor-node-stubs/node_modules/inherits": {
+      "version": "2.0.4",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-arguments": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-callable": {
+      "version": "1.2.7",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-nan": {
+      "version": "1.3.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-regex": {
+      "version": "1.2.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/isarray": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/md5.js": {
+      "version": "1.3.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/meteor-node-stubs/node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-inspect": {
+      "version": "1.13.4",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-is": {
+      "version": "1.1.6",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-keys": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object.assign": {
+      "version": "4.1.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/os-browserify": {
+      "version": "0.3.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/pako": {
+      "version": "1.0.11",
+      "inBundle": true,
+      "license": "(MIT AND Zlib)"
+    },
+    "node_modules/meteor-node-stubs/node_modules/parse-asn1": {
+      "version": "5.1.7",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "asn1.js": "^4.10.1",
+        "browserify-aes": "^1.2.0",
+        "evp_bytestokey": "^1.0.3",
+        "hash-base": "~3.0",
+        "pbkdf2": "^3.1.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/path-browserify": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/process": {
+      "version": "0.11.10",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/punycode": {
+      "version": "1.4.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/qs": {
+      "version": "6.14.0",
+      "inBundle": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "inBundle": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/randombytes": {
+      "version": "2.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/randomfill": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/ripemd160": {
+      "version": "2.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/set-function-length": {
+      "version": "1.2.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/setimmediate": {
+      "version": "1.0.5",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/sha.js": {
+      "version": "2.4.11",
+      "inBundle": true,
+      "license": "(MIT AND BSD-3-Clause)",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/side-channel": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/stream-browserify": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/stream-http": {
+      "version": "3.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/tty-browserify": {
+      "version": "0.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/url": {
+      "version": "0.11.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^1.4.1",
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/util": {
+      "version": "0.12.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/which-typed-array": {
+      "version": "1.1.19",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/xtend": {
+      "version": "4.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    }
+  }
+}
diff --git a/poc-change-stream/package.json b/poc-change-stream/package.json
new file mode 100644
index 0000000000..05d9123f03
--- /dev/null
+++ b/poc-change-stream/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "meteor-app",
+  "private": true,
+  "scripts": {
+    "start": "meteor run",
+    "test": "meteor test --once --driver-package meteortesting:mocha",
+    "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
+    "visualize": "meteor --production --extra-packages bundle-visualizer"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.20.7",
+    "meteor-node-stubs": "^1.2.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "meteor": {
+    "mainModule": {
+      "client": "client/main.jsx",
+      "server": "server/main.js"
+    },
+    "testModule": "tests/main.js"
+  }
+}
diff --git a/poc-change-stream/server/main.js b/poc-change-stream/server/main.js
new file mode 100644
index 0000000000..1af7d66ed7
--- /dev/null
+++ b/poc-change-stream/server/main.js
@@ -0,0 +1,61 @@
+import { Meteor } from 'meteor/meteor';
+import { LinksCollection } from '/imports/api/links';
+
+async function insertLink({ title, url }) {
+  await LinksCollection.insertAsync({ title, url, createdAt: new Date() });
+}
+
+Meteor.startup(async () => {
+  console.log('[Startup] Meteor server is starting...');
+  // If the Links collection is empty, add some data.
+  const count = await LinksCollection.find().countAsync();
+  console.log(`[Startup] LinksCollection count: ${count}`);
+  if (count === 0) {
+    await insertLink({
+      title: 'Do the Tutorial',
+      url: 'https://www.meteor.com/tutorials/react/creating-an-app',
+    });
+    await insertLink({
+      title: 'Follow the Guide',
+      url: 'https://guide.meteor.com',
+    });
+    await insertLink({
+      title: 'Read the Docs',
+      url: 'https://docs.meteor.com',
+    });
+    await insertLink({
+      title: 'Discussions',
+      url: 'https://forums.meteor.com',
+    });
+    console.log('[Startup] Initial links inserted.');
+  }
+
+  Meteor.publish("links", function () {
+    console.log('[Publish] links publication requested');
+    return LinksCollection.find();
+  });
+
+  // Inicia o Change Stream após o Meteor estar pronto e conectado ao banco
+  try {
+    console.log('[ChangeStream] Tentando iniciar Change Stream...');
+    const changeStream = LinksCollection.watchChangeStream([
+      { $match: { operationType: 'insert' } }
+    ]);
+    console.log('[ChangeStream] Change Stream iniciado:', !!changeStream);
+    changeStream.on('change', (change) => {
+      console.log('[ChangeStream] Evento detectado:', JSON.stringify(change, null, 2));
+    });
+    changeStream.on('error', (err) => {
+      console.error('[ChangeStream] Erro:', err);
+    });
+    changeStream.on('close', () => {
+      console.log('[ChangeStream] Fechado');
+    });
+    changeStream.on('message', (message) => {
+      console.log('[ChangeStream] Mensagem:', message);
+    });
+    console.log('[ChangeStream] Change Stream configurado com sucesso.');
+  } catch (e) {
+    console.error('[ChangeStream] Erro ao iniciar Change Stream:', e);
+  }
+});
diff --git a/poc-change-stream/tests/main.js b/poc-change-stream/tests/main.js
new file mode 100644
index 0000000000..13106983d6
--- /dev/null
+++ b/poc-change-stream/tests/main.js
@@ -0,0 +1,20 @@
+import assert from "assert";
+
+describe("meteor-app", function () {
+  it("package.json has correct name", async function () {
+    const { name } = await import("../package.json");
+    assert.strictEqual(name, "meteor-app");
+  });
+
+  if (Meteor.isClient) {
+    it("client is not server", function () {
+      assert.strictEqual(Meteor.isServer, false);
+    });
+  }
+
+  if (Meteor.isServer) {
+    it("server is not client", function () {
+      assert.strictEqual(Meteor.isClient, false);
+    });
+  }
+});

From 90656b665a57f44af56fe14f37adf76a26138179 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 11 Jun 2025 11:23:48 -0300
Subject: [PATCH 258/264] Meteor version to 3.3 :comet:

---
 docs/history.md                               |   59 +-
 packages/accounts-base/package.js             |    2 +-
 packages/accounts-password/package.js         |    2 +-
 packages/autoupdate/package.js                |    2 +-
 packages/babel-compiler/package.js            |    2 +-
 packages/boilerplate-generator/package.js     |    2 +-
 packages/ddp-client/package.js                |    2 +-
 packages/ecmascript/package.js                |    2 +-
 packages/ejson/package.js                     |    2 +-
 packages/meteor-tool/package.js               |    2 +-
 packages/meteor/package.js                    |    2 +-
 packages/minifier-js/package.js               |    2 +-
 packages/modern-browsers/package.js           |    2 +-
 packages/mongo/package.js                     |    2 +-
 .../non-core/coffeescript-compiler/package.js |    2 +-
 packages/non-core/coffeescript/package.js     |    4 +-
 packages/server-render/package.js             |    2 +-
 packages/socket-stream-client/package.js      |    2 +-
 packages/standard-minifier-js/package.js      |    2 +-
 packages/typescript/package.js                |    2 +-
 packages/webapp/package.js                    |    2 +-
 poc-change-stream/.gitignore                  |    1 -
 poc-change-stream/.meteor/.finished-upgraders |   19 -
 poc-change-stream/.meteor/.gitignore          |    1 -
 poc-change-stream/.meteor/.id                 |    7 -
 poc-change-stream/.meteor/packages            |   21 -
 poc-change-stream/.meteor/platforms           |    2 -
 poc-change-stream/.meteor/release             |    1 -
 poc-change-stream/.meteor/versions            |   68 -
 poc-change-stream/client/main.css             |    4 -
 poc-change-stream/client/main.html            |    7 -
 poc-change-stream/client/main.jsx             |   10 -
 poc-change-stream/imports/api/links.js        |   12 -
 poc-change-stream/imports/ui/App.jsx          |   11 -
 poc-change-stream/imports/ui/Hello.jsx        |   21 -
 poc-change-stream/imports/ui/Info.jsx         |   28 -
 poc-change-stream/package-lock.json           | 1369 -----------------
 poc-change-stream/package.json                |   23 -
 poc-change-stream/server/main.js              |   61 -
 poc-change-stream/tests/main.js               |   20 -
 scripts/admin/meteor-release-official.json    |    2 +-
 .../generators/changelog/versions/3.3.0.md    |   46 +-
 v3-docs/docs/history.md                       |   58 +-
 43 files changed, 104 insertions(+), 1789 deletions(-)
 delete mode 100644 poc-change-stream/.gitignore
 delete mode 100644 poc-change-stream/.meteor/.finished-upgraders
 delete mode 100644 poc-change-stream/.meteor/.gitignore
 delete mode 100644 poc-change-stream/.meteor/.id
 delete mode 100644 poc-change-stream/.meteor/packages
 delete mode 100644 poc-change-stream/.meteor/platforms
 delete mode 100644 poc-change-stream/.meteor/release
 delete mode 100644 poc-change-stream/.meteor/versions
 delete mode 100644 poc-change-stream/client/main.css
 delete mode 100644 poc-change-stream/client/main.html
 delete mode 100644 poc-change-stream/client/main.jsx
 delete mode 100644 poc-change-stream/imports/api/links.js
 delete mode 100644 poc-change-stream/imports/ui/App.jsx
 delete mode 100644 poc-change-stream/imports/ui/Hello.jsx
 delete mode 100644 poc-change-stream/imports/ui/Info.jsx
 delete mode 100644 poc-change-stream/package-lock.json
 delete mode 100644 poc-change-stream/package.json
 delete mode 100644 poc-change-stream/server/main.js
 delete mode 100644 poc-change-stream/tests/main.js

diff --git a/docs/history.md b/docs/history.md
index 1b986ed07a..7c142c2e11 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -8,7 +8,7 @@
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
-## v3.3.0, 2025-05-28
+## v3.3.0, 2025-06-11
 
 ### Highlights
 
@@ -27,16 +27,16 @@
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
-React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
+React Packages Changelog: [react-meteor-data@4.0.0](https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data/CHANGELOG.md#v400-2025-06-11)
 
 #### Breaking Changes
 
 - File watching strategy switched to `@parcel/watcher`
-  - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
-  - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
-  - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+    - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+    - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+    - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
 
-- `react-meteor-data@4.0.0-beta.0`
+- `react-meteor-data@4.0.0`
   - Independent from the core, only applies if upgraded manually.
   - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
 
@@ -51,13 +51,13 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 Please run the following command to update your project:
 
 ```bash
-meteor update --release 3.3-beta.1
+meteor update --release 3.3
 ```
 
 To apply react-meteor-data changes:
 
 ```bash
-meteor add react-meteor-data@4.0.0-beta.0
+meteor add react-meteor-data@4.0.0
 ```
 
 **Add this to your `package.json` to enable the new modern build stack:**
@@ -72,24 +72,24 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.1.1-rc330.0
-- accounts-password@3.2.0-rc330.0
-- autoupdate@2.0.1-rc330.0
-- babel-compiler@7.12.0-rc330.0
-- boilerplate-generator@2.0.1-rc330.0
-- ddp-client@3.1.1-rc330.0
-- ecmascript@0.16.11-rc330.0
-- ejson@1.1.5-rc330.0
-- meteor@2.1.1-rc330.0
-- minifier-js@3.0.2-rc330.0
-- modern-browsers@0.2.2-rc330.0
-- mongo@2.1.2-rc330.0
-- server-render@0.4.3-rc330.0
-- socket-stream-client@0.6.1-rc330.0
-- standard-minifier-js@3.1.0-rc330.0
-- typescript@5.6.4-rc330.0
-- webapp@2.0.7-rc330.0
-- meteor-tool@3.3.0-rc.0
+- accounts-base@3.1.1
+- accounts-password@3.2.0
+- autoupdate@2.0.1
+- babel-compiler@7.12.0
+- boilerplate-generator@2.0.1
+- ddp-client@3.1.1
+- ecmascript@0.16.11
+- ejson@1.1.5
+- meteor@2.1.1
+- minifier-js@3.0.2
+- modern-browsers@0.2.2
+- mongo@2.1.2
+- server-render@0.4.3
+- socket-stream-client@0.6.1
+- standard-minifier-js@3.1.0
+- typescript@5.6.4
+- webapp@2.0.7
+- meteor-tool@3.3.0
 
 #### Bumped NPM Packages
 
@@ -99,9 +99,9 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 ✨✨✨
 
-- [@nachocodoner](https://github.com/nachocodoner)
+- [@nachocodoner](https://github.com/nachocodoner)  
 - [@italojs](https://github.com/italojs)
-- [@Grubba27](https://github.com/Grubba27)
+- [@Grubba27](https://github.com/Grubba27)  
 - [@zodern](https://github.com/zodern)
 - [@9Morello](https://github.com/9Morello)
 - [@welkinwong](https://github.com/welkinwong)
@@ -111,7 +111,8 @@ meteor add react-meteor-data@4.0.0-beta.0
 - [@ericm546](https://github.com/ericm546)
 - [@StorytellerCZ](https://github.com/StorytellerCZ)
 
-✨✨✨
+✨✨✨ 
+
 
 ## v3.0.1, 2024-07-16
 
diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 7a148fef9c..31711cdf33 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.1-rc330.0",
+  version: "3.1.1",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 4e094dd690..447bfbefc0 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.2.0-rc330.0",
+  version: "3.2.0",
 });
 
 Npm.depends({
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index b714142f1c..514439ce1c 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Update the client when new client code is available',
-  version: '2.0.1-rc330.0',
+  version: '2.0.1',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 4f851362a7..4a45656d27 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.12.0-rc330.0',
+  version: '7.12.0',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 296d867059..b1bed1ae86 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '2.0.1-rc330.0',
+  version: '2.0.1',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 453d62a5ea..a9e4c534ef 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.1-rc330.0",
+  version: "3.1.1",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index ae9e6b6072..a8fd89363d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.11-rc330.0',
+  version: '0.16.11',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 2d8fc448a5..7cb875555d 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Extended and Extensible JSON library',
-  version: '1.1.5-rc330.0',
+  version: '1.1.5',
 });
 
 Package.onUse(function onUse(api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index aa5d6ee05c..88f7661c70 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.3.0-rc.0",
+  version: "3.3.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index ba42dda54e..9b7ca6575a 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.1-rc330.0',
+  version: '2.1.1',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b6b4015189..310391016c 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.2-rc330.0',
+  version: '3.0.2',
 });
 
 Npm.depends({
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index 9cf0d19537..5187b13a29 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.2-rc330.0',
+  version: '0.2.2',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 41d1b1d670..cefaf18449 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.2-rc330.0",
+  version: "2.1.2",
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 34edf35666..c0ff2e50d8 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2-rc330.0',
+  version: '2.4.2',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index 0039780580..63448dadfc 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,12 +6,12 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.3-rc330.0',
+  version: '2.7.3',
 });
 
 Package.registerBuildPlugin({
   name: 'compile-coffeescript',
-  use: ['caching-compiler@2.0.1', 'ecmascript@0.16.11-rc330.0', 'coffeescript-compiler@2.4.2-rc330.0'],
+  use: ['caching-compiler@2.0.1', 'ecmascript@0.16.11', 'coffeescript-compiler@2.4.2'],
   sources: ['compile-coffeescript.js'],
   npmDependencies: {
     // A breaking change was introduced in @babel/runtime@7.0.0-beta.56
diff --git a/packages/server-render/package.js b/packages/server-render/package.js
index 61b82678f7..e71142714a 100644
--- a/packages/server-render/package.js
+++ b/packages/server-render/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "server-render",
-  version: '0.4.3-rc330.0',
+  version: '0.4.3',
   summary: "Generic support for server-side rendering in Meteor apps",
   documentation: "README.md"
 });
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 48c572721f..28b94f29df 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.1-rc330.0',
+  version: '0.6.1',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 16022deea1..cbb25a00bb 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '3.1.0-rc330.0',
+  version: '3.1.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index 2557b86b6b..b84968210d 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.4-rc330.0',
+  version: '5.6.4',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index c0104ba167..1765555052 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.7-rc330.0",
+  version: "2.0.7",
 });
 
 Npm.depends({
diff --git a/poc-change-stream/.gitignore b/poc-change-stream/.gitignore
deleted file mode 100644
index c2658d7d1b..0000000000
--- a/poc-change-stream/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/poc-change-stream/.meteor/.finished-upgraders b/poc-change-stream/.meteor/.finished-upgraders
deleted file mode 100644
index c07b6ff75a..0000000000
--- a/poc-change-stream/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
-1.3.0-split-minifiers-package
-1.4.0-remove-old-dev-bundle-link
-1.4.1-add-shell-server-package
-1.4.3-split-account-service-packages
-1.5-add-dynamic-import-package
-1.7-split-underscore-from-meteor-base
-1.8.3-split-jquery-from-blaze
diff --git a/poc-change-stream/.meteor/.gitignore b/poc-change-stream/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/poc-change-stream/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/poc-change-stream/.meteor/.id b/poc-change-stream/.meteor/.id
deleted file mode 100644
index a8d28fde38..0000000000
--- a/poc-change-stream/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-bcz0tmc9rqc5.c9gmawc30z7b
diff --git a/poc-change-stream/.meteor/packages b/poc-change-stream/.meteor/packages
deleted file mode 100644
index 84c8c0103d..0000000000
--- a/poc-change-stream/.meteor/packages
+++ /dev/null
@@ -1,21 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor-base@1.5.2             # Packages every Meteor app needs to have
-mobile-experience@1.1.2       # Packages for a great mobile UX
-mongo@2.1.1                   # The database Meteor supports right now
-reactive-var@1.0.13            # Reactive variable for tracker
-
-standard-minifier-css@1.9.3   # CSS minifier run for production mode
-standard-minifier-js@3.0.0    # JS minifier run for production mode
-es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.10              # Enable ECMAScript2015+ syntax in app code
-typescript@5.6.3              # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.6.1            # Server-side component of the `meteor shell` command
-hot-module-replacement@0.5.4  # Update client in development without reloading the page
-
-static-html@1.4.0             # Define static page content in .html files
-react-meteor-data       # React higher-order component for reactively tracking Meteor data
diff --git a/poc-change-stream/.meteor/platforms b/poc-change-stream/.meteor/platforms
deleted file mode 100644
index efeba1b50c..0000000000
--- a/poc-change-stream/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-server
-browser
diff --git a/poc-change-stream/.meteor/release b/poc-change-stream/.meteor/release
deleted file mode 100644
index af3560b553..0000000000
--- a/poc-change-stream/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@3.2.2
diff --git a/poc-change-stream/.meteor/versions b/poc-change-stream/.meteor/versions
deleted file mode 100644
index 42710bab84..0000000000
--- a/poc-change-stream/.meteor/versions
+++ /dev/null
@@ -1,68 +0,0 @@
-allow-deny@2.1.0
-autoupdate@2.0.0
-babel-compiler@7.11.3
-babel-runtime@1.5.2
-base64@1.0.13
-binary-heap@1.0.12
-boilerplate-generator@2.0.0
-caching-compiler@2.0.1
-callback-hook@1.6.0
-check@1.4.4
-core-runtime@1.0.0
-ddp@1.4.2
-ddp-client@3.1.0
-ddp-common@1.4.4
-ddp-server@3.1.2
-diff-sequence@1.1.3
-dynamic-import@0.7.4
-ecmascript@0.16.10
-ecmascript-runtime@0.8.3
-ecmascript-runtime-client@0.12.3
-ecmascript-runtime-server@0.11.1
-ejson@1.1.4
-es5-shim@4.8.1
-facts-base@1.0.2
-fetch@0.1.6
-geojson-utils@1.0.12
-hot-code-push@1.0.5
-hot-module-replacement@0.5.4
-id-map@1.2.0
-inter-process-messaging@0.1.2
-launch-screen@2.0.1
-logging@1.3.6
-meteor@2.1.0
-meteor-base@1.5.2
-minifier-css@2.0.1
-minifier-js@3.0.1
-minimongo@2.0.2
-mobile-experience@1.1.2
-mobile-status-bar@1.1.1
-modern-browsers@0.2.1
-modules@0.20.3
-modules-runtime@0.13.2
-modules-runtime-hot@0.14.3
-mongo@2.1.1
-mongo-decimal@0.2.0
-mongo-dev-server@1.1.1
-mongo-id@1.0.9
-npm-mongo@6.10.2
-ordered-dict@1.2.0
-promise@1.0.0
-random@1.2.2
-react-fast-refresh@0.2.9
-react-meteor-data@3.0.4
-reactive-var@1.0.13
-reload@1.3.2
-retry@1.1.1
-routepolicy@1.1.2
-shell-server@0.6.1
-socket-stream-client@0.6.0
-standard-minifier-css@1.9.3
-standard-minifier-js@3.0.0
-static-html@1.4.0
-static-html-tools@1.0.0
-tracker@1.3.4
-typescript@5.6.3
-webapp@2.0.6
-webapp-hashing@1.1.2
-zodern:types@1.0.13
diff --git a/poc-change-stream/client/main.css b/poc-change-stream/client/main.css
deleted file mode 100644
index 7f354f0fa7..0000000000
--- a/poc-change-stream/client/main.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
-  padding: 10px;
-  font-family: sans-serif;
-}
diff --git a/poc-change-stream/client/main.html b/poc-change-stream/client/main.html
deleted file mode 100644
index c0138a665f..0000000000
--- a/poc-change-stream/client/main.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<head>
-  <title>Meteor App</title>
-</head>
-
-<body>
-  <div id="react-target"></div>
-</body>
diff --git a/poc-change-stream/client/main.jsx b/poc-change-stream/client/main.jsx
deleted file mode 100644
index d2e380f93c..0000000000
--- a/poc-change-stream/client/main.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-import { Meteor } from 'meteor/meteor';
-import { App } from '/imports/ui/App';
-
-Meteor.startup(() => {
-  const container = document.getElementById('react-target');
-  const root = createRoot(container);
-  root.render(<App />);
-});
diff --git a/poc-change-stream/imports/api/links.js b/poc-change-stream/imports/api/links.js
deleted file mode 100644
index 2e5ba63122..0000000000
--- a/poc-change-stream/imports/api/links.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-import { Meteor } from 'meteor/meteor';
-
-export const LinksCollection = new Mongo.Collection('links');
-
-if (Meteor.isServer) {
-  Meteor.methods({
-    'links.insert'({ title, url }) {
-      return LinksCollection.insertAsync({ title, url, createdAt: new Date() });
-    },
-  });
-}
diff --git a/poc-change-stream/imports/ui/App.jsx b/poc-change-stream/imports/ui/App.jsx
deleted file mode 100644
index 6f7340caf9..0000000000
--- a/poc-change-stream/imports/ui/App.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { Hello } from './Hello.jsx';
-import { Info } from './Info.jsx';
-
-export const App = () => (
-  <div>
-    <h1>Welcome to Meteor!</h1>
-    <Hello/>
-    <Info/>
-  </div>
-);
diff --git a/poc-change-stream/imports/ui/Hello.jsx b/poc-change-stream/imports/ui/Hello.jsx
deleted file mode 100644
index 936b115062..0000000000
--- a/poc-change-stream/imports/ui/Hello.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { useState } from 'react';
-import { Meteor } from 'meteor/meteor';
-
-export const Hello = () => {
-  const [counter, setCounter] = useState(0);
-
-  const increment = () => {
-    setCounter(counter + 1);
-    Meteor.call('links.insert', {
-      title: `Link #${counter + 1}`,
-      url: `https://example.com/${counter + 1}`,
-    });
-  };
-
-  return (
-    <div>
-      <button onClick={increment}>Click Me</button>
-      <p>You've pressed the button {counter} times.</p>
-    </div>
-  );
-};
diff --git a/poc-change-stream/imports/ui/Info.jsx b/poc-change-stream/imports/ui/Info.jsx
deleted file mode 100644
index de535ec469..0000000000
--- a/poc-change-stream/imports/ui/Info.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { useTracker } from 'meteor/react-meteor-data';
-import { LinksCollection } from '../api/links';
-
-export const Info = () => {
-  const { links, isLoading } = useTracker(() => {
-    const handle = Meteor.subscribe('links');
-    return {
-      links: LinksCollection.find().fetch(),
-      isLoading: !handle.ready(),
-    };
-  }, []);
-
-  if (isLoading) {
-    return <div>Loading...</div>;
-  }
-
-  return (
-    <div>
-      <h2>Learn Meteor!</h2>
-      <ul>{links.map(
-        link => <li key={link._id}>
-          <a href={link.url} target="_blank" rel="noopener noreferrer">{link.title}</a>
-        </li>
-      )}</ul>
-    </div>
-  );
-};
diff --git a/poc-change-stream/package-lock.json b/poc-change-stream/package-lock.json
deleted file mode 100644
index ce7aa8250c..0000000000
--- a/poc-change-stream/package-lock.json
+++ /dev/null
@@ -1,1369 +0,0 @@
-{
-  "name": "meteor-app",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "meteor-app",
-      "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "meteor-node-stubs": "^1.2.5",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "license": "MIT"
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/meteor-node-stubs": {
-      "version": "1.2.19",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.19.tgz",
-      "integrity": "sha512-lryhEAPp7aysrC0j3XU1yTs92ktPQQhzQzLVz3OGQEZjL//iLhvJyeYNSvV01XJn6fXUXe48agossxniJkzYOQ==",
-      "bundleDependencies": [
-        "@meteorjs/crypto-browserify",
-        "assert",
-        "browserify-zlib",
-        "buffer",
-        "console-browserify",
-        "constants-browserify",
-        "domain-browser",
-        "events",
-        "https-browserify",
-        "os-browserify",
-        "path-browserify",
-        "process",
-        "punycode",
-        "querystring-es3",
-        "readable-stream",
-        "stream-browserify",
-        "stream-http",
-        "string_decoder",
-        "timers-browserify",
-        "tty-browserify",
-        "url",
-        "util",
-        "vm-browserify"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@meteorjs/crypto-browserify": "^3.12.1",
-        "assert": "^2.1.0",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^5.7.1",
-        "console-browserify": "^1.2.0",
-        "constants-browserify": "^1.0.0",
-        "domain-browser": "^4.23.0",
-        "events": "^3.3.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.4.1",
-        "querystring-es3": "^0.2.1",
-        "readable-stream": "^3.6.2",
-        "stream-browserify": "^3.0.0",
-        "stream-http": "^3.2.0",
-        "string_decoder": "^1.3.0",
-        "timers-browserify": "^2.0.12",
-        "tty-browserify": "0.0.1",
-        "url": "^0.11.4",
-        "util": "^0.12.5",
-        "vm-browserify": "^1.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign": {
-      "version": "4.2.6",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "bn.js": "^5.2.1",
-        "brorand": "^1.1.0",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "hash-base": "~3.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1",
-        "parse-asn1": "^5.1.7",
-        "readable-stream": "^2.3.8",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/create-ecdh": {
-      "version": "4.0.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify": {
-      "version": "3.12.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "@meteorjs/browserify-sign": "^4.2.3",
-        "@meteorjs/create-ecdh": "^4.0.4",
-        "browserify-cipher": "^1.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "diffie-hellman": "^5.0.3",
-        "hash-base": "~3.0.4",
-        "inherits": "^2.0.4",
-        "pbkdf2": "^3.1.2",
-        "public-encrypt": "^4.0.3",
-        "randombytes": "^2.1.0",
-        "randomfill": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/asn1.js": {
-      "version": "4.10.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/assert": {
-      "version": "2.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-nan": "^1.3.2",
-        "object-is": "^1.1.5",
-        "object.assign": "^4.1.4",
-        "util": "^0.12.5"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/base64-js": {
-      "version": "1.5.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/bn.js": {
-      "version": "5.2.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/brorand": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-des": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-rsa": {
-      "version": "4.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^5.2.1",
-        "randombytes": "^2.1.0",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/buffer": {
-      "version": "5.7.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/call-bind": {
-      "version": "1.0.8",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/call-bound": {
-      "version": "1.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/cipher-base": {
-      "version": "1.0.6",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/console-browserify": {
-      "version": "1.2.0",
-      "inBundle": true
-    },
-    "node_modules/meteor-node-stubs/node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/core-util-is": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-hash": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-hmac": {
-      "version": "1.1.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/define-data-property": {
-      "version": "1.1.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/define-properties": {
-      "version": "1.2.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/des.js": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/domain-browser": {
-      "version": "4.23.0",
-      "inBundle": true,
-      "license": "Artistic-2.0",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/es-define-property": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/es-errors": {
-      "version": "1.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/events": {
-      "version": "3.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/for-each": {
-      "version": "0.3.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/function-bind": {
-      "version": "1.1.2",
-      "inBundle": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/get-proto": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/gopd": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-symbols": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hash-base": {
-      "version": "3.0.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hash.js": {
-      "version": "1.1.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hasown": {
-      "version": "2.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/https-browserify": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/ieee754": {
-      "version": "1.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/meteor-node-stubs/node_modules/inherits": {
-      "version": "2.0.4",
-      "inBundle": true,
-      "license": "ISC"
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-arguments": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-callable": {
-      "version": "1.2.7",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-nan": {
-      "version": "1.3.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-regex": {
-      "version": "1.2.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-typed-array": {
-      "version": "1.1.15",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/isarray": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/md5.js": {
-      "version": "1.3.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "ISC"
-    },
-    "node_modules/meteor-node-stubs/node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-inspect": {
-      "version": "1.13.4",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-is": {
-      "version": "1.1.6",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-keys": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object.assign": {
-      "version": "4.1.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/os-browserify": {
-      "version": "0.3.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/pako": {
-      "version": "1.0.11",
-      "inBundle": true,
-      "license": "(MIT AND Zlib)"
-    },
-    "node_modules/meteor-node-stubs/node_modules/parse-asn1": {
-      "version": "5.1.7",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "asn1.js": "^4.10.1",
-        "browserify-aes": "^1.2.0",
-        "evp_bytestokey": "^1.0.3",
-        "hash-base": "~3.0",
-        "pbkdf2": "^3.1.2",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/path-browserify": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/process": {
-      "version": "0.11.10",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/punycode": {
-      "version": "1.4.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/qs": {
-      "version": "6.14.0",
-      "inBundle": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "inBundle": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/randombytes": {
-      "version": "2.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/randomfill": {
-      "version": "1.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/ripemd160": {
-      "version": "2.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/safe-regex-test": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/set-function-length": {
-      "version": "1.2.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/setimmediate": {
-      "version": "1.0.5",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/sha.js": {
-      "version": "2.4.11",
-      "inBundle": true,
-      "license": "(MIT AND BSD-3-Clause)",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/side-channel": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
-        "side-channel-map": "^1.0.1",
-        "side-channel-weakmap": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/side-channel-map": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/side-channel-weakmap": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3",
-        "side-channel-map": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/stream-browserify": {
-      "version": "3.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/stream-http": {
-      "version": "3.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/string_decoder": {
-      "version": "1.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/tty-browserify": {
-      "version": "0.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/url": {
-      "version": "0.11.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^1.4.1",
-        "qs": "^6.12.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/util": {
-      "version": "0.12.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "for-each": "^0.3.5",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/xtend": {
-      "version": "4.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
-      },
-      "peerDependencies": {
-        "react": "^18.3.1"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    }
-  }
-}
diff --git a/poc-change-stream/package.json b/poc-change-stream/package.json
deleted file mode 100644
index 05d9123f03..0000000000
--- a/poc-change-stream/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "meteor-app",
-  "private": true,
-  "scripts": {
-    "start": "meteor run",
-    "test": "meteor test --once --driver-package meteortesting:mocha",
-    "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
-    "visualize": "meteor --production --extra-packages bundle-visualizer"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.20.7",
-    "meteor-node-stubs": "^1.2.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "meteor": {
-    "mainModule": {
-      "client": "client/main.jsx",
-      "server": "server/main.js"
-    },
-    "testModule": "tests/main.js"
-  }
-}
diff --git a/poc-change-stream/server/main.js b/poc-change-stream/server/main.js
deleted file mode 100644
index 1af7d66ed7..0000000000
--- a/poc-change-stream/server/main.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { LinksCollection } from '/imports/api/links';
-
-async function insertLink({ title, url }) {
-  await LinksCollection.insertAsync({ title, url, createdAt: new Date() });
-}
-
-Meteor.startup(async () => {
-  console.log('[Startup] Meteor server is starting...');
-  // If the Links collection is empty, add some data.
-  const count = await LinksCollection.find().countAsync();
-  console.log(`[Startup] LinksCollection count: ${count}`);
-  if (count === 0) {
-    await insertLink({
-      title: 'Do the Tutorial',
-      url: 'https://www.meteor.com/tutorials/react/creating-an-app',
-    });
-    await insertLink({
-      title: 'Follow the Guide',
-      url: 'https://guide.meteor.com',
-    });
-    await insertLink({
-      title: 'Read the Docs',
-      url: 'https://docs.meteor.com',
-    });
-    await insertLink({
-      title: 'Discussions',
-      url: 'https://forums.meteor.com',
-    });
-    console.log('[Startup] Initial links inserted.');
-  }
-
-  Meteor.publish("links", function () {
-    console.log('[Publish] links publication requested');
-    return LinksCollection.find();
-  });
-
-  // Inicia o Change Stream após o Meteor estar pronto e conectado ao banco
-  try {
-    console.log('[ChangeStream] Tentando iniciar Change Stream...');
-    const changeStream = LinksCollection.watchChangeStream([
-      { $match: { operationType: 'insert' } }
-    ]);
-    console.log('[ChangeStream] Change Stream iniciado:', !!changeStream);
-    changeStream.on('change', (change) => {
-      console.log('[ChangeStream] Evento detectado:', JSON.stringify(change, null, 2));
-    });
-    changeStream.on('error', (err) => {
-      console.error('[ChangeStream] Erro:', err);
-    });
-    changeStream.on('close', () => {
-      console.log('[ChangeStream] Fechado');
-    });
-    changeStream.on('message', (message) => {
-      console.log('[ChangeStream] Mensagem:', message);
-    });
-    console.log('[ChangeStream] Change Stream configurado com sucesso.');
-  } catch (e) {
-    console.error('[ChangeStream] Erro ao iniciar Change Stream:', e);
-  }
-});
diff --git a/poc-change-stream/tests/main.js b/poc-change-stream/tests/main.js
deleted file mode 100644
index 13106983d6..0000000000
--- a/poc-change-stream/tests/main.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import assert from "assert";
-
-describe("meteor-app", function () {
-  it("package.json has correct name", async function () {
-    const { name } = await import("../package.json");
-    assert.strictEqual(name, "meteor-app");
-  });
-
-  if (Meteor.isClient) {
-    it("client is not server", function () {
-      assert.strictEqual(Meteor.isServer, false);
-    });
-  }
-
-  if (Meteor.isServer) {
-    it("server is not client", function () {
-      assert.strictEqual(Meteor.isClient, false);
-    });
-  }
-});
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index b400aa57fd..75cf5a5520 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.2.2",
+  "version": "3.3",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.0.md b/v3-docs/docs/generators/changelog/versions/3.3.0.md
index ae85eff257..49eba103db 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.0.md
@@ -1,4 +1,4 @@
-## v3.3.0, 2025-05-28
+## v3.3.0, 2025-06-11
 
 ### Highlights
 
@@ -17,7 +17,7 @@
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
-React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
+React Packages Changelog: [react-meteor-data@4.0.0](https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data/CHANGELOG.md#v400-2025-06-11)
 
 #### Breaking Changes
 
@@ -26,7 +26,7 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
     - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
     - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
 
-- `react-meteor-data@4.0.0-beta.0`
+- `react-meteor-data@4.0.0`
   - Independent from the core, only applies if upgraded manually.
   - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
 
@@ -41,13 +41,13 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 Please run the following command to update your project:
 
 ```bash
-meteor update --release 3.3-beta.1
+meteor update --release 3.3
 ```
 
 To apply react-meteor-data changes:
 
 ```bash
-meteor add react-meteor-data@4.0.0-beta.0
+meteor add react-meteor-data@4.0.0
 ```
 
 **Add this to your `package.json` to enable the new modern build stack:**
@@ -62,24 +62,24 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.1.1-rc330.0
-- accounts-password@3.2.0-rc330.0
-- autoupdate@2.0.1-rc330.0
-- babel-compiler@7.12.0-rc330.0
-- boilerplate-generator@2.0.1-rc330.0
-- ddp-client@3.1.1-rc330.0
-- ecmascript@0.16.11-rc330.0
-- ejson@1.1.5-rc330.0
-- meteor@2.1.1-rc330.0
-- minifier-js@3.0.2-rc330.0
-- modern-browsers@0.2.2-rc330.0
-- mongo@2.1.2-rc330.0
-- server-render@0.4.3-rc330.0
-- socket-stream-client@0.6.1-rc330.0
-- standard-minifier-js@3.1.0-rc330.0
-- typescript@5.6.4-rc330.0
-- webapp@2.0.7-rc330.0
-- meteor-tool@3.3.0-rc.0
+- accounts-base@3.1.1
+- accounts-password@3.2.0
+- autoupdate@2.0.1
+- babel-compiler@7.12.0
+- boilerplate-generator@2.0.1
+- ddp-client@3.1.1
+- ecmascript@0.16.11
+- ejson@1.1.5
+- meteor@2.1.1
+- minifier-js@3.0.2
+- modern-browsers@0.2.2
+- mongo@2.1.2
+- server-render@0.4.3
+- socket-stream-client@0.6.1
+- standard-minifier-js@3.1.0
+- typescript@5.6.4
+- webapp@2.0.7
+- meteor-tool@3.3.0
 
 #### Bumped NPM Packages
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 51a95aeaf3..432b3d126e 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,7 +10,7 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
-## v3.3.0, 2025-05-28
+## v3.3.0, 2025-06-11
 
 ### Highlights
 
@@ -29,16 +29,16 @@ This is a complete history of changes for Meteor releases.
 
 All Merged PRs@[GitHub PRs 3.3](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3)
 
-React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/meteor/react-packages/blob/fb73eeb89ff59664a7a01769fa1c2c880e72a3e5/packages/react-meteor-data/CHANGELOG.md#v400-beta0-xxx)
+React Packages Changelog: [react-meteor-data@4.0.0](https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data/CHANGELOG.md#v400-2025-06-11)
 
 #### Breaking Changes
 
 - File watching strategy switched to `@parcel/watcher`
-  - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
-  - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
-  - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
+    - Most setups should be fine, but if issues appear, like when using WSL with host, volumes, or remote setups—switch to polling.
+    - Set `METEOR_WATCH_FORCE_POLLING=true` to enable polling.
+    - Set `METEOR_WATCH_POLLING_INTERVAL_MS=1000` to adjust the interval.
 
-- `react-meteor-data@4.0.0-beta.0`
+- `react-meteor-data@4.0.0`
   - Independent from the core, only applies if upgraded manually.
   - useFind describes no deps by default [PR#431](https://github.com/meteor/react-packages/pull/431)
 
@@ -53,13 +53,13 @@ React Packages Changelog: [react-meteor-data@4.0.0-beta.0](https://github.com/me
 Please run the following command to update your project:
 
 ```bash
-meteor update --release 3.3-beta.1
+meteor update --release 3.3
 ```
 
 To apply react-meteor-data changes:
 
 ```bash
-meteor add react-meteor-data@4.0.0-beta.0
+meteor add react-meteor-data@4.0.0
 ```
 
 **Add this to your `package.json` to enable the new modern build stack:**
@@ -74,24 +74,24 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.1.1-rc330.0
-- accounts-password@3.2.0-rc330.0
-- autoupdate@2.0.1-rc330.0
-- babel-compiler@7.12.0-rc330.0
-- boilerplate-generator@2.0.1-rc330.0
-- ddp-client@3.1.1-rc330.0
-- ecmascript@0.16.11-rc330.0
-- ejson@1.1.5-rc330.0
-- meteor@2.1.1-rc330.0
-- minifier-js@3.0.2-rc330.0
-- modern-browsers@0.2.2-rc330.0
-- mongo@2.1.2-rc330.0
-- server-render@0.4.3-rc330.0
-- socket-stream-client@0.6.1-rc330.0
-- standard-minifier-js@3.1.0-rc330.0
-- typescript@5.6.4-rc330.0
-- webapp@2.0.7-rc330.0
-- meteor-tool@3.3.0-rc.0
+- accounts-base@3.1.1
+- accounts-password@3.2.0
+- autoupdate@2.0.1
+- babel-compiler@7.12.0
+- boilerplate-generator@2.0.1
+- ddp-client@3.1.1
+- ecmascript@0.16.11
+- ejson@1.1.5
+- meteor@2.1.1
+- minifier-js@3.0.2
+- modern-browsers@0.2.2
+- mongo@2.1.2
+- server-render@0.4.3
+- socket-stream-client@0.6.1
+- standard-minifier-js@3.1.0
+- typescript@5.6.4
+- webapp@2.0.7
+- meteor-tool@3.3.0
 
 #### Bumped NPM Packages
 
@@ -101,9 +101,9 @@ meteor add react-meteor-data@4.0.0-beta.0
 
 ✨✨✨
 
-- [@nachocodoner](https://github.com/nachocodoner)
+- [@nachocodoner](https://github.com/nachocodoner)  
 - [@italojs](https://github.com/italojs)
-- [@Grubba27](https://github.com/Grubba27)
+- [@Grubba27](https://github.com/Grubba27)  
 - [@zodern](https://github.com/zodern)
 - [@9Morello](https://github.com/9Morello)
 - [@welkinwong](https://github.com/welkinwong)
@@ -113,7 +113,7 @@ meteor add react-meteor-data@4.0.0-beta.0
 - [@ericm546](https://github.com/ericm546)
 - [@StorytellerCZ](https://github.com/StorytellerCZ)
 
-✨✨✨
+✨✨✨ 
 
 ## v3.2.2, 2025-05-02
 

From 6dbc0dc6b1ee6a8d93236ff775d96350b9b46686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 12 Jun 2025 16:31:39 +0200
Subject: [PATCH 259/264] set properly latest Meteor 3.3 version

---
 v3-docs/v3-migration-docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 3a1b941e79..ea5839cdab 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,5 +1,5 @@
 ---
-meteor_version: 3.1.0
+meteor_version: 3.3
 node_version: 22.16.0
 npm_version: 10.9.2
 ---

From 1117a52d8470d84ebaf5a951848120b24551597b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 13 Jun 2025 18:06:05 +0200
Subject: [PATCH 260/264] fix docs

---
 v3-docs/docs/cli/index.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 3bde9baba5..b05a129e16 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1488,7 +1488,6 @@ TINYTEST_FILTER=myTestName meteor test-packages
 
 # Test on mobile device
 meteor test-packages --ios-device
-```
 
 ## meteor admin {#meteoradmin}
 

From 67fc97e60b7a931520cc8d6eb64410803a1c755f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 13 Jun 2025 18:08:14 +0200
Subject: [PATCH 261/264] fix docs

---
 v3-docs/docs/cli/index.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index b05a129e16..9fd95d1e86 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1465,19 +1465,19 @@ If no packages are specified, all available packages will be tested.
 ### Examples
 
 
-# Test specific packages by name
+#### Test specific packages by name
 meteor test-packages accounts-base accounts-password
 
-# Test a package by path
+#### Test a package by path
 meteor test-packages ./packages/my-package
 
-# Test with custom settings
+#### Test with custom settings
 meteor test-packages --settings settings.json
 
-# Test with Mocha test driver
+#### Test with Mocha test driver
 meteor test-packages --driver-package meteortesting:mocha
 
-# Test with filter
+#### Test with filter
 meteor test-packages --filter myTestName
 
 Alternatively, you can use the `TINYTEST_FILTER` environment variable to filter:
@@ -1486,7 +1486,7 @@ Alternatively, you can use the `TINYTEST_FILTER` environment variable to filter:
 TINYTEST_FILTER=myTestName meteor test-packages
 ```
 
-# Test on mobile device
+#### Test on mobile device
 meteor test-packages --ios-device
 
 ## meteor admin {#meteoradmin}

From 4a17ce5897cf94f84efd8f93cfc14d1d42071588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 13 Jun 2025 18:08:54 +0200
Subject: [PATCH 262/264] fix docs

---
 v3-docs/docs/cli/index.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 9fd95d1e86..a13af6c37a 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1464,7 +1464,6 @@ If no packages are specified, all available packages will be tested.
 
 ### Examples
 
-
 #### Test specific packages by name
 meteor test-packages accounts-base accounts-password
 

From 7f22966bb1c8e9ccc195f5d56579436cb567325e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 13 Jun 2025 18:10:14 +0200
Subject: [PATCH 263/264] fix docs

---
 v3-docs/docs/cli/index.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index a13af6c37a..809578932f 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1465,23 +1465,38 @@ If no packages are specified, all available packages will be tested.
 ### Examples
 
 #### Test specific packages by name
+
+```bash
 meteor test-packages accounts-base accounts-password
+```
 
 #### Test a package by path
+
+```bash
 meteor test-packages ./packages/my-package
+```
 
 #### Test with custom settings
+
+```bash
 meteor test-packages --settings settings.json
+```
 
 #### Test with Mocha test driver
+
+```bash
 meteor test-packages --driver-package meteortesting:mocha
+```
 
 #### Test with filter
+
+```bash
 meteor test-packages --filter myTestName
+```
 
 Alternatively, you can use the `TINYTEST_FILTER` environment variable to filter:
 
-```sh
+```bash
 TINYTEST_FILTER=myTestName meteor test-packages
 ```
 

From 0a3bc8fa566c03267da7376a77a3e62e4dda3b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 13 Jun 2025 18:14:28 +0200
Subject: [PATCH 264/264] fix docs

---
 v3-docs/docs/cli/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 809578932f..c72bded0bc 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1501,7 +1501,10 @@ TINYTEST_FILTER=myTestName meteor test-packages
 ```
 
 #### Test on mobile device
+
+```bash
 meteor test-packages --ios-device
+```
 
 ## meteor admin {#meteoradmin}