Merge branch 'master' of https://github.com/adobe/helix-cli

Author: stefan-guggisberg

.circleci/config.yml

@@ -157,7 +157,7 @@ jobs:
         working_directory: build
     - store_artifacts:
         path: build/hlx_install.sh
-            
+
 workflows:
   version: 2
   build:
@@ -170,4 +170,7 @@ workflows:
           branches:
             only: master
     - build
-    - installer
+    - installer:
+        filters:
+          branches:
+            only: master

.vscode/launch.json

@@ -10,6 +10,34 @@
             "name": "Attach",
             "port": 9229
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha All",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "--timeout",
+                "999999",
+                "--colors",
+                "${workspaceFolder}/test"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Current File",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "--timeout",
+                "999999",
+                "--colors",
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
         {
             "type": "node",
             "request": "launch",

layouts/fastly/helix.vcl

@@ -318,6 +318,11 @@ sub vcl_recv {
     set req.http.X-Action-Root = "/api/v1/web/" + table.lookup(secrets, "OPENWHISK_NAMESPACE") + "/default/hlx--static";
     set req.url = req.http.X-Action-Root + "?owner=" + var.owner + "&repo=" + var.repo + "&strain=" + var.strain + "&ref=" + var.ref + "&entry=" + var.entry + "&path=" + var.path + "&plain=true"  + "&allow=" urlencode(req.http.X-Allow) + "&deny=" urlencode(req.http.X-Deny) + "&root=" + req.http.X-Github-Static-Root;
 
+  } elseif (req.http.Fastly-SSL && (req.http.X-Static == "Redirect")) {
+    # Handle a redirect from static.js by
+    # - fetching the resource from GitHub
+    # - don't forget to override the Content-Type header
+    set req.backend = F_GitHub;
 
   } elsif (!req.http.Fastly-FF && req.http.Fastly-SSL && (req.url.basename ~ "(^[^\.]+)(\.?(.+))?(\.[^\.]*$)" || req.url.basename == "")) {
     # This is a dynamic request.
@@ -390,7 +395,8 @@ sub vcl_recv {
   }
 
   # enable IO for image file-types
-  if (req.url.ext ~ "(?i)(?:gif|png|jpe?g|webp)")  {
+  # but not for static images or redirected images
+  if (req.url.ext ~ "(?i)(?:gif|png|jpe?g|webp)" && (req.http.X-Static != "Static") && (req.http.X-Static == "Redirect"))  {
     set req.http.X-Fastly-Imageopto-Api = "fastly";
   }
 
@@ -488,7 +494,31 @@ sub vcl_fetch {
     esi;
   }
 
-  if (beresp.status == 404 || beresp.status == 204) {
+  if (beresp.http.X-Static == "Raw/Static") {
+    if (beresp.status == 307) {
+      // static.js returns a 307 if the response is greater than OpenWhisk's
+      // delivery limit. We restart the request and deliver directly from
+      // GitHub instead, carring over the Content-Type header that static.js guessed
+      set req.http.X-Static = "Redirect";
+      set req.url = beresp.http.Location;
+      set req.http.X-Content-Type = beresp.http.X-Content-Type;
+      restart;
+    } else {
+      return(deliver);
+    }
+  } elseif (req.http.X-Static == "Redirect") {
+    // and this is where we fix the headers of the GitHub static response
+    // so that they become digestible by a browser.
+    // - recover Content-Type from X-Content-Type
+    // - filter out GitHub-headers
+
+    set beresp.http.Content-Type = req.http.X-Content-Type;
+    unset beresp.http.X-Content-Type-Options;
+    unset beresp.http.X-Frame-Options;
+    unset beresp.http.X-XSS-Protection;
+    unset beresp.http.Content-Security-Policy;
+
+  } elseif (beresp.status == 404 || beresp.status == 204) {
     # That was a miss. Let's try to restart.
     set beresp.http.X-Status = beresp.status + "-Restart " + req.restarts;
     set beresp.status = 404;
@@ -566,6 +596,10 @@ sub vcl_deliver {
     unset resp.http.X-GW-Cache;
     unset resp.http.X-Static;
     unset resp.http.X-URL;
+    unset resp.http.X-Content-Type;
+    unset resp.http.X-GitHub-Request-Id;
+    unset resp.http.X-Fastly-Request-ID;
+    unset resp.http.X-Geo-Block-List;
   }
   return(deliver);
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-cli",
-  "version": "0.6.1-pre.1",
+  "version": "0.7.2-pre.1",
   "description": "Project Helix CLI",
   "main": "index.js",
   "bin": {
@@ -30,7 +30,7 @@
     "@adobe/hypermedia-pipeline": "^0.5.0",
     "@adobe/openwhisk-loggly-wrapper": "^0.3.0",
     "@adobe/parcel-plugin-htl": "0.8.0",
-    "@adobe/petridish": "^1.2.2",
+    "@adobe/petridish": "^1.3.0",
     "archiver": "^3.0.0",
     "calibre": "^1.1.1",
     "chalk": "^2.4.1",

package.json

@@ -22,13 +22,8 @@ const path = require('path');
 const chalk = require('chalk');
 const fse = require('fs-extra');
 const klawSync = require('klaw-sync');
-const { DEFAULT_OPTIONS } = require('./defaults.js');
 const md5 = require('./md5.js');
-
-// #190 sourceMappingURL annotation is incorrect
-// => override default publicURL
-// see: https://github.com/parcel-bundler/parcel/issues/1028#issuecomment-374537098
-DEFAULT_OPTIONS.publicURL = '.';
+const strainconfig = require('./strain-config-utils');
 
 /**
  * Finds the non-htl files from the generated bundle
@@ -46,12 +41,16 @@ function findStaticFiles(bnd) {
     }
     if (bnd.htl && bnd.type === 'js') {
       // strip leading / from sourceMappingURL
+      // #190 sourceMappingURL annotation is incorrect
+      // see: https://github.com/parcel-bundler/parcel/issues/1028#issuecomment-374537098
+      const contents = fse.readFileSync(bnd.name, 'utf8');
+      fse.writeFileSync(bnd.name, contents.replace(/\/\/# sourceMappingURL=\//, '//# sourceMappingURL='));
     }
     if (!bnd.htl) {
       statics.push(bnd.name);
     }
   }
-  bnd.childBundles.forEach((child) => {
+  bnd.childBundles.forEach(async (child) => {
     statics.push(...findStaticFiles(child));
   });
   return statics;
@@ -65,7 +64,9 @@ class BuildCommand extends EventEmitter {
     this._target = null;
     this._files = null;
     this._distDir = null;
+    this._webroot = null;
     this._cwd = process.cwd();
+    this._strainFile = null;
   }
 
   withDirectory(dir) {
@@ -98,6 +99,16 @@ class BuildCommand extends EventEmitter {
     return this;
   }
 
+  withStrainFile(file) {
+    this._strainFile = file;
+    return this;
+  }
+
+  withWebRoot(root) {
+    this._webroot = root;
+    return this;
+  }
+
   async moveStaticFiles(files, report) {
     const jobs = files.map((src) => {
       const rel = path.relative(this._target, src);
@@ -117,19 +128,54 @@ class BuildCommand extends EventEmitter {
   }
 
   async validate() {
+    if (!this._strainFile) {
+      this._strainFile = path.resolve(this._cwd, '.hlx', 'strains.yaml');
+    }
+
+    if (!this._webroot) {
+      const exists = await fse.pathExists(this._strainFile);
+      if (exists) {
+        const strains = strainconfig.load(await fse.readFile(this._strainFile, 'utf8'));
+        const defaultStrain = strains.find(v => v.name === 'default');
+        if (defaultStrain && defaultStrain.static && defaultStrain.static.root) {
+          const root = defaultStrain.static.root.replace(/^\/+/, '');
+          this._webroot = path.resolve(this._cwd, root);
+        }
+      }
+    }
+    if (!this._webroot) {
+      this._webroot = this._cwd;
+    }
     if (!this._distDir) {
-      this._distDir = path.resolve(this._cwd, 'dist');
+      this._distDir = path.resolve(this._webroot, 'dist');
+    }
+  }
+
+  async getBundlerOptions() {
+    const opts = {
+      cacheDir: path.resolve(this._cwd, '.hlx', 'cache'),
+      target: 'node',
+      logLevel: 3,
+      detailedReport: true,
+      watch: false,
+      cache: this._cache,
+      minify: this._minify,
+      outDir: this._target,
+    };
+    const relRoot = path.relative(this._webroot, this._distDir);
+    if (relRoot) {
+      opts.publicUrl = `/${relRoot}`;
     }
+    return opts;
   }
 
   /**
    * Initializes the parcel bundler.
    * @param files entry files
-   * @param options bundler options
    * @return {Bundler} the bundler
    */
-  // eslint-disable-next-line class-methods-use-this
-  createBundler(files, options) {
+  async createBundler(files) {
+    const options = await this.getBundlerOptions();
     const bundler = new Bundler(files, options);
     bundler.addAssetType('htl', require.resolve('@adobe/parcel-plugin-htl/src/HTLPreAsset.js'));
     bundler.addAssetType('htl-preprocessed', require.resolve('@adobe/parcel-plugin-htl/src/HTLAsset.js'));
@@ -173,21 +219,12 @@ class BuildCommand extends EventEmitter {
   }
 
   async run() {
-    // override default options with command line arguments
-    const myoptions = {
-      ...DEFAULT_OPTIONS,
-      watch: false,
-      cache: this._cache,
-      minify: this._minify,
-      outDir: this._target,
-    };
-
-    this.validate();
+    await this.validate();
 
     // expand patterns from command line arguments
     const myfiles = this._files.reduce((a, f) => [...a, ...glob.sync(f)], []);
 
-    const bundler = this.createBundler(myfiles, myoptions);
+    const bundler = await this.createBundler(myfiles);
     const bundle = await bundler.bundle();
     if (bundle) {
       await this.extractStaticFiles(bundle, true);

src/build.cmd.js

@@ -9,13 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-module.exports.DEFAULT_OPTIONS = {
-  cacheDir: '.hlx/cache',
-  target: 'node',
-  logLevel: 3,
-  detailedReport: true,
-};
-
 const DEFAULT_PATTERNS = ['src/**/*.htl'];
 
 module.exports.defaultArgs = yargs => yargs