Supporting .. syntax in watched assets

This commit is contained in:
Sebastien Ros
2015-08-21 16:01:44 -07:00
parent 5b42c707b1
commit 9e95f96195
+3 -3
View File
@@ -74,15 +74,15 @@ function getAssetGroups() {
function resolveAssetGroupPaths(assetGroup, assetManifestPath) { function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
assetGroup.basePath = path.dirname(assetManifestPath); assetGroup.basePath = path.dirname(assetManifestPath);
assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) { assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
return path.join(assetGroup.basePath, inputPath); return path.resolve(path.join(assetGroup.basePath, inputPath));
}); });
assetGroup.watchPaths = []; assetGroup.watchPaths = [];
if (!!assetGroup.watch) { if (!!assetGroup.watch) {
assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) { assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) {
return path.join(assetGroup.basePath, watchPath); return path.resolve(path.join(assetGroup.basePath, watchPath));
}); });
} }
assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output); assetGroup.outputPath = path.resolve(path.join(assetGroup.basePath, assetGroup.output));
assetGroup.outputDir = path.dirname(assetGroup.outputPath); assetGroup.outputDir = path.dirname(assetGroup.outputPath);
assetGroup.outputFileName = path.basename(assetGroup.output); assetGroup.outputFileName = path.basename(assetGroup.output);
} }