Move built versions outside of dist

localForage · Apr 11, 2014 · 2d11c90 · 2d11c90
1 parent be0b835
commit 2d11c90
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 20 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,8 +26,10 @@ ask you to fix any errors or merge the code into master. Here are a few tips:
 * **write tests**: if you're adding new features, _please_ write tests; likewise, if you're fixing a bug that wasn't previously caught by a test, please add one
 * **run `make` before you commit**: this will build out the files in the `dist/` folder and ensure your tests pass
 
-Please commit changes inside the `dist/` folder along with your changes in the
-`src/` folder--**do not make these changes separate commits**.
+Please commit changes at the top-level folder along with your changes in the
+`src/` folder--**do not make these changes separate commits**. These are the
+built versions of `localforage.js` and `localforage.min.js`, which are
+used by bower.
 
 If you have any questions, need some help, or anything else, don't feel shy!
 The team behind this library is often available on IRC

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -67,7 +67,7 @@ module.exports = exports = function(grunt) {
                     'src/drivers/**/*.js',
                     'src/localforage.js'
                 ],
-                dest: 'dist/localforage.js',
+                dest: 'localforage.js',
                 options: {
                     banner:
                         '/*!\n' +
@@ -96,8 +96,8 @@ module.exports = exports = function(grunt) {
         uglify: {
             localforage: {
                 files: {
-                    'dist/localforage.min.js': ['dist/localforage.js'],
-                    'docs/localforage.min.js': ['dist/localforage.js']
+                    'localforage.min.js': ['localforage.js'],
+                    'docs/localforage.min.js': ['localforage.js']
                 }
             }
         },

diff --git a/bower.json b/bower.json
@@ -1,8 +1,8 @@
 {
     "name": "localforage",
-    "version": "0.3.1",
+    "version": "0.4.0",
     "main": [
-        "dist/localforage.min.js"
+        "localforage.min.js"
     ],
     "ignore": [
         ".travis.yml",

diff --git a/examples/index.html b/examples/index.html
@@ -5,7 +5,7 @@
     <title>Simple localForage example</title>
   </head>
   <body>
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
     <script>
       // Forcing localstorage here. Feel free to switch to other drivers :)
       localforage.setDriver(localforage.LOCALSTORAGE).then(function() {

diff --git a/examples/main.js b/examples/main.js
@@ -1,4 +1,4 @@
-define(['../dist/localforage'], function(lf) {
+define(['../localforage'], function(lf) {
     lf.ready(function() {
         var key = 'STORE_KEY';
         var value = 'What we save offline';

diff --git a/dist/localforage.js → localforage.js b/dist/localforage.js → localforage.js
diff --git a/dist/localforage.min.js → localforage.min.js b/dist/localforage.min.js → localforage.min.js
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "storage",
     "websql"
   ],
-  "version": "0.3.1",
+  "version": "0.4.0",
   "homepage": "https://github.com/mozilla/localForage",
   "repository": {
     "type": "git",
@@ -31,8 +31,8 @@
     "grunt-shell": "^0.6.4",
     "load-grunt-tasks": "^0.4.0"
   },
-  "browser": "dist/localforage.js",
-  "main": "dist/localforage.js",
+  "browser": "localforage.js",
+  "main": "localforage.js",
   "licence": "Apache-2.0",
   "bugs": {
     "url": "http://github.com/mozilla/localForage/issues"

diff --git a/test/indexeddb.html b/test/indexeddb.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
   </body>
 </html>
diff --git a/test/localstorage.html b/test/localstorage.html
@@ -7,7 +7,7 @@
   <body>
     <div class="status"></div>
 
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
     <script>window.localforage.setDriver('localStorageWrapper');</script>
   </body>
 </html>
diff --git a/test/test.config.html b/test/test.config.html
@@ -14,6 +14,6 @@
             version: 2.0 // Test to make sure
         };
     </script>
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
   </body>
 </html>
diff --git a/test/test.html b/test/test.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
   </body>
 </html>
diff --git a/test/test.min.html b/test/test.min.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script src="../dist/localforage.min.js"></script>
+    <script src="../localforage.min.js"></script>
   </body>
 </html>
diff --git a/test/test.require.html b/test/test.require.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script data-main="../dist/localforage" src="../bower_components/requirejs/require.js"></script>
+    <script data-main="../localforage" src="../bower_components/requirejs/require.js"></script>
   </body>
 </html>
diff --git a/test/test.requiremin.html b/test/test.requiremin.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script data-main="../dist/localforage.min" src="../bower_components/requirejs/require.js"></script>
+    <script data-main="../localforage.min" src="../bower_components/requirejs/require.js"></script>
   </body>
 </html>
diff --git a/test/websql.html b/test/websql.html
@@ -7,6 +7,6 @@
   <body>
     <div class="status"></div>
 
-    <script src="../dist/localforage.js"></script>
+    <script src="../localforage.js"></script>
   </body>
 </html>