diff --git a/.dockerignore b/.dockerignore index a27d1d7..fea6f45 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,9 +1,8 @@ +/packages/ketchup-react/ +/packages/*-client/ + node_modules/ dist/ -/packages/ketchup-client/ -/packages/ketchup-react/ -/packages/space-client/ - .eslintcache -*.log \ No newline at end of file +*.log diff --git a/docker-compose.yaml b/docker-compose.yaml index f0985c1..535040a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,7 @@ -version: "3.8" services: server: - build: . + build: + context: . + dockerfile: packages/example-server/Dockerfile ports: - "4000:80" diff --git a/packages/space-client/.env b/packages/example-client/.env similarity index 100% rename from packages/space-client/.env rename to packages/example-client/.env diff --git a/packages/space-client/.gitignore b/packages/example-client/.gitignore similarity index 100% rename from packages/space-client/.gitignore rename to packages/example-client/.gitignore diff --git a/packages/space-client/README.md b/packages/example-client/README.md similarity index 100% rename from packages/space-client/README.md rename to packages/example-client/README.md diff --git a/packages/space-client/package.json b/packages/example-client/package.json similarity index 94% rename from packages/space-client/package.json rename to packages/example-client/package.json index 4a3d614..34f1f02 100644 --- a/packages/space-client/package.json +++ b/packages/example-client/package.json @@ -1,5 +1,5 @@ { - "name": "space-client", + "name": "example-client", "version": "0.1.1", "private": true, "dependencies": { @@ -14,7 +14,7 @@ "react": "^17.0.1", "react-dom": "^17.0.1", "react-scripts": "^4.0.3", - "space-common": "^0.1.1", + "example-common": "^0.1.1", "typescript": "^4.0.3", "web-vitals": "^1.1.2" }, diff --git a/packages/space-client/public/favicon.ico b/packages/example-client/public/favicon.ico similarity index 100% rename from packages/space-client/public/favicon.ico rename to packages/example-client/public/favicon.ico diff --git a/packages/space-client/public/index.html b/packages/example-client/public/index.html similarity index 100% rename from packages/space-client/public/index.html rename to packages/example-client/public/index.html diff --git a/packages/space-client/public/logo192.png b/packages/example-client/public/logo192.png similarity index 100% rename from packages/space-client/public/logo192.png rename to packages/example-client/public/logo192.png diff --git a/packages/space-client/public/logo512.png b/packages/example-client/public/logo512.png similarity index 100% rename from packages/space-client/public/logo512.png rename to packages/example-client/public/logo512.png diff --git a/packages/space-client/public/manifest.json b/packages/example-client/public/manifest.json similarity index 100% rename from packages/space-client/public/manifest.json rename to packages/example-client/public/manifest.json diff --git a/packages/space-client/public/robots.txt b/packages/example-client/public/robots.txt similarity index 100% rename from packages/space-client/public/robots.txt rename to packages/example-client/public/robots.txt diff --git a/packages/space-client/src/App.css b/packages/example-client/src/App.css similarity index 100% rename from packages/space-client/src/App.css rename to packages/example-client/src/App.css diff --git a/packages/space-client/src/App.test.tsx b/packages/example-client/src/App.test.tsx similarity index 100% rename from packages/space-client/src/App.test.tsx rename to packages/example-client/src/App.test.tsx diff --git a/packages/space-client/src/App.tsx b/packages/example-client/src/App.tsx similarity index 95% rename from packages/space-client/src/App.tsx rename to packages/example-client/src/App.tsx index 2a80c7b..b0194d2 100644 --- a/packages/space-client/src/App.tsx +++ b/packages/example-client/src/App.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import './App.css'; import useKetchup from 'ketchup-react' -import { reducer } from 'space-common' +import { reducer } from 'example-common' export default function App() { const [proj, dispatch] = useKetchup('ws://localhost:4000', reducer) diff --git a/packages/space-client/src/index.css b/packages/example-client/src/index.css similarity index 100% rename from packages/space-client/src/index.css rename to packages/example-client/src/index.css diff --git a/packages/space-client/src/index.tsx b/packages/example-client/src/index.tsx similarity index 100% rename from packages/space-client/src/index.tsx rename to packages/example-client/src/index.tsx diff --git a/packages/space-client/src/logo.svg b/packages/example-client/src/logo.svg similarity index 100% rename from packages/space-client/src/logo.svg rename to packages/example-client/src/logo.svg diff --git a/packages/space-client/src/react-app-env.d.ts b/packages/example-client/src/react-app-env.d.ts similarity index 100% rename from packages/space-client/src/react-app-env.d.ts rename to packages/example-client/src/react-app-env.d.ts diff --git a/packages/space-client/src/reportWebVitals.ts b/packages/example-client/src/reportWebVitals.ts similarity index 100% rename from packages/space-client/src/reportWebVitals.ts rename to packages/example-client/src/reportWebVitals.ts diff --git a/packages/space-client/src/setupTests.ts b/packages/example-client/src/setupTests.ts similarity index 100% rename from packages/space-client/src/setupTests.ts rename to packages/example-client/src/setupTests.ts diff --git a/packages/space-client/tsconfig.json b/packages/example-client/tsconfig.json similarity index 100% rename from packages/space-client/tsconfig.json rename to packages/example-client/tsconfig.json diff --git a/packages/space-common/.eslintrc.json b/packages/example-common/.eslintrc.json similarity index 100% rename from packages/space-common/.eslintrc.json rename to packages/example-common/.eslintrc.json diff --git a/packages/space-common/index.ts b/packages/example-common/index.ts similarity index 100% rename from packages/space-common/index.ts rename to packages/example-common/index.ts diff --git a/packages/space-common/package.json b/packages/example-common/package.json similarity index 95% rename from packages/space-common/package.json rename to packages/example-common/package.json index 2b88e47..9062006 100644 --- a/packages/space-common/package.json +++ b/packages/example-common/package.json @@ -1,5 +1,5 @@ { - "name": "space-common", + "name": "example-common", "version": "0.1.3", "description": "WebSocket-based rollback state synchronization server.", "main": "dist/index.js", diff --git a/packages/space-common/tsconfig.json b/packages/example-common/tsconfig.json similarity index 100% rename from packages/space-common/tsconfig.json rename to packages/example-common/tsconfig.json diff --git a/packages/space-server/.eslintrc.json b/packages/example-server/.eslintrc.json similarity index 100% rename from packages/space-server/.eslintrc.json rename to packages/example-server/.eslintrc.json diff --git a/Dockerfile b/packages/example-server/Dockerfile similarity index 62% rename from Dockerfile rename to packages/example-server/Dockerfile index fe46a03..6586501 100644 --- a/Dockerfile +++ b/packages/example-server/Dockerfile @@ -4,11 +4,11 @@ RUN apk add --no-cache tini RUN yarn global add lerna -WORKDIR /opt/space-server +WORKDIR /opt/example-server COPY packages/ketchup-common/package.json packages/ketchup-common/ COPY packages/ketchup-server/package.json packages/ketchup-server/ -COPY packages/space-common/package.json packages/space-common/ -COPY packages/space-server/package.json packages/space-server/ +COPY packages/example-common/package.json packages/example-common/ +COPY packages/example-server/package.json packages/example-server/ COPY package.json yarn.lock lerna.json ./ RUN lerna bootstrap @@ -16,5 +16,5 @@ COPY . ./ RUN lerna run build ENTRYPOINT ["tini", "--"] -CMD ["node", "packages/space-server"] +CMD ["node", "packages/example-server"] EXPOSE 80 diff --git a/packages/space-server/index.ts b/packages/example-server/index.ts similarity index 89% rename from packages/space-server/index.ts rename to packages/example-server/index.ts index c31edd2..37c1885 100644 --- a/packages/space-server/index.ts +++ b/packages/example-server/index.ts @@ -1,6 +1,6 @@ import WebSocket from 'ws' import KetchupServer from 'ketchup-server' -import { initial, reducer } from 'space-common' +import { initial, reducer } from 'example-common' const port = parseInt(process.env.PORT ?? '80') diff --git a/packages/space-server/package.json b/packages/example-server/package.json similarity index 93% rename from packages/space-server/package.json rename to packages/example-server/package.json index c6599d1..9f69452 100644 --- a/packages/space-server/package.json +++ b/packages/example-server/package.json @@ -1,5 +1,5 @@ { - "name": "space-server", + "name": "example-server", "version": "0.1.3", "description": "WebSocket-based rollback state synchronization server.", "main": "dist/index.js", @@ -8,7 +8,7 @@ "dependencies": { "ketchup-server": "^0.1.1", "lodash": "^4.17.20", - "space-common": "^0.1.1", + "example-common": "^0.1.1", "ts-node": "^9.1.1", "ws": "^7.4.2" }, diff --git a/packages/space-server/tsconfig.json b/packages/example-server/tsconfig.json similarity index 100% rename from packages/space-server/tsconfig.json rename to packages/example-server/tsconfig.json