Skip to content

Commit f5624a3

Browse files
marktalingmarktaling
committed
fix(webpack-plugin): Windows specific paths fix
fix an issue where paths weren't correctly normalized, causing the resulting bundle to contain moduleId's as integers instead of their names
1 parent 0559df5 commit f5624a3

File tree

5 files changed

+140
-143
lines changed

5 files changed

+140
-143
lines changed

‎dist/build-resources.js

+41-39
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var _assign = require('babel-runtime/core-js/object/assign');
2626
var _assign2 = _interopRequireDefault(_assign);
2727

2828
var processAll = exports.processAll = function () {
29-
var ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(options) {
29+
var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(options) {
3030
var dependencies, nodeModules, packageJson;
3131
return _regenerator2.default.wrap(function _callee$(_context) {
3232
while (1) {
@@ -84,14 +84,15 @@ var processAll = exports.processAll = function () {
8484
}
8585
}, _callee, this);
8686
}));
87+
8788
return function processAll(_x2) {
88-
return ref.apply(this, arguments);
89+
return _ref.apply(this, arguments);
8990
};
9091
}();
9192

9293
var autoresolveTemplates = function () {
93-
var ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(resources, packagePath, srcPath) {
94-
var templates, srcRelativeToRoot, _iterator6, _isArray6, _i6, _ref6, htmlFilePath, templateResources, _iterator7, _isArray7, _i7, _ref7, resource;
94+
var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(resources, packagePath, srcPath) {
95+
var templates, srcRelativeToRoot, _iterator6, _isArray6, _i6, _ref8, htmlFilePath, templateResources, _iterator7, _isArray7, _i7, _ref9, resource;
9596

9697
return _regenerator2.default.wrap(function _callee2$(_context2) {
9798
while (1) {
@@ -119,7 +120,7 @@ var autoresolveTemplates = function () {
119120
return _context2.abrupt('break', 34);
120121

121122
case 8:
122-
_ref6 = _iterator6[_i6++];
123+
_ref8 = _iterator6[_i6++];
123124
_context2.next = 15;
124125
break;
125126

@@ -134,10 +135,10 @@ var autoresolveTemplates = function () {
134135
return _context2.abrupt('break', 34);
135136

136137
case 14:
137-
_ref6 = _i6.value;
138+
_ref8 = _i6.value;
138139

139140
case 15:
140-
htmlFilePath = _ref6;
141+
htmlFilePath = _ref8;
141142
templateResources = resolveTemplateResources(htmlFilePath, srcPath);
142143
_iterator7 = templateResources, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);
143144

@@ -155,7 +156,7 @@ var autoresolveTemplates = function () {
155156
return _context2.abrupt('break', 32);
156157

157158
case 21:
158-
_ref7 = _iterator7[_i7++];
159+
_ref9 = _iterator7[_i7++];
159160
_context2.next = 28;
160161
break;
161162

@@ -170,10 +171,10 @@ var autoresolveTemplates = function () {
170171
return _context2.abrupt('break', 32);
171172

172173
case 27:
173-
_ref7 = _i7.value;
174+
_ref9 = _i7.value;
174175

175176
case 28:
176-
resource = _ref7;
177+
resource = _ref9;
177178

178179
processFromPath(resources, resource.path, resource, packagePath, srcRelativeToRoot);
179180

@@ -192,8 +193,9 @@ var autoresolveTemplates = function () {
192193
}
193194
}, _callee2, this);
194195
}));
196+
195197
return function autoresolveTemplates(_x8, _x9, _x10) {
196-
return ref.apply(this, arguments);
198+
return _ref7.apply(this, arguments);
197199
};
198200
}();
199201

@@ -217,7 +219,7 @@ var modulePaths = [];
217219
var moduleNames = [];
218220

219221
function installedRootModulePaths(moduleDir) {
220-
var ensurePackageJson = arguments.length <= 1 || arguments[1] === undefined ? true : arguments[1];
222+
var ensurePackageJson = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
221223

222224
var rootModules = fileSystem.readdirSync(moduleDir).filter(function (dir) {
223225
return !/^\./.test(dir);
@@ -435,18 +437,18 @@ function processFromPath(resources, fromPath, resource, packagePath, relativeToD
435437
if (realPath) {
436438
var htmlResources = resolveTemplateResources(realPath.source, localSrcPath, realPath.moduleName);
437439
for (var _iterator = htmlResources, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
438-
var _ref;
440+
var _ref2;
439441

440442
if (_isArray) {
441443
if (_i >= _iterator.length) break;
442-
_ref = _iterator[_i++];
444+
_ref2 = _iterator[_i++];
443445
} else {
444446
_i = _iterator.next();
445447
if (_i.done) break;
446-
_ref = _i.value;
448+
_ref2 = _i.value;
447449
}
448450

449-
var htmlResource = _ref;
451+
var htmlResource = _ref2;
450452

451453
processFromPath(resources, htmlResource.path, htmlResource, packagePath, localRelativeToDir, overrideBlock || extractBundleResourceData(htmlResource));
452454
}
@@ -473,16 +475,16 @@ function processFromPath(resources, fromPath, resource, packagePath, relativeToD
473475
resources[fromPathCss] = (0, _assign2.default)({}, resource, realPath, overrideBlock || {});
474476
}
475477
} else {
476-
console.error('Unable to resolve', fromPath);
477-
}
478+
console.error('Unable to resolve', fromPath);
479+
}
478480
}
479481

480482
function getResourcesOfPackage() {
481-
var resources = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
482-
var packagePath = arguments.length <= 1 || arguments[1] === undefined ? undefined : arguments[1];
483-
var relativeToDir = arguments.length <= 2 || arguments[2] === undefined ? '' : arguments[2];
484-
var overrideBlock = arguments.length <= 3 || arguments[3] === undefined ? undefined : arguments[3];
485-
var externalModule = arguments.length <= 4 || arguments[4] === undefined ? undefined : arguments[4];
483+
var resources = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
484+
var packagePath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
485+
var relativeToDir = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
486+
var overrideBlock = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
487+
var externalModule = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
486488

487489
if (modulesProcessed.indexOf(packagePath) !== -1) {
488490
return;
@@ -499,34 +501,34 @@ function getResourcesOfPackage() {
499501
if (packageJson) {
500502
if (packageJson.aurelia && packageJson.aurelia.build && packageJson.aurelia.build.resources) {
501503
for (var _iterator2 = packageJson.aurelia.build.resources, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
502-
var _ref2;
504+
var _ref3;
503505

504506
if (_isArray2) {
505507
if (_i2 >= _iterator2.length) break;
506-
_ref2 = _iterator2[_i2++];
508+
_ref3 = _iterator2[_i2++];
507509
} else {
508510
_i2 = _iterator2.next();
509511
if (_i2.done) break;
510-
_ref2 = _i2.value;
512+
_ref3 = _i2.value;
511513
}
512514

513-
var resource = _ref2;
515+
var resource = _ref3;
514516

515517
resource = resource instanceof Object && !Array.isArray(resource) ? resource : { path: resource };
516518
var fromPaths = Array.isArray(resource.path) ? resource.path : [resource.path];
517519
for (var _iterator3 = fromPaths, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
518-
var _ref3;
520+
var _ref4;
519521

520522
if (_isArray3) {
521523
if (_i3 >= _iterator3.length) break;
522-
_ref3 = _iterator3[_i3++];
524+
_ref4 = _iterator3[_i3++];
523525
} else {
524526
_i3 = _iterator3.next();
525527
if (_i3.done) break;
526-
_ref3 = _i3.value;
528+
_ref4 = _i3.value;
527529
}
528530

529-
var fromPath = _ref3;
531+
var fromPath = _ref4;
530532

531533
debug('<' + (externalModule || path.basename(packagePath)) + '> [resolving] \'' + fromPath + '\'');
532534

@@ -542,18 +544,18 @@ function getResourcesOfPackage() {
542544
if (packageJson.dependencies) {
543545
var depNames = filterDepNames((0, _getOwnPropertyNames2.default)(packageJson.dependencies), getPackageAureliaIncludeDependencies(packageJson));
544546
for (var _iterator4 = depNames, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
545-
var _ref4;
547+
var _ref5;
546548

547549
if (_isArray4) {
548550
if (_i4 >= _iterator4.length) break;
549-
_ref4 = _iterator4[_i4++];
551+
_ref5 = _iterator4[_i4++];
550552
} else {
551553
_i4 = _iterator4.next();
552554
if (_i4.done) break;
553-
_ref4 = _i4.value;
555+
_ref5 = _i4.value;
554556
}
555557

556-
var _moduleName = _ref4;
558+
var _moduleName = _ref5;
557559

558560
var _modulePathIndex = moduleNames.indexOf(_moduleName);
559561
if (_modulePathIndex !== -1) {
@@ -564,18 +566,18 @@ function getResourcesOfPackage() {
564566

565567
if (!externalModule) {
566568
for (var _iterator5 = depNames, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
567-
var _ref5;
569+
var _ref6;
568570

569571
if (_isArray5) {
570572
if (_i5 >= _iterator5.length) break;
571-
_ref5 = _iterator5[_i5++];
573+
_ref6 = _iterator5[_i5++];
572574
} else {
573575
_i5 = _iterator5.next();
574576
if (_i5.done) break;
575-
_ref5 = _i5.value;
577+
_ref6 = _i5.value;
576578
}
577579

578-
var moduleName = _ref5;
580+
var moduleName = _ref6;
579581

580582
var modulePathIndex = moduleNames.indexOf(moduleName);
581583
if (modulePathIndex !== -1) {

0 commit comments

Comments
 (0)