Skip to content

Commit 738144d

Browse files
committed
Fix the build ES6 code having the wrong file extension and use it in package.json exports
(cherry picked from commit 23d6182)
1 parent 3b2f374 commit 738144d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"repository": "https://github.com/moment/luxon",
1111
"exports": {
1212
".": {
13-
"import": "./src/luxon.js",
13+
"import": "./build/es6/luxon.mjs",
1414
"require": "./build/node/luxon.js"
1515
},
1616
"./package.json": "./package.json"
@@ -78,8 +78,8 @@
7878
"build/global/luxon.js.map",
7979
"build/global/luxon.min.js",
8080
"build/global/luxon.min.js.map",
81-
"build/es6/luxon.js",
82-
"build/es6/luxon.js.map",
81+
"build/es6/luxon.mjs",
82+
"build/es6/luxon.mjs.map",
8383
"src"
8484
],
8585
"license": "MIT",

tasks/build.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,34 +86,37 @@ async function buildLibrary(dest, opts) {
8686
console.log("Building", dest);
8787
const promises = [babelAndRollup(dest, opts)];
8888

89+
const filename = opts.filename || "luxon.js";
90+
const minFilename = filename.replace(/\.(m?js)$/, ".min.$1");
91+
8992
if (opts.minify && TRUST_MINIFY) {
9093
promises.push(
9194
babelAndRollup(dest, {
9295
...opts,
9396
minify: true,
94-
filename: "luxon.min.js",
97+
filename: minFilename,
9598
})
9699
);
97100
}
98101

99102
await Promise.all(promises);
100103

101104
if (opts.minify && !TRUST_MINIFY) {
102-
const code = fs.readFileSync(`build/${dest}/luxon.js`, "utf8"),
105+
const code = fs.readFileSync(`build/${dest}/${filename}`, "utf8"),
103106
ugly = UglifyJS.minify(code, {
104107
toplevel: !opts.global,
105108
output: {
106109
comments: false,
107110
},
108111
sourceMap: {
109-
filename: `build/${dest}/luxon.js`,
112+
filename: `build/${dest}/${filename}`,
110113
},
111114
});
112115
if (ugly.error) {
113116
console.error("Error uglifying", ugly.error);
114117
} else {
115-
fs.writeFileSync(`build/${dest}/luxon.min.js`, ugly.code);
116-
fs.writeFileSync(`build/${dest}/luxon.min.js.map`, ugly.map);
118+
fs.writeFileSync(`build/${dest}/${minFilename}`, ugly.code);
119+
fs.writeFileSync(`build/${dest}/${minFilename}.map`, ugly.map);
117120
}
118121
}
119122
console.log("Built", dest);
@@ -153,6 +156,7 @@ async function es6() {
153156
format: "es",
154157
minify: true,
155158
compile: false,
159+
filename: "luxon.mjs",
156160
});
157161
}
158162

0 commit comments

Comments
 (0)