sort glob output

latticexyz · Jul 3, 2024 · ab06dd5 · ab06dd5
1 parent 221d727
commit ab06dd5
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 22 deletions.
diff --git a/packages/abi-ts/src/index.ts b/packages/abi-ts/src/index.ts
@@ -24,7 +24,7 @@ const commandModule: CommandModule<Options, Options> = {
   },
 
   handler({ input }) {
-    const files = globSync(input);
+    const files = globSync(input).sort();
 
     if (!files.length) {
       console.error(`No files found for glob: ${input}`);

diff --git a/packages/cli/src/commands/set-version.ts b/packages/cli/src/commands/set-version.ts
@@ -63,7 +63,10 @@ const commandModule: CommandModule<Options, Options> = {
       }
 
       // Update all package.json below the current working directory (except in node_modules)
-      const packageJsons = globSync("**/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
@@ -7,9 +7,9 @@ export function findLibraries(forgeOutDir: string): readonly {
   readonly path: string;
   readonly name: string;
 }[] {
-  const artifacts = globSync(`${forgeOutDir}/**/*.json`, { ignore: "**/*.abi.json" }).map((path) =>
-    JSON.parse(readFileSync(path, "utf8")),
-  );
+  const artifacts = globSync(`${forgeOutDir}/**/*.json`, { ignore: "**/*.abi.json" })
+    .sort()
+    .map((path) => JSON.parse(readFileSync(path, "utf8")));
 
   const libraries = artifacts.flatMap((artifact) => {
     if (!artifact.metadata) return [];

diff --git a/packages/cli/src/utils/getExistingContracts.ts b/packages/cli/src/utils/getExistingContracts.ts
@@ -5,8 +5,10 @@ import { basename } from "path";
  * Get a list of all contract paths/names within the provided src directory
  */
 export function getExistingContracts(srcDir: string) {
-  return globSync(`${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
@@ -8,6 +8,7 @@ const mudWorkspace = path.normalize(`${__dirname}/../..`);
 
 const mudPackages: MudPackages = Object.fromEntries(
   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/ts/scripts/worldgen.ts b/packages/world-modules/ts/scripts/worldgen.ts
@@ -12,10 +12,12 @@ const clean = false;
 const srcDir = await getSrcDirectory();
 
 // Get a list of all contract names
-const existingContracts = globSync(`${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/src/codegen/interfaces/IBaseWorld.sol b/packages/world/src/codegen/interfaces/IBaseWorld.sol
diff --git a/packages/world/ts/scripts/worldgen.ts b/packages/world/ts/scripts/worldgen.ts
@@ -12,10 +12,12 @@ const clean = false;
 const srcDir = await getSrcDirectory();
 
 // Get a list of all contract names
-const existingContracts = globSync(`${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/scripts/changelog.ts b/scripts/changelog.ts
@@ -120,7 +120,7 @@ async function getChanges(include: "diff" | "all") {
     );
   } else if (include === "all") {
     // Load all current changesets from the .changeset dir
-    const changesetsToInclude = globSync(".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/scripts/export-tiled-types.ts b/templates/phaser/packages/art/scripts/export-tiled-types.ts
@@ -4,7 +4,7 @@ import { globSync } from "glob";
 import ejs from "ejs";
 import path from "path";
 
-const tilemaps = globSync("./tilesets/*.tsx");
+const tilemaps = globSync("./tilesets/*.tsx").sort();
 
 enum PropertyName {
   Name = "name",