Merge branch 'upstream/main' into escape-sequence

Author: graphemecluster

.github/codeql/codeql-configuration.yml

@@ -3,32 +3,6 @@ name : CodeQL Configuration
 paths:
   - src
   - scripts
-  - Gulpfile.mjs
+  - Herebyfile.mjs
 paths-ignore:
   - src/lib
-
-# These queries appear to time out after the module conversion.
-# https://github.com/github/codeql/issues/10937
-query-filters:
-  - exclude:
-      id: js/path-injection # TaintedPath.ql
-  - exclude:
-      id: js/command-line-injection # CommandInjection.ql
-  - exclude:
-      id: js/code-injection # CodeInjection.ql
-  - exclude:
-      id: js/bad-code-sanitization # ImproperCodeSanitization.ql
-  - exclude:
-      id: js/unsafe-dynamic-method-access # UnsafeDynamicMethodAccess.ql
-  - exclude:
-      id: js/clear-text-logging # CleartextLogging.ql
-  - exclude:
-      id: js/regex-injection # RegExpInjection.ql
-  - exclude:
-      id: js/unvalidated-dynamic-method-call # UnvalidatedDynamicMethodCall.ql
-  - exclude:
-      id: js/insecure-download # InsecureDownload.ql
-  - exclude:
-      id: js/prototype-polluting-assignment # PrototypePollutingAssignment.ql
-  - exclude:
-      id: js/request-forgery # RequestForgery.ql

.gitignore

@@ -84,3 +84,4 @@ tests/cases/user/puppeteer/puppeteer
 tests/cases/user/axios-src/axios-src
 tests/cases/user/prettier/prettier
 .eslintcache
+*v8.log

Herebyfile.mjs

@@ -160,7 +160,6 @@ async function runDtsBundler(entrypoint, output) {
  * @param {BundlerTaskOptions} [taskOptions]
  *
  * @typedef BundlerTaskOptions
- * @property {string[]} [external]
  * @property {boolean} [exportIsTsObject]
  * @property {boolean} [treeShaking]
  * @property {esbuild.WatchMode} [watchMode]
@@ -179,32 +178,10 @@ function createBundler(entrypoint, outfile, taskOptions = {}) {
             sourcemap: "linked",
             sourcesContent: false,
             treeShaking: taskOptions.treeShaking,
-            external: [
-                ...(taskOptions.external ?? []),
-                "source-map-support",
-            ],
+            packages: "external",
             logLevel: "warning",
             // legalComments: "none", // If we add copyright headers to the source files, uncomment.
             plugins: [
-                {
-                    name: "no-node-modules",
-                    setup: (build) => {
-                        build.onLoad({ filter: /[\\/]node_modules[\\/]/ }, () => {
-                            // Ideally, we'd use "--external:./node_modules/*" here, but that doesn't work; we
-                            // will instead end up with paths to node_modules rather than the package names.
-                            // Instead, we'll return a load error when we see that we're trying to bundle from
-                            // node_modules, then explicitly declare which external dependencies we rely on, which
-                            // ensures that the correct module specifier is kept in the output (the non-wildcard
-                            // form works properly). It also helps us keep tabs on what external dependencies we
-                            // may be importing, which is handy.
-                            //
-                            // See: https://github.com/evanw/esbuild/issues/1958
-                            return {
-                                errors: [{ text: 'Attempted to bundle from node_modules; ensure "external" is set correctly.' }]
-                            };
-                        });
-                    }
-                },
                 {
                     name: "fix-require",
                     setup: (build) => {
@@ -448,14 +425,6 @@ const { main: tests, watch: watchTests } = entrypointBuildTask({
     bundlerOptions: {
         // Ensure we never drop any dead code, which might be helpful while debugging.
         treeShaking: false,
-        // These are directly imported via import statements and should not be bundled.
-        external: [
-            "chai",
-            "del",
-            "diff",
-            "mocha",
-            "ms",
-        ],
         watchMode: {
             onRebuild() {
                 watchTestsEmitter.emit("rebuild");