From 738144de5ff61e119dee6105f1658e8350d7c737 Mon Sep 17 00:00:00 2001
From: Take Weiland <diesieben07@gmail.com>
Date: Mon, 11 Aug 2025 21:49:18 +0200
Subject: [PATCH 1/2] Fix the build ES6 code having the wrong file extension
 and use it in package.json exports

(cherry picked from commit 23d6182d3d683ef292e9d9228de42d8a04c570be)
---
 package.json   |  6 +++---
 tasks/build.js | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 8a7dfcfbd..873b8a42b 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "repository": "https://github.com/moment/luxon",
   "exports": {
     ".": {
-      "import": "./src/luxon.js",
+      "import": "./build/es6/luxon.mjs",
       "require": "./build/node/luxon.js"
     },
     "./package.json": "./package.json"
@@ -78,8 +78,8 @@
     "build/global/luxon.js.map",
     "build/global/luxon.min.js",
     "build/global/luxon.min.js.map",
-    "build/es6/luxon.js",
-    "build/es6/luxon.js.map",
+    "build/es6/luxon.mjs",
+    "build/es6/luxon.mjs.map",
     "src"
   ],
   "license": "MIT",
diff --git a/tasks/build.js b/tasks/build.js
index fc07b32ff..e2d0bff9b 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -86,12 +86,15 @@ async function buildLibrary(dest, opts) {
   console.log("Building", dest);
   const promises = [babelAndRollup(dest, opts)];
 
+  const filename = opts.filename || "luxon.js";
+  const minFilename = filename.replace(/\.(m?js)$/, ".min.$1");
+
   if (opts.minify && TRUST_MINIFY) {
     promises.push(
       babelAndRollup(dest, {
         ...opts,
         minify: true,
-        filename: "luxon.min.js",
+        filename: minFilename,
       })
     );
   }
@@ -99,21 +102,21 @@ async function buildLibrary(dest, opts) {
   await Promise.all(promises);
 
   if (opts.minify && !TRUST_MINIFY) {
-    const code = fs.readFileSync(`build/${dest}/luxon.js`, "utf8"),
+    const code = fs.readFileSync(`build/${dest}/${filename}`, "utf8"),
       ugly = UglifyJS.minify(code, {
         toplevel: !opts.global,
         output: {
           comments: false,
         },
         sourceMap: {
-          filename: `build/${dest}/luxon.js`,
+          filename: `build/${dest}/${filename}`,
         },
       });
     if (ugly.error) {
       console.error("Error uglifying", ugly.error);
     } else {
-      fs.writeFileSync(`build/${dest}/luxon.min.js`, ugly.code);
-      fs.writeFileSync(`build/${dest}/luxon.min.js.map`, ugly.map);
+      fs.writeFileSync(`build/${dest}/${minFilename}`, ugly.code);
+      fs.writeFileSync(`build/${dest}/${minFilename}.map`, ugly.map);
     }
   }
   console.log("Built", dest);
@@ -153,6 +156,7 @@ async function es6() {
     format: "es",
     minify: true,
     compile: false,
+    filename: "luxon.mjs",
   });
 }
 

From 4262a38ded7762e22608a9feb9f117b40d338ced Mon Sep 17 00:00:00 2001
From: Take Weiland <diesieben07@gmail.com>
Date: Fri, 5 Sep 2025 12:13:28 +0200
Subject: [PATCH 2/2] Version 3.7.2

---
 CHANGELOG.md      | 3 +++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 src/luxon.js      | 2 +-
 src/package.json  | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9cb9a2a7..e79074439 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+# 3.7.2 (2025-07-09)
+- Fix ES6 packaging
+
 # 3.7.1 (2025-07-09)
 - Revert change in ES6 packaging
 
diff --git a/package-lock.json b/package-lock.json
index 7adbdb4d2..a7a694428 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "luxon",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "luxon",
-      "version": "3.7.1",
+      "version": "3.7.2",
       "license": "MIT",
       "devDependencies": {
         "@babel/core": "^7.18.6",
diff --git a/package.json b/package.json
index 873b8a42b..f80269b17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "luxon",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "Immutable date wrapper",
   "author": "Isaac Cambron",
   "keywords": [
diff --git a/src/luxon.js b/src/luxon.js
index e0d4bfab7..9cfd39f8f 100644
--- a/src/luxon.js
+++ b/src/luxon.js
@@ -9,7 +9,7 @@ import InvalidZone from "./zones/invalidZone.js";
 import SystemZone from "./zones/systemZone.js";
 import Settings from "./settings.js";
 
-const VERSION = "3.7.1";
+const VERSION = "3.7.2";
 
 export {
   VERSION,
diff --git a/src/package.json b/src/package.json
index 7e262a1fb..10c2418a7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,4 +1,4 @@
 {
   "type": "module",
-  "version": "3.7.1"
+  "version": "3.7.2"
 }