Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.

Commit 0171134

Browse files
committed
fix sfx core regression
1 parent 19b73d4 commit 0171134

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

templates/sfx-core.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,18 +226,24 @@
226226
});
227227
var require = makeDynamicRequire(link.deps, link.depLoads, seen);
228228

229-
if (module.exports !== moduleObj.__useDefault)
229+
// evaluate deps first
230+
if (!link.executingRequire)
231+
for (var i = 0; i < link.deps.length; i++)
232+
require(link.deps[i]);
233+
234+
var output = link.execute.call(global, require, moduleObj.__useDefault, module);
235+
if (output !== undefined)
236+
moduleObj.default = moduleObj.__useDefault = output;
237+
else if (module.exports !== moduleObj.__useDefault)
230238
moduleObj.default = moduleObj.__useDefault = module.exports;
231239

232-
var moduleDefault = moduleObj.default;
240+
var moduleDefault = moduleObj.__useDefault;
233241

234242
// __esModule flag extension support
235-
if (moduleDefault && moduleDefault.__esModule) {
243+
if (moduleDefault && moduleDefault.__esModule)
236244
for (var p in moduleDefault)
237245
if (Object.hasOwnProperty.call(moduleDefault, p))
238246
moduleObj[p] = moduleDefault[p];
239-
}
240-
241247
}
242248

243249
var module = load.module = new Module(link.moduleObj);

templates/sfx-core.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)