wip

zond · Jun 2, 2023 · 981dc6b · 981dc6b
1 parent 354f4b4
commit 981dc6b
Show file tree

Hide file tree

Showing 142 changed files with 125 additions and 7,167 deletions.
diff --git a/package.json b/package.json
@@ -2,14 +2,19 @@
   "private": true,
   "scripts": {
     "clean": "rimraf node_modules",
-    "clean:full": "yarn clean && cd packages/common && yarn clean && cd ../web-app && yarn clean && cd ../native-app && yarn clean"
+    "clean:full": "yarn clean && cd packages/common && yarn clean && cd ../web-app && yarn clean && cd ../native-app && yarn clean",
+    "clean:full:install": "yarn clean:full && yarn install"
   },
   "workspaces": {
     "packages": [
       "packages/common",
-      "packages/diplicity-common-internal",
       "packages/web-app",
       "packages/native-app"
+    ],
+    "nohoist": [
+      "**/react-native**",
+      "**/jsc-android",
+      "**/css-tree"
     ]
   }
-}
+}
diff --git a/packages/common/.watchmanconfig b/packages/common/.watchmanconfig
@@ -0,0 +1,5 @@
+{
+  "ignore_dirs": [
+    "node_modules"
+  ]
+}
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -19,7 +19,7 @@
   },
   "bugs": {},
   "devDependencies": {
-    "@reduxjs/toolkit": "^1.8.3",
+    "@reduxjs/toolkit": "^1.9.5",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "29.5.2",
     "@types/jquery": "^3.5.13",
@@ -38,11 +38,7 @@
     "jest": "^27.5.1",
     "jest-fetch-mock": "^3.0.3",
     "jquery": "^3.6.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-ga": "^3.3.0",
-    "react-i18next": "^11.15.4",
-    "react-redux": "^7.2.6",
+    "redux": "^4.2.1",
     "ts-jest": "^27.1.3",
     "ts-node": "^10.5.0",
     "typescript": "^4.3.5"
@@ -68,6 +64,7 @@
     ]
   },
   "peerDependencies": {
+    "@reduxjs/toolkit": "^1.8.3",
     "formik": "^2.2.9",
     "i18next": "^21.6.11",
     "jquery": "^3.6.0",
@@ -76,6 +73,7 @@
     "react-ga": "^3.3.0",
     "react-i18next": "^11.15.4",
     "react-redux": "^7.2.6",
+    "redux": "^4.2.1",
     "ts-jest": "^27.1.3",
     "typescript": "^4.3.5",
     "yup": "^0.32.11"
@@ -102,8 +100,10 @@
     "testEnvironment": "jsdom"
   },
   "dependencies": {
+    "@reduxjs/toolkit": "^1.9.5",
     "formik": "^2.2.9",
+    "redux": "^4.2.1",
     "xmldom": "^0.6.0",
     "yup": "^0.32.11"
   }
-}
+}
diff --git a/packages/diplicity-common-internal/package.json b/packages/diplicity-common-internal/package.json
diff --git a/packages/diplicity-common-internal/src/adapters/adapter.ts b/packages/diplicity-common-internal/src/adapters/adapter.ts
diff --git a/packages/diplicity-common-internal/src/adapters/createGame.ts b/packages/diplicity-common-internal/src/adapters/createGame.ts
diff --git a/packages/diplicity-common-internal/src/adapters/game.ts b/packages/diplicity-common-internal/src/adapters/game.ts
diff --git a/packages/diplicity-common-internal/src/adapters/index.ts b/packages/diplicity-common-internal/src/adapters/index.ts
diff --git a/packages/diplicity-common-internal/src/adapters/phase.ts b/packages/diplicity-common-internal/src/adapters/phase.ts
diff --git a/packages/diplicity-common-internal/src/adapters/types.ts b/packages/diplicity-common-internal/src/adapters/types.ts
diff --git a/packages/diplicity-common-internal/src/adapters/user.ts b/packages/diplicity-common-internal/src/adapters/user.ts