From e49059f057575614071ad992cd4df387ba10ca33 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Wed, 3 Jul 2024 14:21:52 +0100 Subject: [PATCH] chore: bump glob (#2922) --- .changeset/shy-wombats-yawn.md | 9 + docs/pages/world/reference/world-external.mdx | 2 +- package.json | 3 +- packages/abi-ts/package.json | 3 +- packages/abi-ts/src/index.ts | 4 +- packages/cli/package.json | 3 +- packages/cli/src/commands/set-version.ts | 7 +- packages/cli/src/deploy/findLibraries.ts | 6 +- .../cli/src/utils/getExistingContracts.ts | 12 +- packages/cli/tsup.config.ts | 6 +- packages/world-modules/package.json | 3 +- packages/world-modules/ts/scripts/worldgen.ts | 12 +- packages/world/package.json | 3 +- .../src/codegen/interfaces/IBaseWorld.sol | 6 +- packages/world/ts/scripts/worldgen.ts | 12 +- pnpm-lock.yaml | 188 ++++++++++++++---- scripts/changelog.ts | 4 +- templates/phaser/packages/art/package.json | 3 +- .../art/scripts/export-tiled-types.ts | 5 +- 19 files changed, 204 insertions(+), 87 deletions(-) create mode 100644 .changeset/shy-wombats-yawn.md diff --git a/.changeset/shy-wombats-yawn.md b/.changeset/shy-wombats-yawn.md new file mode 100644 index 0000000000..e7824b5e2b --- /dev/null +++ b/.changeset/shy-wombats-yawn.md @@ -0,0 +1,9 @@ +--- +"@latticexyz/abi-ts": patch +"@latticexyz/cli": patch +"@latticexyz/world-modules": patch +"@latticexyz/world": patch +"create-mud": patch +--- + +Bumped `glob` dependency. diff --git a/docs/pages/world/reference/world-external.mdx b/docs/pages/world/reference/world-external.mdx index c6fa2f96d4..510c7d9e61 100644 --- a/docs/pages/world/reference/world-external.mdx +++ b/docs/pages/world/reference/world-external.mdx @@ -5,7 +5,7 @@ [Git Source](https://github.com/latticexyz/mud/blob/main/packages/world/src/codegen/interfaces/IBaseWorld.sol) **Inherits:** -[IStore](/store/reference/store#istore), [IWorldKernel](/world/reference/world-external#iworldkernel), [IAccessManagementSystem](/world/reference/world-external#iaccessmanagementsystem), [IBalanceTransferSystem](/world/reference/world-external#ibalancetransfersystem), [IBatchCallSystem](/world/reference/world-external#ibatchcallsystem), [IModuleInstallationSystem](/world/reference/world-external#imoduleinstallationsystem), [IWorldRegistrationSystem](/world/reference/world-external#iworldregistrationsystem), [IRegistrationSystem](/world/reference/world-external#iregistrationsystem) +[IStore](/store/reference/store#istore), [IWorldKernel](/world/reference/world-external#iworldkernel), [IRegistrationSystem](/world/reference/world-external#iregistrationsystem), [IAccessManagementSystem](/world/reference/world-external#iaccessmanagementsystem), [IBalanceTransferSystem](/world/reference/world-external#ibalancetransfersystem), [IBatchCallSystem](/world/reference/world-external#ibatchcallsystem), [IModuleInstallationSystem](/world/reference/world-external#imoduleinstallationsystem), [IWorldRegistrationSystem](/world/reference/world-external#iworldregistrationsystem) This interface integrates all systems and associated function selectors that are dynamically registered in the World during deployment. diff --git a/package.json b/package.json index 2259fa8451..b6350d9599 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "@arktype/attest": "0.7.5", "@arktype/util": "0.0.43", "@changesets/cli": "^2.26.1", - "@types/glob": "^7.2.0", "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": "7.1.1", "@typescript-eslint/parser": "7.1.1", @@ -48,7 +47,7 @@ "chalk": "^5.2.0", "eslint": "8.57.0", "execa": "^7.0.0", - "glob": "^8.0.3", + "glob": "^10.4.2", "husky": ">=6", "lint-staged": ">=10", "prettier": "3.2.5", diff --git a/packages/abi-ts/package.json b/packages/abi-ts/package.json index c035f13ab7..0fb246f6d8 100644 --- a/packages/abi-ts/package.json +++ b/packages/abi-ts/package.json @@ -37,12 +37,11 @@ "chalk": "^5.3.0", "debug": "^4.3.4", "execa": "^7.0.0", - "glob": "^8.0.3", + "glob": "^10.4.2", "yargs": "^17.7.1" }, "devDependencies": { "@types/debug": "^4.1.7", - "@types/glob": "^7.2.0", "@types/node": "^18.15.11", "@types/yargs": "^17.0.10", "tsup": "^6.7.0", diff --git a/packages/abi-ts/src/index.ts b/packages/abi-ts/src/index.ts index 7ddf08332e..7c859443d0 100644 --- a/packages/abi-ts/src/index.ts +++ b/packages/abi-ts/src/index.ts @@ -1,6 +1,6 @@ import type { CommandModule } from "yargs"; import { readFileSync, writeFileSync } from "fs"; -import glob from "glob"; +import { globSync } from "glob"; import { debug } from "./debug"; type Options = { @@ -24,7 +24,7 @@ const commandModule: CommandModule = { }, handler({ input }) { - const files = glob.sync(input); + const files = globSync(input).sort(); if (!files.length) { console.error(`No files found for glob: ${input}`); diff --git a/packages/cli/package.json b/packages/cli/package.json index e8d7599d8c..d0a6314f8e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -60,7 +60,7 @@ "ethers": "^5.7.2", "execa": "^7.0.0", "find-up": "^6.3.0", - "glob": "^8.0.3", + "glob": "^10.4.2", "openurl": "^1.1.1", "p-queue": "^7.4.1", "p-retry": "^5.1.2", @@ -77,7 +77,6 @@ "devDependencies": { "@types/debug": "^4.1.7", "@types/ejs": "^3.1.1", - "@types/glob": "^7.2.0", "@types/node": "^18.15.11", "@types/openurl": "^1.0.0", "@types/throttle-debounce": "^5.0.0", diff --git a/packages/cli/src/commands/set-version.ts b/packages/cli/src/commands/set-version.ts index c47786d2eb..48758352a1 100644 --- a/packages/cli/src/commands/set-version.ts +++ b/packages/cli/src/commands/set-version.ts @@ -5,7 +5,7 @@ import type { CommandModule } from "yargs"; import { MUDError } from "@latticexyz/common/errors"; import { logError } from "../utils/errors"; import localPackageJson from "../../package.json" assert { type: "json" }; -import glob from "glob"; +import { globSync } from "glob"; import { mudPackages } from "../mudPackages"; type Options = { @@ -63,7 +63,10 @@ const commandModule: CommandModule = { } // Update all package.json below the current working directory (except in node_modules) - const packageJsons = glob.sync("**/package.json").filter((p) => !p.includes("node_modules")); + const packageJsons = globSync("**/package.json") + .sort() + .filter((p) => !p.includes("node_modules")); + for (const packageJson of packageJsons) { updatePackageJson(packageJson, options); } diff --git a/packages/cli/src/deploy/findLibraries.ts b/packages/cli/src/deploy/findLibraries.ts index c2a87830cd..40609a0f98 100644 --- a/packages/cli/src/deploy/findLibraries.ts +++ b/packages/cli/src/deploy/findLibraries.ts @@ -1,5 +1,5 @@ import { readFileSync } from "fs"; -import glob from "glob"; +import { globSync } from "glob"; import { orderByDependencies } from "./orderByDependencies"; import { LinkReferences } from "../utils/findPlaceholders"; @@ -7,8 +7,8 @@ export function findLibraries(forgeOutDir: string): readonly { readonly path: string; readonly name: string; }[] { - const artifacts = glob - .sync(`${forgeOutDir}/**/*.json`, { ignore: "**/*.abi.json" }) + const artifacts = globSync(`${forgeOutDir}/**/*.json`, { ignore: "**/*.abi.json" }) + .sort() .map((path) => JSON.parse(readFileSync(path, "utf8"))); const libraries = artifacts.flatMap((artifact) => { diff --git a/packages/cli/src/utils/getExistingContracts.ts b/packages/cli/src/utils/getExistingContracts.ts index ac3f67d982..c23a474da4 100644 --- a/packages/cli/src/utils/getExistingContracts.ts +++ b/packages/cli/src/utils/getExistingContracts.ts @@ -1,12 +1,14 @@ -import glob from "glob"; +import { globSync } from "glob"; import { basename } from "path"; /** * Get a list of all contract paths/names within the provided src directory */ export function getExistingContracts(srcDir: string) { - return glob.sync(`${srcDir}/**/*.sol`).map((path) => ({ - path, - basename: basename(path, ".sol"), - })); + return globSync(`${srcDir}/**/*.sol`) + .sort() + .map((path) => ({ + path, + basename: basename(path, ".sol"), + })); } diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index 1034d999ad..3c4776d5a3 100644 --- a/packages/cli/tsup.config.ts +++ b/packages/cli/tsup.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from "tsup"; -import glob from "glob"; +import { globSync } from "glob"; import { readFileSync } from "node:fs"; import path from "node:path"; import { MudPackages } from "./src/common"; @@ -7,8 +7,8 @@ import { MudPackages } from "./src/common"; const mudWorkspace = path.normalize(`${__dirname}/../..`); const mudPackages: MudPackages = Object.fromEntries( - glob - .sync(path.join(mudWorkspace, `packages/*/package.json`)) + globSync(path.join(mudWorkspace, `packages/*/package.json`)) + .sort() .map((filename) => [ path.relative(mudWorkspace, path.dirname(filename)), JSON.parse(readFileSync(filename, "utf8")), diff --git a/packages/world-modules/package.json b/packages/world-modules/package.json index 474acbcd7d..d33320e1ab 100644 --- a/packages/world-modules/package.json +++ b/packages/world-modules/package.json @@ -53,12 +53,11 @@ "@latticexyz/abi-ts": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@types/ejs": "^3.1.1", - "@types/glob": "^7.2.0", "@types/mocha": "^9.1.1", "@types/node": "^18.15.11", "ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0", "forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1", - "glob": "^8.0.3", + "glob": "^10.4.2", "solhint": "^3.3.7", "tsup": "^6.7.0", "tsx": "^3.12.6", diff --git a/packages/world-modules/ts/scripts/worldgen.ts b/packages/world-modules/ts/scripts/worldgen.ts index 47b895c05b..16852d9730 100644 --- a/packages/world-modules/ts/scripts/worldgen.ts +++ b/packages/world-modules/ts/scripts/worldgen.ts @@ -1,4 +1,4 @@ -import glob from "glob"; +import { globSync } from "glob"; import path, { basename } from "path"; import { rmSync } from "fs"; import { loadConfig } from "@latticexyz/config/node"; @@ -12,10 +12,12 @@ const clean = false; const srcDir = await getSrcDirectory(); // Get a list of all contract names -const existingContracts = glob.sync(`${srcDir}/**/*.sol`).map((path) => ({ - path, - basename: basename(path, ".sol"), -})); +const existingContracts = globSync(`${srcDir}/**/*.sol`) + .sort() + .map((path) => ({ + path, + basename: basename(path, ".sol"), + })); // Load and resolve the config const mudConfig = (await loadConfig(configPath)) as WorldConfig; diff --git a/packages/world/package.json b/packages/world/package.json index ddd6426596..dc8a4885a5 100644 --- a/packages/world/package.json +++ b/packages/world/package.json @@ -78,13 +78,12 @@ "@latticexyz/abi-ts": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@types/ejs": "^3.1.1", - "@types/glob": "^7.2.0", "@types/mocha": "^9.1.1", "@types/node": "^18.15.11", "ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0", "ejs": "^3.1.10", "forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1", - "glob": "^8.0.3", + "glob": "^10.4.2", "solhint": "^3.3.7", "tsup": "^6.7.0", "tsx": "^3.12.6", diff --git a/packages/world/src/codegen/interfaces/IBaseWorld.sol b/packages/world/src/codegen/interfaces/IBaseWorld.sol index a30241297a..9d2ba9e356 100644 --- a/packages/world/src/codegen/interfaces/IBaseWorld.sol +++ b/packages/world/src/codegen/interfaces/IBaseWorld.sol @@ -6,12 +6,12 @@ pragma solidity >=0.8.24; import { IStore } from "@latticexyz/store/src/IStore.sol"; import { IWorldKernel } from "../../IWorldKernel.sol"; +import { IRegistrationSystem } from "./IRegistrationSystem.sol"; import { IAccessManagementSystem } from "./IAccessManagementSystem.sol"; import { IBalanceTransferSystem } from "./IBalanceTransferSystem.sol"; import { IBatchCallSystem } from "./IBatchCallSystem.sol"; import { IModuleInstallationSystem } from "./IModuleInstallationSystem.sol"; import { IWorldRegistrationSystem } from "./IWorldRegistrationSystem.sol"; -import { IRegistrationSystem } from "./IRegistrationSystem.sol"; /** * @title IBaseWorld @@ -23,10 +23,10 @@ import { IRegistrationSystem } from "./IRegistrationSystem.sol"; interface IBaseWorld is IStore, IWorldKernel, + IRegistrationSystem, IAccessManagementSystem, IBalanceTransferSystem, IBatchCallSystem, IModuleInstallationSystem, - IWorldRegistrationSystem, - IRegistrationSystem + IWorldRegistrationSystem {} diff --git a/packages/world/ts/scripts/worldgen.ts b/packages/world/ts/scripts/worldgen.ts index 90955971b3..366db3fae8 100644 --- a/packages/world/ts/scripts/worldgen.ts +++ b/packages/world/ts/scripts/worldgen.ts @@ -1,4 +1,4 @@ -import glob from "glob"; +import { globSync } from "glob"; import path, { basename } from "path"; import { rmSync } from "fs"; import { loadConfig } from "@latticexyz/config/node"; @@ -12,10 +12,12 @@ const clean = false; const srcDir = await getSrcDirectory(); // Get a list of all contract names -const existingContracts = glob.sync(`${srcDir}/**/*.sol`).map((path) => ({ - path, - basename: basename(path, ".sol"), -})); +const existingContracts = globSync(`${srcDir}/**/*.sol`) + .sort() + .map((path) => ({ + path, + basename: basename(path, ".sol"), + })); // Load and resolve the config const mudConfig = (await loadConfig(configPath)) as WorldConfig; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bac161a230..99d0e672ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,9 +17,6 @@ importers: '@changesets/cli': specifier: ^2.26.1 version: 2.26.1 - '@types/glob': - specifier: ^7.2.0 - version: 7.2.0 '@types/node': specifier: ^18.15.11 version: 18.15.11 @@ -42,8 +39,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 glob: - specifier: ^8.0.3 - version: 8.0.3 + specifier: ^10.4.2 + version: 10.4.2 husky: specifier: '>=6' version: 6.0.0 @@ -78,8 +75,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 glob: - specifier: ^8.0.3 - version: 8.0.3 + specifier: ^10.4.2 + version: 10.4.2 yargs: specifier: ^17.7.1 version: 17.7.1 @@ -87,9 +84,6 @@ importers: '@types/debug': specifier: ^4.1.7 version: 4.1.7 - '@types/glob': - specifier: ^7.2.0 - version: 7.2.0 '@types/node': specifier: ^18.15.11 version: 18.15.11 @@ -197,8 +191,8 @@ importers: specifier: ^6.3.0 version: 6.3.0 glob: - specifier: ^8.0.3 - version: 8.0.3 + specifier: ^10.4.2 + version: 10.4.2 openurl: specifier: ^1.1.1 version: 1.1.1 @@ -242,9 +236,6 @@ importers: '@types/ejs': specifier: ^3.1.1 version: 3.1.1 - '@types/glob': - specifier: ^7.2.0 - version: 7.2.0 '@types/node': specifier: ^18.15.11 version: 18.15.11 @@ -1057,9 +1048,6 @@ importers: '@types/ejs': specifier: ^3.1.1 version: 3.1.1 - '@types/glob': - specifier: ^7.2.0 - version: 7.2.0 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 @@ -1076,8 +1064,8 @@ importers: specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 glob: - specifier: ^8.0.3 - version: 8.0.3 + specifier: ^10.4.2 + version: 10.4.2 solhint: specifier: ^3.3.7 version: 3.3.7 @@ -1121,9 +1109,6 @@ importers: '@types/ejs': specifier: ^3.1.1 version: 3.1.1 - '@types/glob': - specifier: ^7.2.0 - version: 7.2.0 '@types/mocha': specifier: ^9.1.1 version: 9.1.1 @@ -1137,8 +1122,8 @@ importers: specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 glob: - specifier: ^8.0.3 - version: 8.0.3 + specifier: ^10.4.2 + version: 10.4.2 solhint: specifier: ^3.3.7 version: 3.3.7 @@ -1999,6 +1984,10 @@ packages: '@humanwhocodes/object-schema@2.0.2': resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} + '@isaacs/cliui@8.0.2': + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + '@istanbuljs/load-nyc-config@1.1.0': resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} engines: {node: '>=8'} @@ -2170,6 +2159,10 @@ packages: cpu: [x64] os: [linux] + '@pkgjs/parseargs@0.11.0': + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + '@remix-run/router@1.6.0': resolution: {integrity: sha512-N13NRw3T2+6Xi9J//3CGLsK2OqC8NMme3d/YX+nh05K9YHWGcv8DycHJrqGScSP4T75o8IN6nqIMhVFU8ohg8w==} engines: {node: '>=14'} @@ -2473,9 +2466,6 @@ packages: '@types/express@4.17.21': resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} - '@types/glob@7.2.0': - resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} - '@types/graceful-fs@4.1.6': resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} @@ -2524,9 +2514,6 @@ packages: '@types/mime@3.0.4': resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==} - '@types/minimatch@3.0.5': - resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} - '@types/minimist@1.2.2': resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} @@ -2843,6 +2830,10 @@ packages: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} + ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + antlr4@4.7.1: resolution: {integrity: sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ==} @@ -3574,6 +3565,9 @@ packages: duplexify@4.1.2: resolution: {integrity: sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==} + eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -3602,6 +3596,9 @@ packages: emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} @@ -3969,6 +3966,10 @@ packages: debug: optional: true + foreground-child@3.2.1: + resolution: {integrity: sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==} + engines: {node: '>=14'} + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1} version: 1.6.0 @@ -4089,15 +4090,23 @@ packages: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} + glob@10.4.2: + resolution: {integrity: sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==} + engines: {node: '>=16 || 14 >=14.18'} + hasBin: true + glob@7.1.6: resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} + deprecated: Glob versions prior to v9 are no longer supported glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + deprecated: Glob versions prior to v9 are no longer supported - glob@8.0.3: - resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==} + glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} + deprecated: Glob versions prior to v9 are no longer supported globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -4502,6 +4511,10 @@ packages: resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==} engines: {node: '>=8'} + jackspeak@3.4.0: + resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==} + engines: {node: '>=14'} + jake@10.8.5: resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==} engines: {node: '>=10'} @@ -4871,6 +4884,10 @@ packages: resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5 + lru-cache@10.3.0: + resolution: {integrity: sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==} + engines: {node: 14 || >=16.14} + lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} @@ -4985,6 +5002,10 @@ packages: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} + minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + engines: {node: '>=16 || 14 >=14.17'} + minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -5024,6 +5045,10 @@ packages: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} engines: {node: '>=16 || 14 >=14.17'} + minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} + engines: {node: '>=16 || 14 >=14.17'} + minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -5303,6 +5328,9 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + package-json-from-dist@1.0.0: + resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} + parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -5356,6 +5384,10 @@ packages: path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + path-scurry@1.11.1: + resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} + engines: {node: '>=16 || 14 >=14.18'} + path-to-regexp@6.2.1: resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} @@ -5903,6 +5935,10 @@ packages: signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + simple-concat@1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} @@ -6055,6 +6091,10 @@ packages: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} + string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + string.prototype.matchall@4.0.8: resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} @@ -6696,6 +6736,10 @@ packages: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} + wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} @@ -8098,6 +8142,15 @@ snapshots: '@humanwhocodes/object-schema@2.0.2': {} + '@isaacs/cliui@8.0.2': + dependencies: + string-width: 5.1.2 + string-width-cjs: string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: wrap-ansi@7.0.0 + '@istanbuljs/load-nyc-config@1.1.0': dependencies: camelcase: 5.3.1 @@ -8366,6 +8419,9 @@ snapshots: '@oven/bun-linux-x64@1.0.11': optional: true + '@pkgjs/parseargs@0.11.0': + optional: true + '@remix-run/router@1.6.0': {} '@samverschueren/stream-to-observable@0.3.1(rxjs@6.6.7)': @@ -8798,11 +8854,6 @@ snapshots: '@types/qs': 6.9.10 '@types/serve-static': 1.15.5 - '@types/glob@7.2.0': - dependencies: - '@types/minimatch': 3.0.5 - '@types/node': 18.15.11 - '@types/graceful-fs@4.1.6': dependencies: '@types/node': 18.15.11 @@ -8861,8 +8912,6 @@ snapshots: '@types/mime@3.0.4': {} - '@types/minimatch@3.0.5': {} - '@types/minimist@1.2.2': {} '@types/mocha@9.1.1': {} @@ -9212,6 +9261,8 @@ snapshots: ansi-styles@5.2.0: {} + ansi-styles@6.2.1: {} + antlr4@4.7.1: {} antlr4ts@0.5.0-alpha.4: {} @@ -9502,7 +9553,7 @@ snapshots: '@npmcli/move-file': 2.0.1 chownr: 2.0.0 fs-minipass: 2.1.0 - glob: 8.0.3 + glob: 8.1.0 infer-owner: 1.0.4 lru-cache: 7.18.3 minipass: 3.3.6 @@ -9945,6 +9996,8 @@ snapshots: readable-stream: 3.6.0 stream-shift: 1.0.1 + eastasianwidth@0.2.0: {} + ee-first@1.1.1: {} ejs@3.1.10: @@ -9971,6 +10024,8 @@ snapshots: emoji-regex@8.0.0: {} + emoji-regex@9.2.2: {} + encodeurl@1.0.2: {} encoding@0.1.13: @@ -10572,6 +10627,11 @@ snapshots: optionalDependencies: debug: 4.3.4 + foreground-child@3.2.1: + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: {} form-data@4.0.0: @@ -10691,6 +10751,15 @@ snapshots: dependencies: is-glob: 4.0.3 + glob@10.4.2: + dependencies: + foreground-child: 3.2.1 + jackspeak: 3.4.0 + minimatch: 9.0.5 + minipass: 7.1.2 + package-json-from-dist: 1.0.0 + path-scurry: 1.11.1 + glob@7.1.6: dependencies: fs.realpath: 1.0.0 @@ -10709,7 +10778,7 @@ snapshots: once: 1.4.0 path-is-absolute: 1.0.1 - glob@8.0.3: + glob@8.1.0: dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -11116,6 +11185,12 @@ snapshots: html-escaper: 2.0.2 istanbul-lib-report: 3.0.0 + jackspeak@3.4.0: + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + jake@10.8.5: dependencies: async: 3.2.4 @@ -11717,6 +11792,8 @@ snapshots: dependencies: get-func-name: 2.0.0 + lru-cache@10.3.0: {} + lru-cache@4.1.5: dependencies: pseudomap: 1.0.2 @@ -11846,6 +11923,10 @@ snapshots: dependencies: brace-expansion: 2.0.1 + minimatch@9.0.5: + dependencies: + brace-expansion: 2.0.1 + minimist-options@4.1.0: dependencies: arrify: 1.0.1 @@ -11886,6 +11967,8 @@ snapshots: minipass@7.0.4: {} + minipass@7.1.2: {} + minizlib@2.1.2: dependencies: minipass: 3.3.6 @@ -12161,6 +12244,8 @@ snapshots: p-try@2.2.0: {} + package-json-from-dist@1.0.0: {} + parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -12201,6 +12286,11 @@ snapshots: path-parse@1.0.7: {} + path-scurry@1.11.1: + dependencies: + lru-cache: 10.3.0 + minipass: 7.1.2 + path-to-regexp@6.2.1: {} path-type@4.0.0: {} @@ -12720,6 +12810,8 @@ snapshots: signal-exit@3.0.7: {} + signal-exit@4.1.0: {} + simple-concat@1.0.1: {} simple-get@4.0.1: @@ -12900,6 +12992,12 @@ snapshots: is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 + string-width@5.1.2: + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + string.prototype.matchall@4.0.8: dependencies: call-bind: 1.0.2 @@ -13568,6 +13666,12 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 + wrap-ansi@8.1.0: + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + wrappy@1.0.2: {} write-file-atomic@4.0.2: diff --git a/scripts/changelog.ts b/scripts/changelog.ts index 842249578f..3dbc23f14f 100644 --- a/scripts/changelog.ts +++ b/scripts/changelog.ts @@ -6,7 +6,7 @@ import { execa } from "execa"; import { readFileSync, writeFileSync } from "node:fs"; import path from "path"; -import glob from "glob"; +import { globSync } from "glob"; //--------- CONSTANTS @@ -120,7 +120,7 @@ async function getChanges(include: "diff" | "all") { ); } else if (include === "all") { // Load all current changesets from the .changeset dir - const changesetsToInclude = glob.sync(".changeset/*.md"); + const changesetsToInclude = globSync(".changeset/*.md").sort(); // Load the contents of each changeset from file and metadata from git changesetContents = await Promise.all( diff --git a/templates/phaser/packages/art/package.json b/templates/phaser/packages/art/package.json index 83c5300432..e83f223112 100644 --- a/templates/phaser/packages/art/package.json +++ b/templates/phaser/packages/art/package.json @@ -12,12 +12,11 @@ "devDependencies": { "@mapeditor/tiled-api": "^1.8.2", "@types/ejs": "^3.1.1", - "@types/glob": "^7.2.0", "@types/node": "^18.0.3", "ejs": "^3.1.10", "free-tex-packer-cli": "^0.3.0", "free-tex-packer-core": "^0.3.4", - "glob": "^8.0.3", + "glob": "^10.4.2", "optimist": "^0.6.1", "ts-node": "^10.8.2", "typescript": "5.4.2", diff --git a/templates/phaser/packages/art/scripts/export-tiled-types.ts b/templates/phaser/packages/art/scripts/export-tiled-types.ts index e0ec2a66e0..d54d207798 100644 --- a/templates/phaser/packages/art/scripts/export-tiled-types.ts +++ b/templates/phaser/packages/art/scripts/export-tiled-types.ts @@ -1,10 +1,11 @@ import xlmJs from "xml-js"; import fs from "fs"; -import glob from "glob"; +import { globSync } from "glob"; import ejs from "ejs"; import path from "path"; -const tilemaps = glob.sync("./tilesets/*.tsx"); +const tilemaps = globSync("./tilesets/*.tsx").sort(); + enum PropertyName { Name = "name", Frame = "frame",