fixes

latticexyz · May 23, 2024 · 6ad3e7c · 6ad3e7c
1 parent 1f1cd70
commit 6ad3e7c
Show file tree

Hide file tree

Showing 34 changed files with 60 additions and 138 deletions.
diff --git a/e2e/packages/client-vanilla/package.json b/e2e/packages/client-vanilla/package.json
@@ -20,7 +20,6 @@
     "@latticexyz/world": "link:../../../packages/world",
     "async-mutex": "^0.4.0",
     "contracts": "workspace:*",
-    "lodash": "^4.17.21",
     "mobx": "^6.7.0",
     "nice-grpc": "^2.0.1",
     "nice-grpc-web": "^2.0.1",

diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml
diff --git a/examples/minimal/packages/client-phaser/package.json b/examples/minimal/packages/client-phaser/package.json
@@ -26,6 +26,7 @@
     "mobx": "^6.7.0",
     "nice-grpc": "^2.0.1",
     "nice-grpc-web": "^2.0.1",
+    "phaser": "3.60.0-beta.14",
     "proxy-deep": "^3.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -39,6 +40,7 @@
     "zustand": "^4.3.8"
   },
   "devDependencies": {
+    "@types/lodash": "^4.17.4",
     "@types/react": "18.2.22",
     "@types/react-dom": "18.2.7",
     "@types/styled-components": "^5.1.26",

diff --git a/examples/minimal/packages/client-phaser/src/layers/phaser/configurePhaser.ts b/examples/minimal/packages/client-phaser/src/layers/phaser/configurePhaser.ts
@@ -1,3 +1,4 @@
+import Phaser from "phaser";
 import {
   defineSceneConfig,
   AssetType,

diff --git a/examples/minimal/packages/client-phaser/src/layers/phaser/systems/createSoldierSystem.ts b/examples/minimal/packages/client-phaser/src/layers/phaser/systems/createSoldierSystem.ts
@@ -1,3 +1,4 @@
+import Phaser from "phaser";
 import { defineComponentSystem } from "@latticexyz/recs";
 import { PhaserLayer } from "../createPhaserLayer";
 import { Animations, Sprites } from "../constants";

diff --git a/examples/minimal/packages/client-phaser/src/ui/hooks/usePhaserLayer.tsx b/examples/minimal/packages/client-phaser/src/ui/hooks/usePhaserLayer.tsx
@@ -1,3 +1,4 @@
+import Phaser from "phaser";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import useResizeObserver, { ResizeHandler } from "use-resize-observer";
 import { throttle } from "lodash";

diff --git a/examples/minimal/packages/client-react/package.json b/examples/minimal/packages/client-react/package.json
@@ -22,7 +22,6 @@
     "@latticexyz/world": "link:../../../../packages/world",
     "async-mutex": "^0.4.0",
     "contracts": "workspace:*",
-    "lodash": "^4.17.21",
     "mobx": "^6.7.0",
     "nice-grpc": "^2.0.1",
     "nice-grpc-web": "^2.0.1",

diff --git a/examples/minimal/packages/client-vanilla/package.json b/examples/minimal/packages/client-vanilla/package.json
@@ -20,7 +20,6 @@
     "@latticexyz/world": "link:../../../../packages/world",
     "async-mutex": "^0.4.0",
     "contracts": "workspace:*",
-    "lodash": "^4.17.21",
     "mobx": "^6.7.0",
     "nice-grpc": "^2.0.1",
     "nice-grpc-web": "^2.0.1",

diff --git a/examples/minimal/pnpm-lock.yaml b/examples/minimal/pnpm-lock.yaml
diff --git a/packages/create-mud/scripts/copy-templates.sh b/packages/create-mud/scripts/copy-templates.sh
@@ -2,7 +2,7 @@
 
 # Find git-aware template files (ignores things like node_modules, etc.)
 # and copy them to dist/templates
-git ls-files ../../templates | rsync --files-from=- ../../ dist
+git ls-files ../../templates | rsync --files-from=- --copy-links ../../ dist
 
 # Replace all MUD package links with mustache placeholder used by create-create-app
 # that will be replaced with the latest MUD version number when the template is used

diff --git a/packages/schema-type/package.json b/packages/schema-type/package.json
@@ -18,6 +18,7 @@
     "dist",
     "out",
     "foundry.toml",
+    "src",
     "cache"
   ],
   "scripts": {

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -23,6 +23,7 @@
     "dist",
     "out",
     "foundry.toml",
+    "src",
     "cache"
   ],
   "scripts": {

diff --git a/packages/world-modules/package.json b/packages/world-modules/package.json
@@ -17,6 +17,7 @@
     "dist",
     "out",
     "foundry.toml",
+    "src",
     "cache"
   ],
   "scripts": {

diff --git a/packages/world/package.json b/packages/world/package.json
@@ -22,6 +22,7 @@
     "dist",
     "out",
     "foundry.toml",
+    "src",
     "cache",
     "test/MudTest.t.sol"
   ],

diff --git a/templates/phaser/packages/client/package.json b/templates/phaser/packages/client/package.json
@@ -22,6 +22,7 @@
     "@latticexyz/world": "link:../../../../packages/world",
     "contracts": "workspace:*",
     "lodash": "^4.17.21",
+    "phaser": "3.60.0-beta.14",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rxjs": "7.5.5",
@@ -32,7 +33,7 @@
     "zustand": "^4.3.8"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.17.4",
     "@types/react": "18.2.22",
     "@types/react-dom": "18.2.7",
     "@types/styled-components": "^5.1.26",

diff --git a/templates/phaser/packages/client/src/layers/phaser/configurePhaser.ts b/templates/phaser/packages/client/src/layers/phaser/configurePhaser.ts
@@ -1,3 +1,4 @@
+import Phaser from "phaser";
 import {
   defineSceneConfig,
   AssetType,

diff --git a/templates/phaser/packages/client/src/ui/hooks/usePhaserLayer.tsx b/templates/phaser/packages/client/src/ui/hooks/usePhaserLayer.tsx
@@ -1,3 +1,4 @@
+import Phaser from "phaser";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import useResizeObserver, { ResizeHandler } from "use-resize-observer";
 import { throttle } from "lodash";

diff --git a/templates/phaser/packages/client/tsconfig.json b/templates/phaser/packages/client/tsconfig.json
@@ -1,17 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/templates/phaser/packages/contracts/tsconfig.json b/templates/phaser/packages/contracts/tsconfig.json
@@ -1,13 +1,3 @@
-// Visit https://aka.ms/tsconfig.json for all config options
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  }
+  "extends": "../../tsconfig.json"
 }
diff --git a/templates/phaser/tsconfig.json b/templates/phaser/tsconfig.json
@@ -0,0 +1 @@
+../../tsconfig.build.json
diff --git a/templates/react-ecs/packages/client/tsconfig.json b/templates/react-ecs/packages/client/tsconfig.json
@@ -1,17 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/templates/react-ecs/packages/contracts/tsconfig.json b/templates/react-ecs/packages/contracts/tsconfig.json
@@ -1,13 +1,3 @@
-// Visit https://aka.ms/tsconfig.json for all config options
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  }
+  "extends": "../../tsconfig.json"
 }
diff --git a/templates/react-ecs/tsconfig.json b/templates/react-ecs/tsconfig.json
@@ -0,0 +1 @@
+../../tsconfig.build.json
diff --git a/templates/react/packages/client/tsconfig.json b/templates/react/packages/client/tsconfig.json
@@ -1,17 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/templates/react/packages/contracts/tsconfig.json b/templates/react/packages/contracts/tsconfig.json
@@ -1,13 +1,3 @@
-// Visit https://aka.ms/tsconfig.json for all config options
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  }
+  "extends": "../../tsconfig.json"
 }
diff --git a/templates/react/tsconfig.json b/templates/react/tsconfig.json
@@ -0,0 +1 @@
+../../tsconfig.build.json
diff --git a/templates/threejs/packages/client/tsconfig.json b/templates/threejs/packages/client/tsconfig.json
@@ -1,17 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/templates/threejs/packages/contracts/tsconfig.json b/templates/threejs/packages/contracts/tsconfig.json
@@ -1,13 +1,3 @@
-// Visit https://aka.ms/tsconfig.json for all config options
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  }
+  "extends": "../../tsconfig.json"
 }
diff --git a/templates/threejs/tsconfig.json b/templates/threejs/tsconfig.json
@@ -0,0 +1 @@
+../../tsconfig.build.json
diff --git a/templates/vanilla/packages/client/tsconfig.json b/templates/vanilla/packages/client/tsconfig.json
@@ -1,18 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
-    "jsx": "react-jsx"
+    "lib": ["ESNext", "DOM"]
   },
   "include": ["src"]
 }
diff --git a/templates/vanilla/packages/contracts/tsconfig.json b/templates/vanilla/packages/contracts/tsconfig.json
@@ -1,13 +1,3 @@
-// Visit https://aka.ms/tsconfig.json for all config options
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  }
+  "extends": "../../tsconfig.json"
 }
diff --git a/templates/vanilla/tsconfig.json b/templates/vanilla/tsconfig.json
@@ -0,0 +1 @@
+../../tsconfig.build.json