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

4099 ES6 refactor of dependencies/HarmonyModuleHelpers #5099

Merged
merged 1 commit into from
Jul 1, 2017
Merged

4099 ES6 refactor of dependencies/HarmonyModuleHelpers #5099

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/dependencies/HarmonyModulesHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ class HarmonyModulesHelpers {

static getModuleVar(state, request) {
if(!state.harmonyModules) state.harmonyModules = [];
var idx = state.harmonyModules.indexOf(request);
let idx = state.harmonyModules.indexOf(request);
if(idx < 0) {
idx = state.harmonyModules.length;
state.harmonyModules.push(request);
}
return "__WEBPACK_IMPORTED_MODULE_" + idx + "_" + request.replace(/[^A-Za-z0-9_]/g, "_").replace(/__+/g, "_") + "__";
return `__WEBPACK_IMPORTED_MODULE_${idx}_${request.replace(/[^A-Za-z0-9_]/g, "_").replace(/__+/g, "_")}__`;
}

static getNewModuleVar(state, request) {
Expand All @@ -31,17 +31,17 @@ class HarmonyModulesHelpers {
// checks if an harmony dependency is active in a module according to
// precedence rules.
static isActive(module, depInQuestion) {
var desc = depInQuestion.describeHarmonyExport();
const desc = depInQuestion.describeHarmonyExport();
if(!desc.exportedName) return true;
var before = true;
for(var i = 0; i < module.dependencies.length; i++) {
var dep = module.dependencies[i];
let before = true;
for(const moduleDependency of module.dependencies) {
const dep = moduleDependency;
if(dep === depInQuestion) {
before = false;
continue;
}
if(!dep.describeHarmonyExport) continue;
var d = dep.describeHarmonyExport();
const d = dep.describeHarmonyExport();
if(!d || !d.exportedName) continue;
if(d.exportedName === desc.exportedName) {
if(d.precedence < desc.precedence) {
Expand All @@ -58,17 +58,17 @@ class HarmonyModulesHelpers {
// get a list of named exports defined in a module
// doesn't include * reexports.
static getActiveExports(module, currentDependency) {
var desc = currentDependency && currentDependency.describeHarmonyExport();
const desc = currentDependency && currentDependency.describeHarmonyExport();
var currentIndex = currentDependency ? module.dependencies.indexOf(currentDependency) : -1;
return module.dependencies.map((dep, idx) => {
return {
dep: dep,
idx: idx
};
}).reduce((arr, data) => {
var dep = data.dep;
const dep = data.dep;
if(!dep.describeHarmonyExport) return arr;
var d = dep.describeHarmonyExport();
const d = dep.describeHarmonyExport();
if(!d) return arr;
if(!desc || (d.precedence < desc.precedence) || (d.precedence === desc.precedence && data.idx < currentIndex)) {
var names = [].concat(d.exportedName);
Expand Down