package updates to set up bower correctly #535

1 files changed, 13 insertions, 19 deletions

diff --git a/www/lib/localforage/Gruntfile.js b/www/lib/localforage/Gruntfile.js
index 7df7b00a..f8a9c399 100644
--- a/www/lib/localforage/Gruntfile.js
+++ b/www/lib/localforage/Gruntfile.js
@@ -15,8 +15,8 @@ module.exports = exports = function(grunt) {
     var BANNER = '/*!\n' +
                  '    localForage -- Offline Storage, Improved\n' +
                  '    Version ' + grunt.file.readJSON('package.json').version + '\n' +
-                 '    https://mozilla.github.io/localForage\n' +
-                 '    (c) 2013-2015 Mozilla, Apache License 2.0\n' +
+                 '    https://localforage.github.io/localForage\n' +
+                 '    (c) 2013-2017 Mozilla, Apache License 2.0\n' +
                  '*/\n';
 
     var babelModuleIdProvider = function getModuleId(moduleName) {
@@ -63,7 +63,7 @@ module.exports = exports = function(grunt) {
                         standalone: 'localforage'
                     },
                     transform: ['rollupify', 'babelify'],
-                    plugin: ['bundle-collapser/plugin']
+                    plugin: ['bundle-collapser/plugin', 'browserify-derequire']
                 }
             },
             no_promises: {
@@ -75,25 +75,11 @@ module.exports = exports = function(grunt) {
                         standalone: 'localforage'
                     },
                     transform: ['rollupify', 'babelify'],
-                    plugin: ['bundle-collapser/plugin'],
+                    plugin: ['bundle-collapser/plugin', 'browserify-derequire'],
                     exclude: ['lie/polyfill']
                 }
             }
         },
-        run: {
-            derequire: {
-                exec: 'derequire ' +
-                  '< dist/localforage.js > dist/localforage.tmp ' +
-                  '&& ncp dist/localforage.tmp dist/localforage.js' +
-                  '&& rimraf dist/localforage.tmp'
-            },
-            derequire_no_promises: {
-                exec: 'derequire ' +
-                '< dist/localforage.nopromises.js > dist/localforage.nopromises.tmp ' +
-                '&& ncp dist/localforage.nopromises.tmp dist/localforage.nopromises.js' +
-                '&& rimraf dist/localforage.nopromises.tmp'
-            }
-        },
         concat: {
             options: {
                 separator: ''
@@ -190,6 +176,14 @@ module.exports = exports = function(grunt) {
                 }
             }
         },
+        ts: {
+            typing_tests: {
+                tsconfig: {
+                    tsconfig: 'typing-tests',
+                    passThrough: true
+                }
+            }
+        },
         uglify: {
             localforage: {
                 files: {
@@ -239,7 +233,6 @@ module.exports = exports = function(grunt) {
 
     grunt.registerTask('default', ['build', 'connect', 'watch']);
     grunt.registerTask('build', ['browserify:main', 'browserify:no_promises',
-        'run:derequire', 'run:derequire_no_promises',
         'concat', 'es3_safe_recast', 'uglify']);
     grunt.registerTask('serve', ['build', 'connect:test', 'watch']);
 
@@ -249,6 +242,7 @@ module.exports = exports = function(grunt) {
         'babel',
         'jshint',
         'jscs',
+        'ts:typing_tests',
         'browserify:package_bundling_test',
         'webpack:package_bundling_test',
         'connect:test',