replace merge-stream with ordered-read-streams

Author: dabeng

gulpfile.js

@@ -5,7 +5,7 @@ var uglify = require('gulp-uglify');
 var rename = require("gulp-rename");
 var del = require('del');
 var eslint = require('gulp-eslint');
-var merge = require('merge-stream');
+var merge = require('ordered-read-streams');
 var csslint = require('gulp-csslint');
 var cleanCSS = require('gulp-clean-css');
 var sourcemaps = require('gulp-sourcemaps');
@@ -71,6 +71,12 @@ gulp.task('e2e-tests', gulp.series('addAssets', function () {
   });
 }));
 
+// gulp.task('e2e-tests', function () {
+//   return cypress.run({
+//     spec: 'test/cypress/e2e/**/*.cy.js',
+//   });
+// });
+
 gulp.task('test', gulp.series('e2e-tests'));
 
 gulp.task('cleanupJS', function() {

package-lock.json

@@ -9,6 +9,9 @@
   "scripts": {
     "test": "gulp test",
     "unit-tests": "gulp unit-tests",
+    "integration-tests": "gulp integration-tests",
+    "e2e-tests": "gulp e2e-tests",
+    "addAssets": "gulp addAssets",
     "build": "gulp build",
     "start": "gulp serve",
     "cypress:open": "cypress open"
@@ -64,8 +67,8 @@
     "jest-puppeteer": "^4.3.0",
     "jsdom": "^16.5.0",
     "jsdom-global": "^3.0.2",
-    "merge-stream": "^1.0.1",
     "mocha": "^10.2.0",
+    "ordered-read-streams": "^2.0.0",
     "puppeteer": "^1.20.0",
     "sinon": "^4.5.0",
     "sinon-chai": "^2.14.0"