Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug where ESM module load fails on windows. #3692

Merged
merged 4 commits into from
Aug 25, 2021
Merged

Fix bug where ESM module load fails on windows. #3692

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
297c576
Fix bug where ESM module load fails on windows.
taeold Aug 19, 2021
27be610
Add changelog.
taeold Aug 24, 2021
e7bd7ac
Update CHANGELOG.md
taeold Aug 25, 2021
752a10d
Merge branch 'master' into dl-cf3-esm-windows-fix2
taeold Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix bug where functions packaged as ES module failed to load on Windows (#3692)
taeold marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 5 additions & 2 deletions src/deploy/functions/runtimes/node/triggerParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// from a functions package directory.
"use strict";

var url = require("url");
var extractTriggers = require("./extractTriggers");
var EXIT = function () {
process.exit(0);
Expand All @@ -21,8 +22,10 @@ async function loadModule(packageDir) {
return require(packageDir);
} catch (e) {
if (e.code === "ERR_REQUIRE_ESM") {
const mod = await dynamicImport(require.resolve(packageDir));
return mod;
const modulePath = require.resolve(packageDir);
// Resolve module path to file:// URL. Required for windows support.
const moduleURL = url.pathToFileURL(modulePath).href;
return await dynamicImport(moduleURL);
}
throw e;
}
Expand Down