Merge branch 'release/2.0' into jimothy/gh-434_remove-old-docs

magento · Nov 15, 2018 · ed1de17 · ed1de17
2 parents 0292af5 + 83fcd76
commit ed1de17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.0.0-rc.9",
+    "version": "2.0.0-rc.10",
     "packages": [
         "packages/peregrine",
         "packages/pwa-buildpack",

diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.0-rc.9",
+  "version": "2.0.0-rc.10",
   "description": "Venia PWA Concept Storefront for Magento 2",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "author": "Magento Commerce",

diff --git a/packages/venia-concept/server.js b/packages/venia-concept/server.js
@@ -1,8 +1,5 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
 const validEnv = require('./validate-environment')(process.env);
-const {
-    Utilities: { configureHost }
-} = require('@magento/pwa-buildpack');
 const { createUpwardServer, envToConfig } = require('@magento/upward-js');
 
 async function serve() {
@@ -36,6 +33,9 @@ async function serve() {
 
     if (!config.host) {
         try {
+            const {
+                Utilities: { configureHost }
+            } = require('@magento/pwa-buildpack');
             const { hostname, ports, ssl } = await configureHost({
                 interactive: false,
                 subdomain: validEnv.MAGENTO_BUILDPACK_SECURE_HOST_SUBDOMAIN,