Fix up grunt task: run PR

localForage · Jan 25, 2017 · 9f4dfd3 · 9f4dfd3
2 parents 4e9bfa4 + 83ed8b2
commit 9f4dfd3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 28 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -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,28 +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'
-            },
-            typescript_test: {
-                exec: 'node_modules/.bin/tsc --project typing-tests'
-            }
-        },
         concat: {
             options: {
                 separator: ''
@@ -193,6 +176,11 @@ module.exports = exports = function(grunt) {
                 }
             }
         },
+        ts: {
+            typing_tests: {
+                files: 'typing-tests'
+            }
+        },
         uglify: {
             localforage: {
                 files: {
@@ -242,7 +230,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']);
 
@@ -252,7 +239,7 @@ module.exports = exports = function(grunt) {
         'babel',
         'jshint',
         'jscs',
-        'run:typescript_test',
+        'ts:typing_tests',
         'browserify:package_bundling_test',
         'webpack:package_bundling_test',
         'connect:test',

diff --git a/dist/localforage.js b/dist/localforage.js
@@ -343,7 +343,7 @@ if (typeof global.Promise !== 'function') {
 },{"2":2}],4:[function(_dereq_,module,exports){
 'use strict';
 
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

diff --git a/dist/localforage.min.js b/dist/localforage.min.js
diff --git a/dist/localforage.nopromises.js b/dist/localforage.nopromises.js
@@ -7,7 +7,7 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.localforage = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw (f.code="MODULE_NOT_FOUND", f)}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
 'use strict';
 
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

diff --git a/dist/localforage.nopromises.min.js b/dist/localforage.nopromises.min.js
diff --git a/package.json b/package.json
@@ -27,9 +27,9 @@
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-es2015-loose": "^7.0.0",
     "babelify": "^7.2.0",
+    "browserify-derequire": "^0.9.4",
     "bundle-collapser": "^1.2.1",
     "cors": "^2.3.1",
-    "derequire": "^2.0.3",
     "grunt": "^0.4.2",
     "grunt-babel": "^6.0.0",
     "grunt-browserify": "^3.8.0",
@@ -44,12 +44,11 @@
     "grunt-rollup": "^0.6.2",
     "grunt-run": "^0.5.2",
     "grunt-saucelabs": "^5.1.2",
+    "grunt-ts": "^6.0.0-beta.11",
     "grunt-webpack": "^1.0.11",
     "load-grunt-tasks": "^0.4.0",
     "mocha": "^1.18.2",
-    "ncp": "^2.0.0",
     "phantomjs": "^1.9.7-12",
-    "rimraf": "^2.5.2",
     "rollupify": "^0.1.0",
     "script-loader": "^0.6.1",
     "typescript": "^2.0.3",