Merge branch 'main' into cb/copy-task-ignore

Author: christian-bromann

package-lock.json

@@ -154,7 +154,7 @@
     "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "eslint-plugin-wdio": "^8.24.12",
-    "execa": "8.0.1",
+    "execa": "9.3.0",
     "exit": "^0.1.2",
     "fs-extra": "^11.0.0",
     "glob": "10.4.1",
@@ -181,7 +181,7 @@
     "semver": "^7.3.7",
     "terser": "5.31.1",
     "tsx": "^4.10.3",
-    "typescript": "~5.4.0",
+    "typescript": "~5.5.3",
     "webpack": "^5.75.0",
     "ws": "8.17.1"
   },

package.json

@@ -57,7 +57,7 @@
     {
       // Increment this value as a part of updating TypeScript
       matchPackageNames: ['typescript'],
-      allowedVersions: '<5.5.0',
+      allowedVersions: '<5.6.0',
       commitMessagePrefix: "feat(typescript):"
     },
     {
@@ -152,7 +152,7 @@
   rebaseWhen: 'never',
   /**
    * Cron syntax to run at midnight (UTC) on the first day of every month
-   * 
+   *
    * Note: Renovate does not support minute value granularity, so the wildcard value is necessary
    */
   schedule: ["* 0 1 * *"],

renovate.json5

@@ -74,25 +74,6 @@ export async function bundleTypeScriptSource(tsPath: string, opts: BuildOptions)
   const jestTypesciptFilename = join(opts.scriptsBuildDir, 'typescript-modified-for-jest.js');
   await fs.writeFile(jestTypesciptFilename, code);
 
-  // Here we transform the TypeScript source from a commonjs to an ES module.
-  // We do this so that we can add an import from the `@environment` module.
-
-  // trim off the last part that sets module.exports and polyfills globalThis since
-  // we don't want typescript to add itself to module.exports when in a node env
-  const tsEnding = `if (typeof module !== "undefined" && module.exports) { module.exports = ts; }`;
-
-  if (!code.includes(tsEnding)) {
-    throw new Error(`"${tsEnding}" not found`);
-  }
-  const lastEnding = code.lastIndexOf(tsEnding);
-  code = code.slice(0, lastEnding);
-
-  const o: string[] = [];
-  o.push(`// TypeScript ${opts.typescriptVersion}`);
-  o.push(code);
-  o.push(`export default ts;`);
-  code = o.join('\n');
-
   // TODO(STENCIL-839): investigate minification issue w/ typescript 5.0
   // const { minify } = await import('terser');
 

scripts/esbuild/utils/typescript-source.ts

@@ -5,6 +5,33 @@ import { buildAll } from './build';
 import { BuildOptions } from './utils/options';
 import { isPrereleaseVersion, isValidVersionInput, SEMVER_INCREMENTS, updateChangeLog } from './utils/release-utils';
 
+/**
+ * We have to wrap `execa` in a promise to ensure it works with `Listr`. `Listr` uses rxjs under the hood which
+ * seems to have issues with `execa`'s `ResultPromise` as it never resolves a task.
+ * @param command command to run
+ * @param args    arguments to pass to the command
+ * @param options `execa` options
+ * @returns a promise that resolves with the stdout and stderr of the command
+ */
+async function execa(command: string, args: string[], options?: any) {
+  /**
+   * consecutive imports are cached and don't have an impact on the execution speed
+   */
+  const { execa: execaOrig } = await import('execa');
+
+  return new Promise<{ stdout: string; stderr: string }>((resolve, reject) => {
+    const run = execaOrig(command, args, options);
+    run.then(
+      ({ stdout, stderr }) =>
+        resolve({
+          stdout: stdout as unknown as string,
+          stderr: stderr as unknown as string,
+        }),
+      (err) => reject(err),
+    );
+  });
+}
+
 /**
  * Runs a litany of tasks used to ensure a safe release of a new version of Stencil
  * @param opts build options containing the metadata needed to release a new version of Stencil
@@ -18,8 +45,6 @@ export async function runReleaseTasks(opts: BuildOptions, args: ReadonlyArray<st
   const isDryRun = args.includes('--dry-run') || opts.version.includes('dryrun');
   let tagPrefix: string;
 
-  const { execa } = await import('execa');
-
   if (isDryRun) {
     console.log(color.bold.yellow(`\n  🏃‍ Dry Run!\n`));
   }

scripts/release-tasks.ts

@@ -121,7 +121,7 @@ export const getRollupOptions = (
       userIndexPlugin(config, compilerCtx),
       typescriptPlugin(compilerCtx, bundleOpts, config),
       extFormatPlugin(config),
-      extTransformsPlugin(config, compilerCtx, buildCtx, bundleOpts),
+      extTransformsPlugin(config, compilerCtx, buildCtx),
       workerPlugin(config, compilerCtx, buildCtx, bundleOpts.platform, !!bundleOpts.inlineWorkers),
       serverPlugin(config, bundleOpts.platform),
       ...beforePlugins,