Merge pull request #5340 from video-dev/task/rollup-esm-and-worker-tj

More rollup PR tweaks

.gitignore

@@ -22,6 +22,7 @@ coverage/
 /cloudflare-pages
 /api-docs
 /api-docs-markdown
+/karma-temp
 
 # eslint
 .eslintcache

build-config.js

@@ -42,7 +42,9 @@ const addContentSteeringSupport =
 const addVariableSubstitutionSupport =
   !!env.VARIABLE_SUBSTITUTION || !!env.USE_VARIABLE_SUBSTITUTION;
 
-const buildConstants = (type, format) => ({
+const shouldBundleWorker = (format) => format !== FORMAT.esm;
+
+const buildConstants = (type, additional = {}) => ({
   preventAssignment: true,
   values: {
     __VERSION__: JSON.stringify(pkgJson.version),
@@ -60,6 +62,7 @@ const buildConstants = (type, format) => ({
     __USE_VARIABLE_SUBSTITUTION__: JSON.stringify(
       type === BUILD_TYPE.full || addVariableSubstitutionSupport
     ),
+    ...additional,
   },
 });
 
@@ -240,16 +243,19 @@ const buildRollupConfig = ({
         ? `./dist/${outputName}.min.${extension}`
         : `./dist/${outputName}.${extension}`,
       format,
-      banner: format === FORMAT.esm ? null : workerFnBanner,
-      footer: format === FORMAT.esm ? null : workerFnFooter,
+      banner: shouldBundleWorker(format) ? workerFnBanner : null,
+      footer: shouldBundleWorker(format) ? workerFnFooter : null,
       sourcemap,
       sourcemapFile: minified
         ? `${outputName}.${extension}.min.map`
         : `${outputName}.${extension}.map`,
     },
     plugins: [
       ...basePlugins,
-      replace(buildConstants(type, format)),
+      replace(buildConstants(type)),
+      ...(!shouldBundleWorker(format)
+        ? [alias({ entries: { './transmuxer-worker': '../empty.js' } })]
+        : []),
       ...(type === BUILD_TYPE.light
         ? [alias({ entries: getAliasesForLightDist() })]
         : []),
@@ -300,14 +306,16 @@ const configs = Object.entries({
       name: 'HlsWorker',
       file: './dist/hls.worker.js',
       format: FORMAT.iife,
-      banner: workerFnBanner,
-      footer: workerFnFooter.replace('false', 'true'),
       sourcemap: true,
       sourcemapFile: 'hls.worker.js.map',
     },
     plugins: [
       ...basePlugins,
-      replace(buildConstants(BUILD_TYPE.full, FORMAT.iife)),
+      replace(
+        buildConstants(BUILD_TYPE.full, {
+          __IN_WORKER__: JSON.stringify(true),
+        })
+      ),
       buildBabelLegacyBrowsers({ stripConsole: true }),
       terser(),
     ],

karma.conf.js

@@ -11,7 +11,7 @@ const rollupPreprocessor = buildRollupConfig({
   allowCircularDeps: true,
   includeCoverage,
   sourcemap: false,
-  outputFile: 'temp/tests.js',
+  outputFile: 'karma-temp/tests.js',
 });
 
 // preprocess matching files before serving them to the browser

src/demux/inject-worker.ts

@@ -1,3 +1,7 @@
+// ensure the worker ends up in the bundle
+// If the worker should not be included this gets aliased to empty.js
+import './transmuxer-worker';
+
 export function hasUMDWorker(): boolean {
   return typeof __HLS_WORKER_BUNDLE__ === 'function';
 }