Skip to content

Commit 7b45f33

Browse files
authored
Merge pull request #21475 from emberjs/renovate/glob-13.x
Update dependency glob to v13
2 parents e2719ce + 38022d9 commit 7b45f33

5 files changed

Lines changed: 15 additions & 16 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"expect-type": "^0.15.0",
124124
"fs-extra": "^11.1.1",
125125
"git-repo-info": "^2.1.1",
126-
"glob": "^8.0.3",
126+
"glob": "^13.0.0",
127127
"globals": "^17.0.0",
128128
"kill-port-process": "^3.2.1",
129129
"mitata": "^1.0.34",

pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rollup.config.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { dirname, parse, resolve, join } from 'node:path';
22
import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
33
import { createRequire } from 'node:module';
44
import { fileURLToPath } from 'node:url';
5-
import glob from 'glob';
5+
import { globSync } from 'glob';
66
import * as resolveExports from 'resolve.exports';
77
import { babel } from '@rollup/plugin-babel';
88
import sharedBabelConfig from './babel.config.mjs';
@@ -199,7 +199,7 @@ function renameEntrypoints(entrypoints, fn) {
199199

200200
function packages() {
201201
// Start by treating every module as an entrypoint
202-
let entryFiles = glob.sync('**/*.{ts,js}', {
202+
let entryFiles = globSync('**/*.{ts,js}', {
203203
ignore: [
204204
// d.ts is not .ts
205205
'**/*.d.ts',
@@ -240,7 +240,7 @@ function packages() {
240240
// add only the entrypoints of the rolledUpPackages
241241
entryFiles = [
242242
...entryFiles,
243-
...glob.sync(`{${rolledUpPackages().join(',')}}/index.{js,ts}`, { cwd: 'packages' }),
243+
...globSync(`{${rolledUpPackages().join(',')}}/index.{js,ts}`, { cwd: 'packages' }),
244244
];
245245

246246
return Object.fromEntries(

tests/node-vitest/lib/find-side-effects.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { readFileSync, writeFileSync, mkdtempSync, rmSync } from 'node:fs';
1717
import { resolve, relative, dirname } from 'node:path';
1818
import { fileURLToPath } from 'node:url';
1919
import { tmpdir } from 'node:os';
20-
import glob from 'glob';
20+
import { globSync } from 'glob';
2121
import { doesHaveSideEffects } from './has-side-effects.js';
2222
import config from '../../../rollup.config.mjs';
2323

@@ -65,7 +65,7 @@ function sourceName(rel) {
6565
}
6666

6767
async function sideEffectfulModules(outDir) {
68-
let files = glob.sync('**/*.js', { cwd: outDir, nodir: true, absolute: true });
68+
let files = globSync('**/*.js', { cwd: outDir, nodir: true, absolute: true });
6969
let flagged = new Set();
7070
let batchSize = 60;
7171
for (let i = 0; i < files.length; i += batchSize) {

types/publish.mjs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@packageDocumentation
3333
*/
3434

35-
import glob from 'glob';
35+
import { globSync } from 'glob';
3636
import { spawnSync } from 'node:child_process';
3737
import fs from 'node:fs/promises';
3838
import path from 'node:path';
@@ -115,7 +115,7 @@ async function main() {
115115
// This is rooted in the `TYPES_DIR` so that the result is just the names of
116116
// the modules, as generated directly from the tsconfig above. These must
117117
// *all* appear in the final set of `/// <reference ...>`s we emit.
118-
let allModules = glob.sync('**/*.d.ts', {
118+
let allModules = globSync('**/*.d.ts', {
119119
ignore: 'index.d.ts', // ignore the root file itself if it somehow exists
120120
cwd: TYPES_DIR,
121121
});
@@ -191,11 +191,10 @@ function copyRemappedLocationModules() {
191191
@returns {Promise<Array<string>>} The modules copied over by hand.
192192
*/
193193
async function copyHandwrittenDefinitions(inputDir) {
194-
let definitionModules = glob
195-
.sync('**/*.d.ts', {
196-
cwd: inputDir,
197-
ignore: ['**/node_modules/**', '**/@types/js-reporters/**'],
198-
})
194+
let definitionModules = globSync('**/*.d.ts', {
195+
cwd: inputDir,
196+
ignore: ['**/node_modules/**', '**/@types/js-reporters/**'],
197+
})
199198
.filter((moduleName) => !REMAPPED_LOCATION_MODULES.some(({ input }) => input === moduleName));
200199

201200
await doOrDie(() =>

0 commit comments

Comments
 (0)