Reversing some of the changes we won't do for now, and adding the fai…

…ling test
symfony · Jul 21, 2017 · b27f7c9 · b27f7c9
1 parent e206a12
commit b27f7c9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 25 deletions.
diff --git a/lib/WebpackConfig.js b/lib/WebpackConfig.js
@@ -9,7 +9,6 @@
 
 'use strict';
 
-const chalk = require('chalk');
 const path = require('path');
 const fs = require('fs');
 
@@ -95,8 +94,7 @@ class WebpackConfig {
          */
         if (publicPath.includes('://')) {
             if (this.useDevServer()) {
-                console.log(chalk.bgYellow.black(' WARNING ') + chalk.yellow(' You should not pass an absolute URL to setPublicPath() and use the dev-server at the same time'));
-                console.log();
+                throw new Error('You cannot pass an absolute URL to setPublicPath() and use the dev-server at the same time. Try using Encore.isProduction() to only configure your absolute publicPath for production.');
             }
         } else {
             if (publicPath.indexOf('/') !== 0) {
@@ -131,8 +129,8 @@ class WebpackConfig {
      * @returns {string}
      */
     getRealPublicPath() {
-        // if we're using webpack-dev-server and have no absolute url, use it & add the publicPath
-        if (this.useDevServer() && !this.publicPath.includes('://')) {
+        // if we're using webpack-dev-server, use it & add the publicPath
+        if (this.useDevServer()) {
             // avoid 2 middle slashes
             return this.runtimeConfig.devServerUrl.replace(/\/$/,'') + this.publicPath;
         }

diff --git a/test/WebpackConfig.js b/test/WebpackConfig.js
@@ -105,12 +105,52 @@ describe('WebpackConfig object', () => {
             }).to.throw('The value passed to setPublicPath() must start with "/"');
         });
 
-        it('You can set to a URL when using devServer', () => {
+        it('Setting to a URL when using devServer throws an error', () => {
             const config = createConfig();
             config.runtimeConfig.useDevServer = true;
-            config.setPublicPath('https://examplecdn.com');
 
-            expect(config.publicPath).to.equal('https://examplecdn.com/');
+            expect(() => {
+                config.setPublicPath('https://examplecdn.com');
+            }).to.throw('You cannot pass an absolute URL to setPublicPath() and use the dev-server');
+        });
+    });
+
+    describe('getRealPublicPath', () => {
+        it('Returns normal with no dev server', () => {
+            const config = createConfig();
+            config.setPublicPath('/public');
+
+            expect(config.getRealPublicPath()).to.equal('/public/');
+        });
+
+        it('Prefix when using devServer', () => {
+            const config = createConfig();
+            config.runtimeConfig.useDevServer = true;
+            config.runtimeConfig.devServerUrl = 'http://localhost:8080/';
+            config.setPublicPath('/public');
+
+            expect(config.getRealPublicPath()).to.equal('http://localhost:8080/public/');
+        });
+
+        it('No prefix with devServer & devServerKeepPublicPath option', () => {
+            const config = createConfig();
+            config.runtimeConfig.useDevServer = true;
+            config.runtimeConfig.devServerUrl = 'http://localhost:8080/';
+            config.runtimeConfig.devServerKeepPublicPath = true;
+            config.setPublicPath('/public');
+
+            expect(config.getRealPublicPath()).to.equal('/public/');
+        });
+
+        it('devServer & devServerKeepPublicPath option allows absolute publicPath', () => {
+            const config = createConfig();
+            config.runtimeConfig.useDevServer = true;
+            config.runtimeConfig.devServerUrl = 'http://localhost:8080/';
+            config.runtimeConfig.devServerKeepPublicPath = true;
+            config.setPublicPath('http://coolcdn.com/public');
+            config.setManifestKeyPrefix('/public/');
+
+            expect(config.getRealPublicPath()).to.equal('http://coolcdn.com/public');
         });
     });
 

diff --git a/test/config-generator.js b/test/config-generator.js
@@ -375,23 +375,6 @@ describe('The config-generator function', () => {
             expect(actualConfig.devServer).to.be.undefined;
         });
 
-        it('devServer and an absolute URL as publicPath', () => {
-            const config = createConfig();
-            config.runtimeConfig.useDevServer = true;
-            config.runtimeConfig.devServerUrl = 'http://localhost:8080/';
-            config.outputPath = isWindows ? 'C:\\tmp\\public' : '/tmp/public';
-            config.setManifestKeyPrefix('public');
-            config.setPublicPath('https://cdn.example.com');
-            config.addEntry('main', './main');
-
-            const actualConfig = configGenerator(config);
-            expect(actualConfig.output.publicPath).to.equal('https://cdn.example.com/');
-            expect(actualConfig.devServer).to.not.be.undefined;
-
-            const manifestPlugin = findPlugin(ManifestPlugin, actualConfig.plugins);
-            expect(manifestPlugin.opts.publicPath).to.equal('https://cdn.example.com/');
-        });
-
         it('devServer no hot mode', () => {
             const config = createConfig();
             config.runtimeConfig.useDevServer = true;