Skip to content

fix: dynamic import must not handle __esModule flagged modules #93

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

Merged
merged 1 commit into from
Apr 11, 2023
Merged

fix: dynamic import must not handle __esModule flagged modules #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/plugin/__test__/__snapshots__/test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,10 +1012,10 @@ exports[`imports import-dynamic.js 1`] = `
function __ui5_require_async(path) {
return new Promise((resolve, reject) => {
sap.ui.require([path], module => {
module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
default: module
} : module;
if (!module.__esModule) {
module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
default: module
} : module;
Object.defineProperty(module, "__esModule", {
value: true
});
Expand Down
10 changes: 9 additions & 1 deletion packages/plugin/src/utils/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,22 @@ export const buildDefaultImportDeconstructor = template(`
*
* (await import("./non/exporting/module")) => { __esModule: true, ... }
* (await import("./non/exporting/module")) => undefined
*
* 5.) Other dependencies (jsPDF)
*
* (await import("jsPDF")) => { __esModule: true, jsPDF: ?, ... }
* (await import("sap/m/MessageBox")).jsPDF => jsPDF
*
* When requiring other dependencies they are already flagged as __esModule
* and must not be processed in our dynamic import to require handler.
*/
// TODO: inject __extends instead of Object.assign unless useBuiltIns in set
export const buildDynamicImportHelper = template(`
function __ui5_require_async(path) {
return new Promise((resolve, reject) => {
sap.ui.require([path], (module) => {
module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? { default: module } : module;
if (!module.__esModule) {
module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? { default: module } : module;
Object.defineProperty(module, "__esModule", { value: true });
}
resolve(module);
Expand Down