chore: update world imports (#2487)

latticexyz · Mar 20, 2024 · 843298a · 843298a
1 parent 9e34390
commit 843298a
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 177 deletions.
diff --git a/e2e/packages/contracts/mud.config.ts b/e2e/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/examples/minimal/packages/contracts/mud.config.ts b/examples/minimal/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 import { resolveTableId } from "@latticexyz/config/library";
 
 export default defineWorld({

diff --git a/examples/minimal/packages/plugin-example/.gitignore b/examples/minimal/packages/plugin-example/.gitignore
diff --git a/examples/minimal/packages/plugin-example/package.json b/examples/minimal/packages/plugin-example/package.json
diff --git a/examples/minimal/packages/plugin-example/ts/library/config.ts b/examples/minimal/packages/plugin-example/ts/library/config.ts
diff --git a/examples/minimal/packages/plugin-example/ts/library/defaults.ts b/examples/minimal/packages/plugin-example/ts/library/defaults.ts
diff --git a/examples/minimal/packages/plugin-example/ts/library/index.ts b/examples/minimal/packages/plugin-example/ts/library/index.ts
diff --git a/examples/minimal/packages/plugin-example/ts/library/types.ts b/examples/minimal/packages/plugin-example/ts/library/types.ts
diff --git a/examples/minimal/packages/plugin-example/ts/register/configExtensions.ts b/examples/minimal/packages/plugin-example/ts/register/configExtensions.ts
diff --git a/examples/minimal/packages/plugin-example/ts/register/index.ts b/examples/minimal/packages/plugin-example/ts/register/index.ts
diff --git a/examples/minimal/packages/plugin-example/ts/register/typeExtensions.ts b/examples/minimal/packages/plugin-example/ts/register/typeExtensions.ts
diff --git a/examples/minimal/packages/plugin-example/tsconfig.json b/examples/minimal/packages/plugin-example/tsconfig.json
diff --git a/examples/minimal/packages/plugin-example/tsup.config.ts b/examples/minimal/packages/plugin-example/tsup.config.ts
diff --git a/examples/multiple-accounts/packages/contracts/mud.config.ts b/examples/multiple-accounts/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   namespace: "LastCall",

diff --git a/packages/cli/src/build.ts b/packages/cli/src/build.ts
@@ -2,7 +2,8 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { tablegen } from "@latticexyz/store/codegen";
 import { worldgen } from "@latticexyz/world/node";
-import { World as WorldConfig, worldToV1 } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
+import { worldToV1 } from "@latticexyz/world/config/v2";
 import { forge, getForgeConfig, getRemappings } from "@latticexyz/common/foundry";
 import { getExistingContracts } from "./utils/getExistingContracts";
 import { debug as parentDebug } from "./debug";

diff --git a/packages/cli/src/commands/build.ts b/packages/cli/src/commands/build.ts
@@ -1,6 +1,6 @@
 import type { CommandModule } from "yargs";
 import { loadConfig } from "@latticexyz/config/node";
-import { World as WorldConfig } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
 
 import { getSrcDirectory } from "@latticexyz/common/foundry";
 import { build } from "../build";

diff --git a/packages/cli/src/commands/dev-contracts.ts b/packages/cli/src/commands/dev-contracts.ts
@@ -4,7 +4,7 @@ import chalk from "chalk";
 import chokidar from "chokidar";
 import { loadConfig, resolveConfigPath } from "@latticexyz/config/node";
 import path from "path";
-import { World as WorldConfig } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
 import { homedir } from "os";
 import { rmSync } from "fs";
 import { deployOptions, runDeploy } from "../runDeploy";

diff --git a/packages/cli/src/commands/trace.ts b/packages/cli/src/commands/trace.ts
@@ -12,7 +12,8 @@ import { resourceToHex } from "@latticexyz/common";
 import { getExistingContracts } from "../utils/getExistingContracts";
 import { createClient, http } from "viem";
 import { getChainId } from "viem/actions";
-import { World as WorldConfig, worldToV1 } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
+import { worldToV1 } from "@latticexyz/world/config/v2";
 
 // TODO account for multiple namespaces (https://github.com/latticexyz/mud/issues/994)
 const systemsTableId = resourceToHex({

diff --git a/packages/cli/src/commands/worldgen.ts b/packages/cli/src/commands/worldgen.ts
@@ -1,6 +1,6 @@
 import type { CommandModule } from "yargs";
 import { loadConfig } from "@latticexyz/config/node";
-import { World as WorldConfig } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
 import { worldgen } from "@latticexyz/world/node";
 import { getSrcDirectory } from "@latticexyz/common/foundry";
 import path from "path";

diff --git a/packages/cli/src/runDeploy.ts b/packages/cli/src/runDeploy.ts
@@ -5,7 +5,8 @@ import { deploy } from "./deploy/deploy";
 import { createWalletClient, http, Hex, isHex } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { loadConfig } from "@latticexyz/config/node";
-import { World as WorldConfig, worldToV1 } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
+import { worldToV1 } from "@latticexyz/world/config/v2";
 import { getOutDirectory, getRpcUrl, getSrcDirectory } from "@latticexyz/common/foundry";
 import chalk from "chalk";
 import { MUDError } from "@latticexyz/common/errors";

diff --git a/packages/world-modules/mud.config.ts b/packages/world-modules/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   codegen: {

diff --git a/packages/world-modules/ts/scripts/worldgen.ts b/packages/world-modules/ts/scripts/worldgen.ts
@@ -3,7 +3,7 @@ import path, { basename } from "path";
 import { rmSync } from "fs";
 import { loadConfig } from "@latticexyz/config/node";
 import { getSrcDirectory } from "@latticexyz/common/foundry";
-import { World as WorldConfig } from "@latticexyz/world/config/v2";
+import { World as WorldConfig } from "@latticexyz/world";
 import { worldgen } from "@latticexyz/world/node";
 
 // TODO dedupe this and cli's worldgen command

diff --git a/templates/phaser/packages/contracts/mud.config.ts b/templates/phaser/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/templates/react-ecs/packages/contracts/mud.config.ts b/templates/react-ecs/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/templates/react/packages/contracts/mud.config.ts b/templates/react/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/templates/threejs/packages/contracts/mud.config.ts b/templates/threejs/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/templates/vanilla/packages/contracts/mud.config.ts b/templates/vanilla/packages/contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   tables: {

diff --git a/test/mock-game-contracts/mud.config.ts b/test/mock-game-contracts/mud.config.ts
@@ -1,4 +1,4 @@
-import { defineWorld } from "@latticexyz/world/config/v2";
+import { defineWorld } from "@latticexyz/world";
 
 export default defineWorld({
   enums: {