@quilted/rollup 0.2.10 → 0.2.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/rollup
 
+## 0.2.12
+
+### Patch Changes
+
+- [`c680fb6c`](https://github.com/lemonmade/quilt/commit/c680fb6cf997358892d1aac9189e561159067f8c) Thanks [@lemonmade](https://github.com/lemonmade)! - Output workers as ESModules when supported
+
+## 0.2.11
+
+### Patch Changes
+
+- [`ceb1549f`](https://github.com/lemonmade/quilt/commit/ceb1549f81d7ab451cfacca53c6d6d9664e72e42) Thanks [@lemonmade](https://github.com/lemonmade)! - More development worker tweaks
+
 ## 0.2.10
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -6,7 +6,7 @@ import { resolveEnvOption } from './features/env.mjs';
 import { multiline } from './shared/strings.mjs';
 import { getNodePlugins, removeBuildFiles, normalizeRollupInput } from './shared/rollup.mjs';
 import { createMagicModulePlugin } from './shared/magic-module.mjs';
-import { getBrowserGroups, getBrowserGroupTargetDetails, targetsSupportModules, rollupGenerateOptionsForBrowsers, getBrowserGroupRegularExpressions } from './shared/browserslist.mjs';
+import { getBrowserGroups, getBrowserGroupTargetDetails, targetsSupportModules, rollupGenerateOptionsForBrowsers, targetsSupportModuleWebWorkers, getBrowserGroupRegularExpressions } from './shared/browserslist.mjs';
 import { Project } from './shared/project.mjs';
 
 const require = createRequire(import.meta.url);
@@ -121,7 +121,8 @@ async function quiltAppBrowser({
     { systemJS },
     { workers },
     { esnext },
-    nodePlugins
+    nodePlugins,
+    supportsModuleWorkers
   ] = await Promise.all([
     import('rollup-plugin-visualizer'),
     import('./features/env.mjs'),
@@ -135,7 +136,8 @@ async function quiltAppBrowser({
     import('./features/system-js.mjs'),
     import('./features/workers.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle: true })
+    getNodePlugins({ bundle: true }),
+    targetsSupportModuleWebWorkers(browserGroup.browsers)
   ]);
   const plugins = [
     quiltAppBrowserInput({ root: project.root, entry }),
@@ -181,9 +183,8 @@ async function quiltAppBrowser({
     }),
     workers({
       baseURL,
+      format: supportsModuleWorkers ? "module" : "classic",
       outputOptions: {
-        format: "iife",
-        inlineDynamicImports: true,
         dir: project.resolve(`build/assets`),
         entryFileNames: `[name]${targetFilenamePart}.[hash].js`,
         assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,

package/build/esm/features/workers.mjs

@@ -7,6 +7,7 @@ const PREFIX = "\0quilt-worker:";
 const ENTRY_PREFIX = "\0quilt-worker-entry:";
 const MAGIC_MODULE_WORKER = "quilt:module/worker.js";
 function workers({
+  format = "classic",
   write = false,
   baseURL,
   plugins = defaultPlugins,
@@ -54,8 +55,8 @@ function workers({
       };
       const workerInputOptions = typeof inputOptions === "function" ? await inputOptions(baseInputOptions, context) : baseInputOptions;
       const baseOutputOptions = {
-        format: "iife",
-        inlineDynamicImports: true,
+        format: format === "classic" ? "iife" : "esm",
+        inlineDynamicImports: format === "classic",
         dir: "workers",
         entryFileNames: `[name].[hash].js`,
         assetFileNames: `[name].[hash].[ext]`,
@@ -77,9 +78,9 @@ function workers({
         this.addWatchFile(module2);
       }
       const filename = firstChunk.fileName;
-      let resolvedBaseURL = filename;
+      let resolvedURL = filename;
       if (typeof baseURL === "string") {
-        resolvedBaseURL = posix.join(baseURL, filename);
+        resolvedURL = posix.join(baseURL, filename);
       } else if (typeof baseURL === "function") {
         const returnedBaseURL = await baseURL({
           ...context,
@@ -88,10 +89,13 @@ function workers({
           outputOptions: workerOutputOptions
         });
         if (returnedBaseURL) {
-          resolvedBaseURL = posix.join(returnedBaseURL, filename);
+          resolvedURL = posix.join(returnedBaseURL, filename);
         }
       }
-      return `export default ${JSON.stringify(resolvedBaseURL)};`;
+      return `export default ${JSON.stringify({
+        type: format,
+        source: resolvedURL
+      })};`;
     },
     generateBundle(_, bundle) {
       if (write)
@@ -169,4 +173,4 @@ function wrapperToSearchString(wrapper) {
   return `?${new URLSearchParams(Object.entries(wrapper)).toString()}`;
 }
 
-export { parseWorkerImport, serializeWorkerImport, workerMagicModules, workers };
+export { PREFIX, contentForWorker, workers };

package/build/esm/shared/browserslist.mjs

@@ -62,9 +62,7 @@ async function targetsSupportModules(targets) {
   esmBrowserslist ??= (async () => {
     const { default: browserslist } = await import('browserslist');
     return new Set(
-      browserslist(
-        "defaults and fully supports es6-module and fully supports es6-module-dynamic-import"
-      )
+      browserslist("defaults and fully supports es6-module-dynamic-import")
     );
   })();
   const esmBrowsers = await esmBrowserslist;
@@ -98,41 +96,21 @@ async function rollupGenerateOptionsForBrowsers(browsers) {
   let constBindings = true;
   let objectShorthand = true;
   let symbols = true;
-  const isSupported = (browser, version, supportList) => {
-    const supportedVersionDetails = supportList[browser];
-    if (supportedVersionDetails == null)
-      return false;
-    const supportedVersion = semver.coerce(
-      supportedVersionDetails.version_added
-    );
-    if (supportedVersion == null)
-      return false;
-    return semver.gte(version, supportedVersion);
-  };
-  for (const browser of browsers) {
-    const [name, version] = browser.split(" ");
-    const semverVersion = semver.coerce(version);
-    if (semverVersion == null)
-      continue;
-    const mdnBrowser = BROWSESLIST_BROWSER_TO_MDN_BROWSER.get(name);
-    if (mdnBrowser == null)
-      continue;
+  for (const { name, version } of mdnBrowserVersions(browsers, semver)) {
     arrowFunctions &&= isSupported(
-      mdnBrowser,
-      semverVersion,
-      arrowFunctionsSupport
-    );
-    constBindings &&= isSupported(
-      mdnBrowser,
-      semverVersion,
-      constBindingsSupport
+      arrowFunctionsSupport,
+      name,
+      version,
+      semver
     );
+    constBindings &&= isSupported(constBindingsSupport, name, version, semver);
     objectShorthand &&= isSupported(
-      mdnBrowser,
-      semverVersion,
-      objectShorthandSupport
+      objectShorthandSupport,
+      name,
+      version,
+      semver
     );
-    symbols &&= isSupported(mdnBrowser, semverVersion, symbolsSupport);
+    symbols &&= isSupported(symbolsSupport, name, version, semver);
   }
   return {
     preset: "es2015",
@@ -143,5 +121,36 @@ async function rollupGenerateOptionsForBrowsers(browsers) {
     symbols
   };
 }
+async function targetsSupportModuleWebWorkers(browsers) {
+  const [{ default: semver }, { default: mdn }] = await Promise.all([
+    import('semver'),
+    import('@mdn/browser-compat-data', { assert: { type: 'json' } })
+  ]);
+  const workerModulesSupport = mdn.api.Worker.Worker.ecmascript_modules.__compat.support;
+  return [...mdnBrowserVersions(browsers, semver)].every(
+    ({ name, version }) => isSupported(workerModulesSupport, name, version, semver)
+  );
+}
+function* mdnBrowserVersions(browsers, semver) {
+  for (const browser of browsers) {
+    const [name, version] = browser.split(" ");
+    const mdnBrowser = BROWSESLIST_BROWSER_TO_MDN_BROWSER.get(name);
+    if (mdnBrowser == null)
+      continue;
+    const semverVersion = semver.coerce(version);
+    if (semverVersion == null)
+      continue;
+    yield { name: mdnBrowser, version: semverVersion };
+  }
+}
+function isSupported(supportList, browser, version, semver) {
+  const supportedVersionDetails = supportList[browser];
+  if (supportedVersionDetails == null)
+    return false;
+  const supportedVersion = semver.coerce(supportedVersionDetails.version_added);
+  if (supportedVersion == null)
+    return false;
+  return semver.gte(version, supportedVersion);
+}
 
-export { getBrowserGroupRegularExpressions, getBrowserGroupTargetDetails, getBrowserGroups, rollupGenerateOptionsForBrowsers, targetsSupportModules };
+export { getBrowserGroupRegularExpressions, getBrowserGroupTargetDetails, getBrowserGroups, rollupGenerateOptionsForBrowsers, targetsSupportModuleWebWorkers, targetsSupportModules };