Merge pull request #4215 from ember-cli/clean-base-url-extraction

extract clean-base-url to its own module
ember-cli · Jun 3, 2015 · af2fe05 · af2fe05
2 parents 9a3cd06 + 0e1cc87
commit af2fe05
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 46 deletions.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -12,7 +12,7 @@ var escapeRegExp = require('escape-string-regexp');
 var EOL          = require('os').EOL;
 
 var Project      = require('../models/project');
-var cleanBaseURL = require('../utilities/clean-base-url');
+var cleanBaseURL = require('clean-base-url');
 var SilentError  = require('../errors/silent');
 
 var preprocessJs  = p.preprocessJs;

diff --git a/lib/tasks/server/express-server.js b/lib/tasks/server/express-server.js
@@ -10,7 +10,7 @@ var Promise       = require('../../ext/promise');
 var Task          = require('../../models/task');
 var SilentError   = require('../../errors/silent');
 
-var cleanBaseURL = require('../../utilities/clean-base-url');
+var cleanBaseURL = require('clean-base-url');
 
 module.exports = Task.extend({
   init: function() {

diff --git a/lib/tasks/server/middleware/history-support/index.js b/lib/tasks/server/middleware/history-support/index.js
@@ -3,7 +3,7 @@
 var path = require('path');
 var fs   = require('fs');
 
-var cleanBaseURL = require('../../../../utilities/clean-base-url');
+var cleanBaseURL = require('clean-base-url');
 
 function HistorySupportAddon(project) {
   this.project = project;

diff --git a/lib/tasks/server/middleware/serve-files/index.js b/lib/tasks/server/middleware/serve-files/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var cleanBaseURL = require('../../../../utilities/clean-base-url');
+var cleanBaseURL = require('clean-base-url');
 var debug        = require('debug')('ember-cli:serve-files');
 
 function ServeFilesAddon(project) {

diff --git a/lib/tasks/server/middleware/tests-server/index.js b/lib/tasks/server/middleware/tests-server/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var cleanBaseURL = require('../../../../utilities/clean-base-url');
+var cleanBaseURL = require('clean-base-url');
 var fs = require('fs');
 var path = require('path');
 

diff --git a/lib/utilities/clean-base-url.js b/lib/utilities/clean-base-url.js
diff --git a/package.json b/package.json
@@ -84,6 +84,7 @@
     "broccoli-unwatched-tree": "0.1.1",
     "broccoli-writer": "0.1.1",
     "chalk": "1.0.0",
+    "clean-base-url": "^1.0.0",
     "compression": "^1.4.4",
     "concat-stream": "^1.4.7",
     "configstore": "0.3.2",

diff --git a/tests/unit/utilities/clean-base-url-test.js b/tests/unit/utilities/clean-base-url-test.js