fix(targets): allow web to be compiled for prod (#61)

* fix(targets): allow web to be compiled for prod * chore(targets): regenerate goldens
diez · Nov 14, 2019 · c5d0dae · c5d0dae
1 parent 600cc44
commit c5d0dae
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/examples/poodle-surf/package.json b/examples/poodle-surf/package.json
@@ -8,7 +8,8 @@
     "build-ios": "diez-cli compile -t ios -o ios && cd ios && pod install",
     "run-android": "diez-cli compile -t android -o android -d",
     "build-android": "diez-cli compile -t android -o android",
-    "run-web": "diez-cli compile -t web -o web -d"
+    "run-web": "diez-cli compile -t web -o web -d",
+    "build-web": "diez compile -t web -o web --baseUrl /ds/ --staticRoot web/public/ds && cd web && yarn build"
   },
   "dependencies": {
     "@diez/designsystem": "^1.0.0-beta.0",

diff --git a/examples/poodle-surf/web/.gitignore b/examples/poodle-surf/web/.gitignore
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+public/ds
diff --git a/packages/targets/sources/web/bindings/File.js b/packages/targets/sources/web/bindings/File.js
@@ -1,5 +1,5 @@
 class File {
-  constructor({src}) {
+  constructor ({src}) {
     this.src = src;
   }
 
@@ -15,12 +15,7 @@ class File {
 Object.defineProperties(File.prototype, {
   url: {
     get () {
-      if (Environment.isDevelopment) {
-        return `${Environment.serverUrl}${this.src}`;
-      }
-
-      // TODO: figure out how this should actually work.
-      return this.src;
+      return `${Environment.serverUrl}${this.src}`;
     },
   },
 });

diff --git a/packages/targets/sources/web/sdk/index.js b/packages/targets/sources/web/sdk/index.js
@@ -1,6 +1,8 @@
 const Environment = {
   {{#if devMode}}
   serverUrl: 'http://{{{hostname}}}:{{{devPort}}}/',
+  {{else}}
+  serverUrl: '{{baseUrl}}',
   {{/if}}
   isDevelopment: {{{devMode}}},
 };

diff --git a/packages/targets/sources/web/web.component.handlebars b/packages/targets/sources/web/web.component.handlebars
@@ -1,6 +1,6 @@
 class {{{componentName}}} {
   {{#if singleton}}
-  constructor() {
+  constructor () {
     {{#each properties}}
     this.{{{@key}}} = {{{this.initializer}}};
     {{/each}}

diff --git a/packages/targets/src/targets/web.handler.ts b/packages/targets/src/targets/web.handler.ts
@@ -178,7 +178,11 @@ export class WebCompiler extends TargetCompiler<WebOutput, WebBinding> {
    * @abstract
    */
   get staticRoot () {
-    return join(this.output.sdkRoot, 'static');
+    if (this.program.options.devMode) {
+      return join(this.output.sdkRoot, 'static');
+    }
+
+    return this.program.options.staticRoot || '/';
   }
 
   /**
@@ -256,6 +260,7 @@ export class WebCompiler extends TargetCompiler<WebOutput, WebBinding> {
     const tokens = {
       devPort,
       hostname,
+      baseUrl: this.program.options.baseUrl,
       hostPackageName: guessHostPackageName(this.program.options.outputPath),
       devMode: !!this.program.options.devMode,
       dependencies: Array.from(this.output.dependencies),

diff --git a/packages/targets/test/goldens/Bindings-web/index.js b/packages/targets/test/goldens/Bindings-web/index.js
@@ -6,7 +6,7 @@ const Environment = {
 module.exports = {};
 
 class File {
-  constructor({src}) {
+  constructor ({src}) {
     this.src = src;
   }
 
@@ -22,12 +22,7 @@ class File {
 Object.defineProperties(File.prototype, {
   url: {
     get () {
-      if (Environment.isDevelopment) {
-        return `${Environment.serverUrl}${this.src}`;
-      }
-
-      // TODO: figure out how this should actually work.
-      return this.src;
+      return `${Environment.serverUrl}${this.src}`;
     },
   },
 });
@@ -303,7 +298,7 @@ class HaikuComponent {
 module.exports.HaikuComponent = HaikuComponent;
 
 class Bindings {
-  constructor() {
+  constructor () {
     this.image = new Image({file1x: new File({src: "assets/image%20with%20spaces.jpg"}), file2x: new File({src: "assets/image%20with%20spaces@2x.jpg"}), file3x: new File({src: "assets/image%20with%20spaces@3x.jpg"}), width: 246, height: 246});
     this.svg = new SVG({src: "assets/image.svg"});
     this.lottie = new Lottie({file: new File({src: "assets/lottie.json"})});

diff --git a/packages/targets/test/goldens/Primitives-web/index.js b/packages/targets/test/goldens/Primitives-web/index.js
@@ -6,7 +6,7 @@ const Environment = {
 module.exports = {};
 
 class ChildComponent {
-  constructor() {
+  constructor () {
     this.diez = 10;
   }
 
@@ -23,7 +23,7 @@ class ChildComponent {
 module.exports.ChildComponent = ChildComponent;
 
 class EmptyComponent {
-  constructor() {
+  constructor () {
   }
 
   update (payload) {
@@ -38,7 +38,7 @@ class EmptyComponent {
 module.exports.EmptyComponent = EmptyComponent;
 
 class Primitives {
-  constructor() {
+  constructor () {
     this.number = 10;
     this.integer = 10;
     this.float = 10;