diff --git a/aio/package.json b/aio/package.json index bcbc767b5d..8fa34e4399 100644 --- a/aio/package.json +++ b/aio/package.json @@ -141,7 +141,7 @@ "find-free-port": "^2.0.0", "firebase-tools": "^9.8.0", "fs-extra": "^10.0.0", - "globby": "^11.0.3", + "globby": "^12.0.0", "hast-util-is-element": "^1.1.0", "hast-util-to-string": "^1.0.4", "html": "^1.0.0", diff --git a/aio/tools/example-zipper/exampleZipper.mjs b/aio/tools/example-zipper/exampleZipper.mjs index 4cfae83512..ce5f9cf21d 100644 --- a/aio/tools/example-zipper/exampleZipper.mjs +++ b/aio/tools/example-zipper/exampleZipper.mjs @@ -2,7 +2,7 @@ import archiver from 'archiver'; import path from 'canonical-path'; import fs from 'fs-extra'; -import globby from 'globby'; +import {globbySync} from 'globby'; import {fileURLToPath} from 'url'; import regionExtractor from '../transforms/examples-package/services/region-parser.js'; @@ -19,7 +19,7 @@ export class ExampleZipper { let gpathStackblitz = path.join(sourceDirName, '**/*stackblitz.json'); let gpathZipper = path.join(sourceDirName, '**/zipper.json'); - let configFileNames = globby.sync([gpathStackblitz, gpathZipper], { ignore: ['**/node_modules/**'] }); + let configFileNames = globbySync([gpathStackblitz, gpathZipper], { ignore: ['**/node_modules/**'] }); configFileNames.forEach((configFileName) => { this._zipExample(configFileName, sourceDirName, outputDirName); }); @@ -153,7 +153,7 @@ export class ExampleZipper { gpaths.push(...alwaysExcludes); - let fileNames = globby.sync(gpaths, { ignore: ['**/node_modules/**'] }); + let fileNames = globbySync(gpaths, { ignore: ['**/node_modules/**'] }); let zip = this._createZipArchive(outputFileName); fileNames.forEach((fileName) => { diff --git a/aio/tools/examples/run-example-e2e.mjs b/aio/tools/examples/run-example-e2e.mjs index f53fe21502..9a78fd5753 100644 --- a/aio/tools/examples/run-example-e2e.mjs +++ b/aio/tools/examples/run-example-e2e.mjs @@ -2,7 +2,7 @@ import path from 'canonical-path'; import {spawn} from 'cross-spawn'; import findFreePort from 'find-free-port'; import fs from 'fs-extra'; -import globby from 'globby'; +import {globby} from 'globby'; import puppeteer from 'puppeteer'; import shelljs from 'shelljs'; import treeKill from 'tree-kill'; diff --git a/aio/tools/stackblitz-builder/builder.mjs b/aio/tools/stackblitz-builder/builder.mjs index 71e299798f..1088d550ee 100644 --- a/aio/tools/stackblitz-builder/builder.mjs +++ b/aio/tools/stackblitz-builder/builder.mjs @@ -1,7 +1,7 @@ // Canonical path provides a consistent path (i.e. always forward slashes) across different OSes import path from 'canonical-path'; import fs from 'fs-extra'; -import globby from 'globby'; +import {globbySync} from 'globby'; import jsdom from 'jsdom'; import json5 from 'json5'; import {fileURLToPath} from 'url'; @@ -25,7 +25,7 @@ export class StackblitzBuilder { // When testing it sometimes helps to look a just one example directory like so: // const stackblitzPaths = path.join(this.basePath, '**/testing/*stackblitz.json'); const stackblitzPaths = path.join(this.basePath, '**/*stackblitz.json'); - const fileNames = globby.sync(stackblitzPaths, { ignore: ['**/node_modules/**'] }); + const fileNames = globbySync(stackblitzPaths, { ignore: ['**/node_modules/**'] }); let failed = false; fileNames.forEach((configFileName) => { try { @@ -126,7 +126,7 @@ export class StackblitzBuilder { _checkForOutdatedConfig() { // Ensure that nobody is trying to use the old config filenames (i.e. `plnkr.json`). const plunkerPaths = path.join(this.basePath, '**/*plnkr.json'); - const fileNames = globby.sync(plunkerPaths, { ignore: ['**/node_modules/**'] }); + const fileNames = globbySync(plunkerPaths, { ignore: ['**/node_modules/**'] }); if (fileNames.length) { const readmePath = path.join(__dirname, 'README.md'); @@ -328,7 +328,7 @@ export class StackblitzBuilder { gpaths.push(...defaultExcludes); - config.fileNames = globby.sync(gpaths, { ignore: ['**/node_modules/**'] }); + config.fileNames = globbySync(gpaths, { ignore: ['**/node_modules/**'] }); return config; } diff --git a/aio/yarn.lock b/aio/yarn.lock index 14691e2c5d..4b49b39da8 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -2452,6 +2452,11 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array-union@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" + integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== + array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" @@ -5335,7 +5340,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1, fast-glob@^3.2.5: +fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== @@ -5972,6 +5977,18 @@ globby@^11.0.1, globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" +globby@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-12.0.0.tgz#b8bbb8e9d48f8a3c9abf5624030f1f9e1cfbe3ed" + integrity sha512-3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA== + dependencies: + array-union "^3.0.1" + dir-glob "^3.0.1" + fast-glob "^3.2.7" + ignore "^5.1.8" + merge2 "^1.4.1" + slash "^4.0.0" + globby@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" @@ -8494,7 +8511,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -11494,6 +11511,11 @@ slash@3.0.0, slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== + slice-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"