Merge pull request #28 from drekbour/lodash-fix

drewnoakes · web-flow · commit 5c97054ddda7 · 2020-01-02T09:50:06.000+11:00
Fix build broken by lodash upgrade
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .idea
 node_modules/
 dist/
+package-lock.json
+
diff --git a/gulpfile.js b/gulpfile.js
@@ -16,7 +16,7 @@ gulp.task('lib', function() {
 	return gulp.src(
 		[
 			'node_modules/jquery/dist/jquery.min.js',
-			'node_modules/lodash/dist/lodash.min.js',
+			'node_modules/lodash/lodash.min.js',
 			'node_modules/handlebars/dist/handlebars.min.js'
 		])
         .pipe(gulp.dest('dist/scripts/lib'))
@@ -53,4 +53,4 @@ gulp.task('img', function() {
         .pipe(gulp.dest('dist/img'))
 });
 
-gulp.task('default', ['app', 'lib', 'lib-min', 'styles', 'index', 'img']);
+gulp.task('default', gulp.parallel('app', 'lib', 'lib-min', 'styles', 'index', 'img'));
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "requirejs": "2.1.11"
   },
   "devDependencies": {
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.2",
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^2.1.2"
   }
diff --git a/src/scripts/app/FixParser.js b/src/scripts/app/FixParser.js
@@ -38,7 +38,7 @@ define(
 
                 var classes = [];
 
-                if (_.contains(data.systemFieldIds, fieldId)) {
+                if (_.includes(data.systemFieldIds, fieldId)) {
                     classes.push("system-field");
                 }
 
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 .idea
 node_modules/
 dist/
 +package-lock.json
++
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ define(`
`38`	`38`
`39`	`39`	`var classes = [];`
`40`	`40`
`41`		`- if (_.contains(data.systemFieldIds, fieldId)) {`
	`41`	`+ if (_.includes(data.systemFieldIds, fieldId)) {`
`42`	`42`	`classes.push("system-field");`
`43`	`43`	`}`
`44`	`44`