Fix UMD packaging. (#52)

kshetline · web-flow · commit 620c27031704 · 2025-07-10T20:49:11.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 _Updates limited to IANA tzdb updates omitted._
 
+### 3.10.3
+
+* Fix UMD packaging.
+
 ### 3.10.2
 
 * Fixed a very edge-case bug where `getSecondsInDay()` and `getMinutesInDay()` might return 0 for the very last Julian calendar date before a transition to the Gregorian calendar.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tubular/time",
-  "version": "3.10.2",
+  "version": "3.10.3",
   "description": "Date/time, IANA timezones, leap seconds, TAI/UTC conversions, calendar with settable Julian/Gregorian switchover",
   "module": "dist/index.min.mjs",
   "main": "dist/index.min.cjs",
@@ -63,6 +63,7 @@
     "json-z": "^6.0.0"
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@stylistic/eslint-plugin": "^4.4.1",
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,14 +1,52 @@
+const nodeResolve = require('@rollup/plugin-node-resolve');
 const sourcemaps = require('rollup-plugin-sourcemaps');
 const terser = require('@rollup/plugin-terser');
 const typescript = require('@rollup/plugin-typescript');
 const pkg = require('./package.json');
 
-// noinspection JSUnusedGlobalSymbols
-module.exports = [{
-  external: ['by-request', 'json-z', '@tubular/math', '@tubular/util'],
-  input: 'src/index.ts',
-  output: [
-    {
+function trimUmd() {
+  // noinspection JSUnusedGlobalSymbols
+  return {
+    name: 'mixExports',
+    renderChunk(code, _chunk, options) {
+      if (options.format === 'umd') {
+        // Strip out dynamic import() so it doesn't generate warnings.
+        code = code.replace(/return import\(.*?\/\* webpackIgnore: true \*\/.*?tseuqer-yb.*?\.join\(''\)\)/s, 'return null');
+        // Strip out large and large-alt timezone definitions from UMD build.
+        code = code.replace(/(?<!timezoneSmall = )\/\* trim-file-start \*\/.*?\/\* trim-file-end \*\//sg, 'null');
+      }
+
+      return { code, map: null };
+    }
+  };
+}
+
+const plugins = [
+  nodeResolve(),
+  typescript({ inlineSources: true }),
+  trimUmd(),
+  sourcemaps(),
+  terser({
+    output: {
+      comments: (node, comment) => {
+        return comment.type === 'comment2' && /\b(webpackIgnore|vite-ignore)\b/.test(comment.value);
+      },
+      max_line_len: 511
+    },
+    sourceMap: { includeSources: true }
+  })
+];
+
+const onwarn = (code, defaultHandler) => {
+  if (code.code !== 'MIXED_EXPORTS')
+    defaultHandler(code);
+};
+
+// noinspection JSUnusedGlobalSymbols,CommaExpressionJS
+module.exports = [
+  {
+    input: 'src/index.ts',
+    output: {
       file: pkg.browser,
       sourcemap: true,
       format: 'umd',
@@ -20,32 +58,25 @@ module.exports = [{
         'by-request': '_by_request_' // Never used, only specified to suppress warning
       }
     },
-    {
-      file: pkg.main,
-      sourcemap: true,
-      format: 'cjs'
-    },
-    {
-      file: pkg.module,
-      sourcemap: true,
-      format: 'esm'
-    }
-  ],
-  plugins: [
-    typescript({ inlineSources: true }),
-    sourcemaps(),
-    terser({
-      output: {
-        comments: (node, comment) => {
-          return comment.type === 'comment2' && /\b(webpackIgnore|vite-ignore)\b/.test(comment.value);
-        },
-        max_line_len: 511
+    plugins,
+    onwarn
+  },
+  {
+    external: ['by-request', 'json-z', '@tubular/math', '@tubular/util'],
+    input: 'src/index.ts',
+    output: [
+      {
+        file: pkg.main,
+        sourcemap: true,
+        format: 'cjs'
       },
-      sourceMap: { includeSources: true }
-    })
-  ],
-  onwarn(code, defaultHandler) {
-    if (code.code !== 'MIXED_EXPORTS')
-      defaultHandler(code);
+      {
+        file: pkg.module,
+        sourcemap: true,
+        format: 'esm'
+      }
+    ],
+    plugins: (plugins.slice(0).splice(0, 1).splice(2, 1), plugins),
+    onwarn
   }
-}];
+];
diff --git a/test.html b/test.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>Browser Check</title>
-  <script src="dist/umd/index.js"></script>
+  <script src="dist/index.min.js"></script>
 </head>
 <body>
   <script>
@@ -31,6 +31,10 @@
 
       document.write('<br><br>\n');
     }
+
+    const zones = tbTime.Timezone.getAvailableTimezones().join('<br>\n');
+
+    document.write(zones + '<br><br>\n');
   </script>
 </body>
 </html>
