Replace a few gulp tasks with npm scripts. Refs #7607.

Author: J-Fields

gulpfile.js

@@ -1,17 +1,12 @@
 const gulp = require('gulp');
 const bump = require('gulp-bump');
-const git = require('gulp-git');
 const tag_version = require('gulp-tag-version');
 const ts = require('gulp-typescript');
 const PluginError = require('plugin-error');
 const minimist = require('minimist');
 const path = require('path');
-const webpack = require('webpack');
-const webpack_stream = require('webpack-stream');
 const es = require('event-stream');
-
-const webpack_config = require('./webpack.config.js');
-const webpack_dev_config = require('./webpack.dev.js');
+const shell = require('gulp-shell');
 
 const releaseOptions = {
   semver: '',
@@ -41,10 +36,6 @@ function createGitTag() {
   return gulp.src(['./package.json']).pipe(tag_version());
 }
 
-function createGitCommit() {
-  return gulp.src(['./package.json', './yarn.lock']).pipe(git.commit('bump version'));
-}
-
 function updateVersion(done) {
   var options = minimist(process.argv.slice(2), releaseOptions);
 
@@ -102,33 +93,6 @@ gulp.task('tsc', function () {
   return tsResult.js.pipe(updatePath()).pipe(gulp.dest('out'));
 });
 
-gulp.task('webpack', function () {
-  return webpack_stream(
-    {
-      config: webpack_config,
-      entry: ['./extension.ts', './extensionWeb.ts'],
-    },
-    webpack,
-  ).pipe(gulp.dest('out'));
-});
-
-gulp.task('webpack-dev', function () {
-  return webpack_stream(
-    {
-      config: webpack_dev_config,
-      entry: ['./extension.ts'],
-    },
-    webpack,
-  ).pipe(gulp.dest('out'));
-});
-
-gulp.task('commit-hash', function (done) {
-  git.revParse({ args: 'HEAD', quiet: true }, function (err, hash) {
-    require('fs').writeFileSync('out/version.txt', hash);
-    done();
-  });
-});
-
 // test
 gulp.task('run-test', function (done) {
   // the flag --grep takes js regex as a string and filters by test and test suite names
@@ -182,9 +146,15 @@ gulp.task('run-test', function (done) {
   });
 });
 
-gulp.task('build', gulp.series('webpack', 'commit-hash'));
-gulp.task('build-dev', gulp.series('webpack-dev', 'commit-hash'));
 gulp.task('prepare-test', gulp.parallel('tsc', copyPackageJson));
 gulp.task('test', gulp.series('prepare-test', 'run-test'));
-gulp.task('release', gulp.series(validateArgs, updateVersion, createGitCommit, createGitTag));
-gulp.task('default', gulp.series('build', 'test'));
+gulp.task(
+  'release',
+  gulp.series(
+    validateArgs,
+    updateVersion,
+    shell.task('git commit -am "bump version"'),
+    createGitTag,
+  ),
+);
+gulp.task('default', shell.task('yarn build-dev'));

package.json

@@ -1178,10 +1178,11 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "gulp build",
-    "build": "gulp build",
-    "build-dev": "gulp build-dev",
+    "vscode:prepublish": "yarn build",
+    "build": "webpack -c webpack.config.js && npm run commit-hash",
+    "build-dev": "webpack -c webpack.dev.js && npm run commit-hash",
     "build-test": "gulp prepare-test",
+    "commit-hash": "git rev-parse HEAD > out/version.txt",
     "test": "node ./out/test/runTest.js",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -1225,7 +1226,7 @@
     "fork-ts-checker-webpack-plugin": "9.1.0",
     "gulp": "5.0.1",
     "gulp-bump": "3.2.0",
-    "gulp-git": "2.11.0",
+    "gulp-shell": "^0.8.0",
     "gulp-tag-version": "1.3.1",
     "gulp-typescript": "5.0.1",
     "husky": "^9.0.0",
@@ -1239,8 +1240,7 @@
     "typescript": "5.9.3",
     "webpack": "5.103.0",
     "webpack-cli": "6.0.1",
-    "webpack-merge": "6.0.1",
-    "webpack-stream": "7.0.0"
+    "webpack-merge": "6.0.1"
   },
   "lint-staged": {
     "*.{ts,js,json,md,yml}": "prettier --write",

yarn.lock

@@ -3,7 +3,7 @@
 
 
 "@azu/format-text@^1.0.1", "@azu/format-text@^1.0.2":
-  version "1.1.1"
+  version "1.0.2"
   resolved "https://registry.yarnpkg.com/@azu/format-text/-/format-text-1.0.2.tgz#abd46dab2422e312bd1bfe36f0d427ab6039825d"
   integrity sha512-Swi4N7Edy1Eqq82GxgEECXSSLyn6GOb5htRFPzBDdUkECGXtlf12ynO5oJSpWKPwCaUssOu7NfhDcCWpIC6Ywg==
 
@@ -1566,6 +1566,14 @@ chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -2200,13 +2208,6 @@ environment@^1.0.0:
   resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
   integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
 
-errno@^0.1.3:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
-  dependencies:
-    prr "~1.0.1"
-
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -3137,19 +3138,6 @@ gulp-cli@^3.1.0:
     v8flags "^4.0.0"
     yargs "^16.2.0"
 
-[email protected]:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/gulp-git/-/gulp-git-2.11.0.tgz#90eed3ebeabaf2497da405164514c7a9885b59c9"
-  integrity sha512-7YOcwin7sr68weYhBNOtZia3LZOGZWXgGcxxcxCi2hjljTgysOhH9mLTH2hdG5YLcuAFNg7mMbb2xIRfYsaQZw==
-  dependencies:
-    any-shell-escape "^0.1.1"
-    fancy-log "^1.3.2"
-    lodash "^4.17.21"
-    plugin-error "^1.0.1"
-    require-dir "^1.0.0"
-    strip-bom-stream "^3.0.0"
-    vinyl "^2.0.1"
-
 gulp-git@^2.4.2:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/gulp-git/-/gulp-git-2.10.1.tgz#218615c94bbf90660c1cb07a37054041d5e4f2eb"
@@ -3164,6 +3152,18 @@ gulp-git@^2.4.2:
     through2 "^2.0.3"
     vinyl "^2.0.1"
 
+gulp-shell@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/gulp-shell/-/gulp-shell-0.8.0.tgz#0ed4980de1d0c67e5f6cce971d7201fd0be50555"
+  integrity sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==
+  dependencies:
+    chalk "^3.0.0"
+    fancy-log "^1.3.3"
+    lodash.template "^4.5.0"
+    plugin-error "^1.0.1"
+    through2 "^3.0.1"
+    tslib "^1.10.0"
+
 [email protected]:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/gulp-tag-version/-/gulp-tag-version-1.3.1.tgz#afdcd238582fffcd9068b3c93277ad48870fbf36"
@@ -4075,11 +4075,6 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash.clone@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
-  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
-
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -4125,12 +4120,7 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash.some@^4.2.2:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
-
-lodash.template@^4.4.0:
+lodash.template@^4.4.0, lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -4268,14 +4258,6 @@ memfs@^3.4.1:
   dependencies:
     fs-monkey "1.0.3"
 
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
 meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -5062,11 +5044,6 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
 pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@@ -6104,7 +6081,7 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.0:
+through2@^3.0.0, through2@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
   integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
@@ -6190,6 +6167,11 @@ [email protected]:
     semver "^7.3.4"
     source-map "^0.7.4"
 
+tslib@^1.10.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
 tslib@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
@@ -6476,7 +6458,7 @@ vinyl-sourcemap@^2.0.0:
     vinyl "^3.0.0"
     vinyl-contents "^2.0.0"
 
-vinyl@^2.0.0, vinyl@^2.0.1, vinyl@^2.1.0, vinyl@^2.2.1:
+vinyl@^2.0.0, vinyl@^2.0.1, vinyl@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
   integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
@@ -6550,20 +6532,6 @@ webpack-sources@^3.3.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
   integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
 
-[email protected]:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-stream/-/webpack-stream-7.0.0.tgz#e6a1edb9568198499af872678e95031752d72f00"
-  integrity sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==
-  dependencies:
-    fancy-log "^1.3.3"
-    lodash.clone "^4.3.2"
-    lodash.some "^4.2.2"
-    memory-fs "^0.5.0"
-    plugin-error "^1.0.1"
-    supports-color "^8.1.1"
-    through "^2.3.8"
-    vinyl "^2.2.1"
-
 [email protected]:
   version "5.103.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.103.0.tgz#17a7c5a5020d5a3a37c118d002eade5ee2c6f3da"