feat: dev mode not use cdn config

easy-team · Aug 31, 2018 · 70bcae1 · 70bcae1
1 parent ce50e67
commit 70bcae1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -523,7 +523,7 @@ class Config {
   }
 
   getPublicPathFromCDN(url, dynamicDir) {
-    if (this.utils.has(url)) {
+    if (!this.dev && this.utils.has(url)) {
       let cdnUrl = url;
       let cdnDir = dynamicDir;
       if (this.utils.isObject(url)) {

diff --git a/test/client.test.js b/test/client.test.js
@@ -132,12 +132,22 @@ describe('client.test.js', () => {
     it('should dev cdn config test', () => {
       const builder = createBuilder({ debug: true, env: 'dev', cdn: { url: cdnUrl} });
       const webpackConfig = builder.create();
+      expect(webpackConfig.output.publicPath).to.equal('/public/');
+    });
+    it('should test cdn config test', () => {
+      const builder = createBuilder({ debug: true, env: 'test', cdn: { url: cdnUrl} });
+      const webpackConfig = builder.create();
+      expect(webpackConfig.output.publicPath).to.equal(cdnUrl + '/');
+    });
+    it('should prod cdn config test', () => {
+      const builder = createBuilder({ debug: true, env: 'prod', cdn: { url: cdnUrl} });
+      const webpackConfig = builder.create();
       expect(webpackConfig.output.publicPath).to.equal(cdnUrl + '/');
     });
     it('should dev cdn dynamicDir config test', () => {
       const builder = createBuilder({ debug: true, env: 'dev', cdn: { url: cdnUrl, dynamicDir: 'cdn'} });
       const webpackConfig = builder.create();
-      expect(webpackConfig.output.publicPath).to.equal(cdnUrl + '/cdn/public/');
+      expect(webpackConfig.output.publicPath).to.equal('/public/');
     });
 
     it('should dev publicPath abspath config test', () => {