Merge pull request #68 from rwjblue/move-loader.js-to-subdir

Move loader.js into subdirectory.
ember-cli · Feb 16, 2016 · 5f91a3e · 5f91a3e
2 parents 15e6e81 + 2da1be4
commit 5f91a3e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -8,7 +8,7 @@ module.exports = {
   },
 
   included: function() {
-    this.app.import('vendor/loader.js', {
+    this.app.import('vendor/loader/loader.js', {
       prepend: true
     });
   }

diff --git a/lib/loader.js → lib/loader/loader.js b/lib/loader.js → lib/loader/loader.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "loader.js",
   "version": "4.0.0",
   "description": "loader.js =========",
-  "main": "lib/loader.js",
+  "main": "lib/loader/loader.js",
   "directories": {
     "test": "tests"
   },

diff --git a/tests/index.html b/tests/index.html
@@ -10,7 +10,7 @@
   <div id='qunit-fixture'></div>
   <script src='../node_modules/qunitjs/qunit/qunit.js'></script>
   <script>var define = "LOL", require = "ZOMG";</script>
-  <script src='../lib/loader.js'></script>
+  <script src='../lib/loader/loader.js'></script>
   <script src='all.js'></script>
   <script src='/testem.js'></script>
 </body>