Merge pull request #3407 from AJIb63PT/v7

migrate glob v7 to v11

Author: swissspidy

.github/workflows/pull-request.yml

@@ -9,9 +9,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version-file: '.nvmrc'
 
       - name: Get npm cache directory
         id: npm-cache
@@ -37,9 +37,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version-file: '.nvmrc'
 
       - uses: actions/cache@v3
         with:

.nvmrc

@@ -1 +1 @@
-18
+20

gulp-tasks/test-integration.js

@@ -8,7 +8,7 @@
 
 const clearModule = require('clear-module');
 const execa = require('execa');
-const glob = require('glob');
+const {globSync} = require('glob');
 const ol = require('common-tags').oneLine;
 const upath = require('upath');
 const seleniumAssistant = require('selenium-assistant');
@@ -63,7 +63,7 @@ async function runTestSuite(testPath, nodeEnv, seleniumBrowser, webdriver) {
       webdriver,
     };
 
-    const testFiles = glob.sync(
+    const testFiles = globSync(
       upath.join(__dirname, '..', testPath, 'test-*.js'),
     );
 
@@ -74,7 +74,7 @@ async function runTestSuite(testPath, nodeEnv, seleniumBrowser, webdriver) {
 }
 
 async function runIntegrationForBrowser(browser) {
-  const packagesToTest = glob.sync(`test/${global.packageOrStar}/integration`);
+  const packagesToTest = globSync(`test/${global.packageOrStar}/integration`);
 
   for (const buildKey of Object.keys(constants.BUILD_TYPES)) {
     const webdriver = await browser.getSeleniumDriver();
@@ -121,7 +121,7 @@ async function test_integration() {
   await seleniumAssistant.downloadLocalBrowser('chrome', 'stable', expiration);
   await seleniumAssistant.downloadLocalBrowser('firefox', 'stable', expiration);
 
-  const packagesToTest = glob.sync(`test/${global.packageOrStar}/integration`);
+  const packagesToTest = globSync(`test/${global.packageOrStar}/integration`);
   if (packagesToTest.length === 0) {
     return;
   }

gulp-tasks/test-node.js

@@ -9,7 +9,7 @@
 const {series} = require('gulp');
 const execa = require('execa');
 const fse = require('fs-extra');
-const glob = require('glob');
+const {globSync} = require('glob');
 const ol = require('common-tags').oneLine;
 const upath = require('upath');
 
@@ -58,7 +58,7 @@ async function runNodeTestsWithEnv(testGroup, nodeEnv) {
     globConfig.ignore = [];
   }
 
-  const packagesToTest = glob.sync(`test/${testGroup}/node`, globConfig);
+  const packagesToTest = globSync(`test/${testGroup}/node`, globConfig);
   for (const packageToTest of packagesToTest) {
     // Hardcode special logic for webpack v4 and v5 tests, which need to
     // be run in separate processes.

gulp-tasks/utils/analyse-properties.js

@@ -19,7 +19,7 @@
  * This is very rough and vague. It needs to be run manually and if it's not
  * used can and should be removed from Workbox repo.
  */
-const glob = require('glob');
+const {globSync} = require('glob');
 const path = require('path');
 const fs = require('fs-extra');
 const babylon = require('babylon');
@@ -54,7 +54,7 @@ class AnalyseBuildForProperties {
       constants.PACKAGE_BUILD_DIRNAME,
       '{*.prod.js,workbox-sw.js}',
     );
-    return glob.sync(buildGlob);
+    return globSync(buildGlob);
   }
 
   analyzeFile(filePath) {

gulp-tasks/utils/cdn-helper.js

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const glob = require('glob');
+const {globSync} = require('glob');
 const path = require('path');
 const {Storage} = require('@google-cloud/storage');
 
@@ -56,7 +56,7 @@ class CDNHelper {
   async upload(tagName, directoryToUpload) {
     const gcs = await this.getGCS();
 
-    const filePaths = glob.sync(`${directoryToUpload}/*`, {
+    const filePaths = globSync(`${directoryToUpload}/*`, {
       absolute: true,
     });
 

gulp-tasks/utils/get-packages.js

@@ -6,13 +6,13 @@
   https://opensource.org/licenses/MIT.
 */
 
-const glob = require('glob');
+const {globSync} = require('glob');
 const path = require('path');
 
 const DEFAULT_ROOT = path.join(__dirname, '..', '..');
 
 const getPackages = ({type, root = DEFAULT_ROOT} = {}) => {
-  const pathToPkgJsons = glob.sync('packages/*/package.json', {cwd: root});
+  const pathToPkgJsons = globSync('packages/*/package.json', {cwd: root});
 
   return pathToPkgJsons
     .map((pathToPkgJson) => {

gulp-tasks/utils/package-runner.js

@@ -7,7 +7,8 @@
 */
 
 const path = require('path');
-const glob = require('glob');
+const {globSync} = require('glob');
+
 const oneLine = require('common-tags').oneLine;
 
 const pkgPathToName = require('./pkg-path-to-name');
@@ -18,20 +19,18 @@ const pkgPathToName = require('./pkg-path-to-name');
  * @return Array<string> Paths to package.json files for the matching packages.
  */
 function getPackages(typeFilter) {
-  return glob
-    .sync(`packages/${global.packageOrStar}/package.json`, {
-      absolute: true,
-    })
-    .filter((pathToPackageJson) => {
-      const pkgInfo = require(pathToPackageJson);
-      const packageType = pkgInfo.workbox.packageType;
-      if (!packageType) {
-        throw Error(oneLine`Unable to determine package type. Please add
+  return globSync(`packages/${global.packageOrStar}/package.json`, {
+    absolute: true,
+  }).filter((pathToPackageJson) => {
+    const pkgInfo = require(pathToPackageJson);
+    const packageType = pkgInfo.workbox.packageType;
+    if (!packageType) {
+      throw Error(oneLine`Unable to determine package type. Please add
       workbox.packageType metadata to ${pathToPackageJson}`);
-      }
+    }
 
-      return typeFilter === 'all' || typeFilter === packageType;
-    });
+    return typeFilter === 'all' || typeFilter === packageType;
+  });
 }
 
 /*

gulp-tasks/utils/publish-helpers.js

@@ -8,7 +8,7 @@
 
 const execa = require('execa');
 const fse = require('fs-extra');
-const glob = require('glob');
+const {globSync} = require('glob');
 const ol = require('common-tags').oneLine;
 const upath = require('upath');
 
@@ -126,7 +126,7 @@ const groupBuildFiles = async (tagName, gitBranch) => {
 
     // Copy files from the source code and move into the grouped build
     // directory. In others, have a flat file structure of just the built files.
-    const filesToInclude = glob.sync(pattern);
+    const filesToInclude = globSync(pattern);
     for (const fileToInclude of filesToInclude) {
       await fse.copy(
         fileToInclude,