Remove server code and move client code back to directly under src/

package.json

@@ -8,7 +8,6 @@
   },
   "scripts": {
     "start": "webpack-dev-server --config webpack.dev.js",
-    "start:server": "nodemon ./src/server/main.ts",
     "build": "gulp build",
     "deploy": "gulp deploy",
     "db:create": "ts-node ./scripts/create-database.ts",
@@ -21,9 +20,8 @@
     "lint:css": "stylelint \"**/*.{css,scss}\"",
     "check-project-boundaries": "gf",
     "favicon": "rimraf ./favicons && real-favicon generate faviconDescription.json faviconData.json favicons",
-    "codegen": "concurrently -n GraphQL,SCSS,Locales \"yarn codegen:gql\" \"yarn codegen:scss\" \"yarn codegen:i18n\"",
-    "codegen:gql": "graphql-codegen",
-    "codegen:scss": "tsm src/client --aliasPrefixes.@jyosuushi src/client/",
+    "codegen": "concurrently -n SCSS,Locales \"yarn codegen:scss\" \"yarn codegen:i18n\"",
+    "codegen:scss": "tsm src --aliasPrefixes.@jyosuushi src/",
     "codegen:i18n": "yarn ts-node ./scripts/i18n/compile.ts",
     "i18n:extract": "yarn ts-node ./scripts/i18n/extract.ts"
   },

scripts/exporter/items-file.ts

@@ -4,7 +4,7 @@ import { Writable } from "stream";
 import { DbItemCounter } from "../database/schemas";
 import ValidatedDataSource from "../database/ValidatedDataSource";
 
-import { Item, ItemCounter } from "../../src/client/interfaces";
+import { Item, ItemCounter } from "../../src/interfaces";
 
 import { WriteFileResults } from "./types";
 import { getItemId, productionStringify, ProductionVariable } from "./utils";

scripts/i18n/compile.ts

@@ -24,8 +24,8 @@ async function compileFile(inputFile: string, outFile: string): Promise<void> {
 
 async function main(): Promise<void> {
   await Promise.all([
-    compileFile("./i18n/en.json", "src/client/i18n/translations/en.json"),
-    compileFile("./i18n/jp.json", "src/client/i18n/translations/jp.json"),
+    compileFile("./i18n/en.json", "src/i18n/translations/en.json"),
+    compileFile("./i18n/jp.json", "src/i18n/translations/jp.json"),
   ]);
 }
 

scripts/i18n/extract.ts

@@ -184,7 +184,7 @@ ${JSON.stringify(message, undefined, 2)}`
   );
 }
 
-const files = globSync("src/client/**/*.ts*");
+const files = globSync("src/**/*.ts*");
 extractAndWrite(files, {
   locales: ["en", "jp"],
   outDirectory: "./i18n",

src/client/constants/index.ts → src/constants/index.ts

@@ -2,6 +2,9 @@ import { defineMessages, MessageDescriptor } from "react-intl";
 
 import { AmountRange } from "@jyosuushi/redux";
 
+export const MIN_COLLECTION_NAME_LENGTH = 2;
+export const MAX_COLLECTION_NAME_LENGTH = 32;
+
 export const ONE_SECOND = 1000;
 export const ONE_MINUTE = ONE_SECOND * 60;
 export const ONE_HOUR = ONE_MINUTE * 60;

src/client/fence.json → src/fence.json

@@ -7,7 +7,7 @@
       "accessibleTo": ["data"]
     }
   ],
-  "imports": ["changelog", "data", "shared"],
+  "imports": ["changelog", "data"],
   "dependencies": [
     "classnames",
     "history",