chore: move client folders (#948)

2023-02-10 12:41:01 +00:00
1 parent cb118149f3
commit 8a7393a961
@@ -1,6 +1,6 @@
 FROM node:16-alpine as relocate
 WORKDIR /app
-COPY ./packages/app/out ./dist
+COPY ./apps/web/out ./dist
 COPY ./.github/deployment/Caddyfile ./Caddyfile

 FROM caddy:2.6.2-alpine
@@ -78,7 +78,7 @@ jobs:
      - name: Upload artifact
        uses: actions/upload-artifact@v3
        with:
-          path: ./packages/app/out
+          path: ./apps/web/out

  push_to_registry:
    # See https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
@@ -104,7 +104,7 @@ jobs:
        uses: actions/download-artifact@v3
        with:
          name: artifact
-          path: packages/app/out/
+          path: apps/web/out/

      - name: Log in to Docker Hub
        uses: docker/login-action@v2
@@ -63,7 +63,7 @@ jobs:
      - name: Upload artifact
        uses: actions/upload-artifact@v3
        with:
-          path: ./packages/app/.next
+          path: ./apps/web/.next

  lint:
    name: Lint and E2E Test
@@ -99,7 +99,7 @@ jobs:
        uses: actions/download-artifact@v3
        with:
          name: artifact
-          path: packages/app/.next/
+          path: apps/web/.next/

      - name: Lint & E2E Test & Unit Test
        run: |
@@ -187,7 +187,7 @@ jobs:
      - name: Upload artifact
        uses: actions/upload-artifact@v3
        with:
-          path: ./packages/app/out
+          path: ./apps/web/out

  publish-community:
    name: Push Community Image
@@ -213,7 +213,7 @@ jobs:
        uses: actions/download-artifact@v3
        with:
          name: artifact
-          path: packages/app/out/
+          path: apps/web/out/

      - name: Log in to Docker Hub
        uses: docker/login-action@v2
@@ -316,7 +316,7 @@ jobs:
        uses: actions/download-artifact@v3
        with:
          name: artifact
-          path: packages/app/out/
+          path: apps/web/out/

      - name: Log in to Docker Hub
        uses: docker/login-action@v2
@@ -57,7 +57,7 @@ jobs:

      - name: Make macOS (x64)
        run: pnpm build:app
-        working-directory: client-app
+        working-directory: apps/desktop
        env:
          CI: true
          CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
@@ -69,6 +69,6 @@ jobs:
        with:
          draft: true
          generate_release_notes: true
-          files: client-app/src-tauri/target/release/bundle/dmg/*.dmg
+          files: apps/desktop/src-tauri/target/release/bundle/dmg/*.dmg
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -63,7 +63,7 @@ jobs:
      - name: Upload artifact
        uses: actions/upload-artifact@v3
        with:
-          path: ./packages/app/out
+          path: ./apps/web/out

  publish-self-hosted:
    name: Push Community Image
@@ -88,7 +88,7 @@ jobs:
        uses: actions/download-artifact@v3
        with:
          name: artifact
-          path: packages/app/out/
+          path: apps/web/out/

      - name: Log in to Docker Hub
        uses: docker/login-action@v2
@@ -60,5 +60,5 @@ module-resolve.cjs
 .eslintcache

 # generated assets
-client-app/public/affine-out
-client-app/public/preload
+apps/desktop/public/affine-out
+apps/desktop/public/preload
@@ -1,3 +1,4 @@
-[submodule "client-app/src-OctoBase"]
-	path = client-app/src-OctoBase
+[submodule "apps/desktop/src-OctoBase"]
+	path = apps/desktop/src-OctoBase
 	url = https://github.com/toeverything/OctoBase
+	branch = master
@@ -27,5 +27,5 @@
  "[toml]": {
    "editor.defaultFormatter": "tamasfe.even-better-toml"
  },
-  "rust-analyzer.linkedProjects": ["client-app/src-tauri/Cargo.toml"]
+  "rust-analyzer.linkedProjects": ["apps/desktop/src-tauri/Cargo.toml"]
 }
@@ -14,7 +14,7 @@ pnpm tauri dev

 ## Development

-Currently client-app depends on a rapidly developing rust library "Octobase", we use git-submodule to link it currently.
+Currently desktop client depends on a rapidly developing rust library "Octobase", we use git-submodule to link it currently.

 We will provide its binary binding soon, to replace the git-submodule, before Octobase become opensource.

@@ -7,7 +7,7 @@
  "module": "true",
  "scripts": {
    "dev:app": "pnpm build:preload && cross-env NODE_ENV=development tauri dev",
-    "dev:prerequisite": "concurrently \"cd ../packages/data-center && pnpm dev\" \"cd ../packages/app && pnpm dev\"",
+    "dev:prerequisite": "concurrently \"cd ../packages/data-center && pnpm dev\" \"cd ../apps/web && pnpm dev\"",
    "build:prerequisite": "pnpm build:submodules && pnpm build:rs-types && pnpm build:affine && pnpm build:preload",
    "build:rs-types": "zx scripts/generateTsTypingsFromJsonSchema.mjs",
    "build:submodules": "zx scripts/buildSubModules.mjs",
@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-const repoDirectory = path.join(__dirname, '..', '..');
+const repoDirectory = path.join(__dirname, '..', '..', '..');
 const clientAppDirectory = path.join(__dirname, '..');
 const publicDistributionDirectory = path.join(clientAppDirectory, 'public');
 const affineSrcDirectory = path.join(repoDirectory, 'packages', 'app');
@@ -30,6 +30,7 @@ const getRedirectConfig = profile => {
      },
    ],
    target,
+    profile || 'dev',
  ];
 };

@@ -62,10 +63,10 @@ const nextConfig = {
    unoptimized: true,
  },
  rewrites: async () => {
-    const [profile, desc] = getRedirectConfig(process.env.NODE_API_SERVER);
-    printer.info(
-      `API request proxy to [${process.env.NODE_API_SERVER} Server]: ` + desc
+    const [profile, target, desc] = getRedirectConfig(
+      process.env.NODE_API_SERVER
    );
+    printer.info(`API request proxy to [${desc} Server]: ` + target);
    return profile;
  },
  basePath: process.env.BASE_PATH,