Added --canonicalroot option. semver-minor

Munter · Jul 16, 2017 · 5f55fa4 · 5f55fa4
1 parent 1b2c80c
commit 5f55fa4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/bin/hyperlink b/bin/hyperlink
@@ -14,11 +14,11 @@ var optimist = require('optimist'),
             type: 'string',
             demand: false
         })
-        // .options('canonicalurl', {
-        //     describe: 'URI root where the project being built will be deployed.',
-        //     type: 'string',
-        //     demand: false
-        // })
+        .options('canonicalroot', {
+            describe: 'URI root where the project being built will be deployed. Canonical URLs in local sources will be resolved to local URLs',
+            type: 'string',
+            demand: false
+        })
         .options('verbose', {
             alias: 'v',
             describe: 'Log all added assets and relations. VERY verbose.',
@@ -53,7 +53,7 @@ if (commandLineOptions.h) {
 }
 
 var urlTools = require('urltools'),
-    // canonicalUrl = commandLineOptions.canonicalurl && urlTools.ensureTrailingSlash(commandLineOptions.canonicalurl),
+    canonicalRoot = commandLineOptions.canonicalroot && urlTools.ensureTrailingSlash(commandLineOptions.canonicalroot),
     rootUrl = commandLineOptions.root && urlTools.urlOrFsPathToUrl(commandLineOptions.root, true),
     excludePatterns = commandLineOptions.exclude && [].concat(commandLineOptions.exclude),
     inputUrls;
@@ -81,6 +81,7 @@ if (commandLineOptions._.length > 0) {
 
 hyperlink({
     root: rootUrl,
+    canonicalRoot: canonicalRoot,
     inputUrls: inputUrls,
     excludePatterns: excludePatterns,
     recursive: commandLineOptions.recursive,

diff --git a/lib/index.js b/lib/index.js
@@ -22,7 +22,8 @@ module.exports = function (options) {
 
     var errorCount = 0;
     var ag = new AssetGraph({
-        root: options.root
+        root: options.root,
+        canonicalRoot: options.canonicalRoot
     });
 
     var excludePattern;