From 87887df8b81ad29ff62772c90ddc7550e28e68f4 Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Tue, 12 Jul 2016 14:44:12 -0400 Subject: [PATCH] chore(all): prepare release 1.0.0-beta.4.0.1 --- dist/build-resources.js | 12 ++++++------ doc/CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dist/build-resources.js b/dist/build-resources.js index be0ab72..af01c16 100644 --- a/dist/build-resources.js +++ b/dist/build-resources.js @@ -425,8 +425,8 @@ function processFromPath(resources, fromPath, resource, packagePath, relativeToD resources[fromPathCss] = (0, _assign2.default)({}, resource, realPath, overrideBlock || {}); } } else { - console.error('Unable to resolve', fromPath); - } + console.error('Unable to resolve', fromPath); + } } function getResourcesOfPackage() { @@ -547,11 +547,11 @@ function fixRelativeFromPath(fromPath, realSrcPath, realParentPath, externalModu if (modulePathIndex !== -1) { return fromPath; } else { - if (fromPath.indexOf('.') == 0) { - fromPath = path.joinSafe('./', path.relative(realSrcPath, realParentPath), fromPath); + if (fromPath.indexOf('.') == 0) { + fromPath = path.joinSafe('./', path.relative(realSrcPath, realParentPath), fromPath); + } + return externalModule ? path.join(externalModule, fromPath) : fromPath; } - return externalModule ? path.join(externalModule, fromPath) : fromPath; - } } function resolveTemplateResources(htmlFilePath, srcPath, externalModule) { diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 40bcf7f..3c2037a 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,13 @@ + +# [1.0.0-beta.4.0.1](https://github.com/aurelia/webpack-plugin/compare/1.0.0-beta.4.0.0...v1.0.0-beta.4.0.1) (2016-07-12) + + +### Bug Fixes + +* **build-resources:** Fix module resolution for symlinks ([4a5536d](https://github.com/aurelia/webpack-plugin/commit/4a5536d)) + + + # [1.0.0-beta.4.0.0](https://github.com/aurelia/webpack-plugin/compare/1.0.0-beta.3.0.0...v1.0.0-beta.4.0.0) (2016-06-24) diff --git a/package.json b/package.json index e8a882e..6229516 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-webpack-plugin", - "version": "1.0.0-beta.4.0.0", + "version": "1.0.0-beta.4.0.1", "description": "A plugin for webpack that enables bundling Aurelia applications.", "keywords": [ "aurelia",