Replacing custom tokenizer logic with the one from excel-formula-toke…

…nizer

- Also fixes joshbtn#83

gulpfile.js

@@ -3,6 +3,7 @@ var gulp = require('gulp'),
     rename = require('gulp-rename'),
     notify = require('gulp-notify'),
     concat = require('gulp-concat'),
+    webpack = require('webpack-stream'),
     del = require('del'),
     fs = require('fs.extra'),
     paths = {
@@ -33,16 +34,34 @@ gulp.task('update_bs_fonts', function(){
 
 gulp.task('libs', gulp.series('update_jquery', 'update_bs_js', 'update_bs_css', 'update_bs_fonts'));
 
-gulp.task('scripts', function() {
+gulp.task('script-concat', function() {
   return gulp.src(paths.scripts)
-      .pipe(concat('core.js'))
-      .pipe(concat('excel-formula.js'))
-      .pipe(gulp.dest('dist'))
-      .pipe(rename({suffix: '.min'}))
-      .pipe(uglify())
-      .pipe(gulp.dest('dist'))
+  .pipe(webpack({
+    mode: 'production',
+    output: {
+      filename: 'excel-formula.js',
+    },
+    optimization: {
+      minimize: false
+    }
+  }))
+  .pipe(gulp.dest('dist'))
+});
+
+gulp.task('script-minify', function() {
+  return gulp.src(paths.scripts)
+  .pipe(webpack({
+    mode: 'production',
+    output: {
+      filename: 'excel-formula.js',
+    }
+  }))
+  .pipe(rename({suffix: '.min'}))
+  .pipe(gulp.dest('dist'))
 });
 
+gulp.task('scripts', gulp.series(['script-concat', 'script-minify']))
+
 gulp.task('site', function() {
   return gulp.src(paths.siteScripts)
       .pipe(concat('page.js'))

package.json

@@ -17,11 +17,7 @@
   "repository": {
     "url": "git://github.com/joshatjben/excelFormulaUtilitiesJS.git"
   },
-  "keyword": [
-    "excel",
-    "formula",
-    "convert"
-  ],
+  "keyword": ["excel", "formula", "convert"],
   "scripts": {
     "build": "gulp",
     "test": "mocha & qunit -t ./test/browser/ExcelFormulaUtilities.test.js -d ./src/core.js -c ./src/ExcelFormulaUtilities.js  & qunit -c ./dist/excel-formula.min.js -t ./test/browser/ExcelFormulaUtilities.test.js & qunit -c ./dist/excel-formula.js -t ./test/browser/ExcelFormulaUtilities.test.js"
@@ -41,10 +37,13 @@
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.4.1",
     "mocha": "^9.1.3",
-    "qunit": "~0.7.7"
+    "qunit": "~0.7.7",
+    "webpack": "^5.65.0",
+    "webpack-stream": "^7.0.0"
   },
   "dependencies": {
     "bootstrap": "^4.1.3",
+    "excel-formula-tokenizer": "jlaramie/excel-formula-tokenizer#compatibility_updates",
     "jquery": "^3.2.1"
   }
 }