move server and cli into apps

gateweaver · Mar 9, 2024 · ad2186c · ad2186c
1 parent 2fe360b
commit ad2186c
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 28 deletions.
diff --git a/packages/cli/.eslintignore → apps/cli/.eslintignore b/packages/cli/.eslintignore → apps/cli/.eslintignore
diff --git a/packages/cli/.eslintrc.json → apps/cli/.eslintrc.json b/packages/cli/.eslintrc.json → apps/cli/.eslintrc.json
diff --git a/packages/cli/jest.config.js → apps/cli/jest.config.js b/packages/cli/jest.config.js → apps/cli/jest.config.js
diff --git a/packages/cli/package.json → apps/cli/package.json b/packages/cli/package.json → apps/cli/package.json
diff --git a/packages/cli/src/generate-api-key.ts → apps/cli/src/generate-api-key.ts b/packages/cli/src/generate-api-key.ts → apps/cli/src/generate-api-key.ts
diff --git a/packages/cli/src/index.ts → apps/cli/src/index.ts b/packages/cli/src/index.ts → apps/cli/src/index.ts
diff --git a/packages/cli/tsconfig.json → apps/cli/tsconfig.json b/packages/cli/tsconfig.json → apps/cli/tsconfig.json
diff --git a/packages/server/.eslintignore → apps/server/.eslintignore b/packages/server/.eslintignore → apps/server/.eslintignore
diff --git a/packages/server/.eslintrc.json → apps/server/.eslintrc.json b/packages/server/.eslintrc.json → apps/server/.eslintrc.json
diff --git a/packages/server/jest.config.js → apps/server/jest.config.js b/packages/server/jest.config.js → apps/server/jest.config.js
diff --git a/packages/server/package.json → apps/server/package.json b/packages/server/package.json → apps/server/package.json
diff --git a/packages/server/src/config/config.schema.ts → apps/server/src/config/config.schema.ts b/packages/server/src/config/config.schema.ts → apps/server/src/config/config.schema.ts
@@ -61,7 +61,7 @@ const endpointSchema: JSONSchemaType<Endpoint> = {
 export const configSchema: JSONSchemaType<Config> = {
  type: "object",
  properties: {
- port: { type: "number", nullable: true, default: 6060 },
+ port: { type: "number", nullable: true, default: 8080 },
  policyDefinitions: {
  ...policyDefinitionsSchema,
  nullable: true,

diff --git a/packages/server/src/config/config.types.ts → apps/server/src/config/config.types.ts b/packages/server/src/config/config.types.ts → apps/server/src/config/config.types.ts
diff --git a/...es/server/src/config/parse-config.test.ts → apps/server/src/config/parse-config.test.ts b/...es/server/src/config/parse-config.test.ts → apps/server/src/config/parse-config.test.ts
diff --git a/packages/server/src/config/parse-config.ts → apps/server/src/config/parse-config.ts b/packages/server/src/config/parse-config.ts → apps/server/src/config/parse-config.ts
diff --git a/...server/src/config/validate-config.test.ts → ...server/src/config/validate-config.test.ts b/...server/src/config/validate-config.test.ts → ...server/src/config/validate-config.test.ts
diff --git a/...ages/server/src/config/validate-config.ts → apps/server/src/config/validate-config.ts b/...ages/server/src/config/validate-config.ts → apps/server/src/config/validate-config.ts
diff --git a/packages/server/src/index.ts → apps/server/src/index.ts b/packages/server/src/index.ts → apps/server/src/index.ts
@@ -14,7 +14,7 @@ app.use(express.json());
 const startServer = () => {
  const config = parseConfigYaml("gateway");
 
- const PORT = config.port || process.env.PORT || 6060;
+ const PORT = config.port || process.env.PORT || 8080;
 
  const router = createRouter(config);
  app.use(router);

diff --git a/packages/server/src/router/index.ts → apps/server/src/router/index.ts b/packages/server/src/router/index.ts → apps/server/src/router/index.ts
diff --git a/...erver/src/router/setup/setup-endpoints.ts → ...erver/src/router/setup/setup-endpoints.ts b/...erver/src/router/setup/setup-endpoints.ts → ...erver/src/router/setup/setup-endpoints.ts
diff --git a/...server/src/router/setup/setup-policies.ts → ...server/src/router/setup/setup-policies.ts b/...server/src/router/setup/setup-policies.ts → ...server/src/router/setup/setup-policies.ts
diff --git a/...es/server/src/router/setup/setup-proxy.ts → apps/server/src/router/setup/setup-proxy.ts b/...es/server/src/router/setup/setup-proxy.ts → apps/server/src/router/setup/setup-proxy.ts
diff --git a/packages/server/tsconfig.json → apps/server/tsconfig.json b/packages/server/tsconfig.json → apps/server/tsconfig.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,14 +3,14 @@
  "version": "1.0.0",
  "description": "",
  "scripts": {
- "dev": "turbo build:watch & nodemon packages/server/src/index.ts",
+ "dev": "turbo build:watch & nodemon apps/server/src/index.ts",
  "build": "turbo build",
  "test": "turbo test",
  "test:watch": "turbo run test:watch",
  "lint": "turbo lint",
  "clean": "turbo clean",
  "prepare": "husky",
- "purge:node_modules": "rm -rf node_modules && rm -rf packages/*/node_modules"
+ "purge:node_modules": "rm -rf node_modules && rm -rf packages/*/node_modules && rm -rf apps/*/node_modules"
  },
  "author": "",
  "license": "ISC",
@@ -36,6 +36,7 @@
  "typescript": "^5.3.3"
  },
  "workspaces": [
- "packages/*"
+ "packages/*",
+ "apps/*"
  ]
 }