Cleanup repo structure & naming (#1734)

Author: krzysztofzuraw

.changeset/great-geese-collect.md

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=app-avatax
+RUN pnpm install --frozen-lockfile --filter=saleor-app-avatax

.devcontainer/avatax/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=cms-v2
+RUN pnpm install --frozen-lockfile --filter=saleor-app-cms

.devcontainer/cms-v2/Dockerfile .devcontainer/cms/Dockerfile

@@ -1,8 +1,8 @@
 {
   "name": "CMS app",
   "dockerComposeFile": "docker-compose.yml",
-  "service": "cms-v2",
-  "workspaceFolder": "/app/apps/cms-v2",
+  "service": "cms",
+  "workspaceFolder": "/app/apps/cms",
   "forwardPorts": [3000],
   "portsAttributes": {
     "3000": {

.devcontainer/cms-v2/devcontainer.json .devcontainer/cms/devcontainer.json

@@ -1,11 +1,11 @@
-name: saleor-app-cms-v2_devcontainer
+name: saleor-app-cms_devcontainer
 services:
-  cms-v2:
-    image: cms-v2
+  cms:
+    image: cms
     command: sleep infinity # keeps docker container running
     build:
       context: ../..
-      dockerfile: .devcontainer/cms-v2/Dockerfile
+      dockerfile: .devcontainer/cms/Dockerfile
     volumes:
       - "../..:/app"
       - "pnpm-store:/app/.pnpm-store"

.devcontainer/cms-v2/docker-compose.yml .devcontainer/cms/docker-compose.yml

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=klaviyo
+RUN pnpm install --frozen-lockfile --filter=saleor-app-klaviyo

.devcontainer/klaviyo/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=products-feed
+RUN pnpm install --frozen-lockfile --filter=saleor-app-products-feed

.devcontainer/products-feed/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=search
+RUN pnpm install --frozen-lockfile --filter=saleor-app-search

.devcontainer/search/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=segment
+RUN pnpm install --frozen-lockfile --filter=saleor-app-segment

.devcontainer/segment/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 RUN mkdir -p /app/.pnpm-store
 RUN chown -R node:node /app/.pnpm-store
 
-RUN pnpm install --frozen-lockfile --filter=smtp
+RUN pnpm install --frozen-lockfile --filter=saleor-app-smtp

.devcontainer/smtp/Dockerfile

@@ -16,7 +16,7 @@
 
 "App: CMS":
   - changed-files:
-      - any-glob-to-any-file: "apps/cms-v2/**/*"
+      - any-glob-to-any-file: "apps/cms/**/*"
 
 "App: SMTP":
   - changed-files:

.github/labeler.yml

@@ -36,7 +36,7 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "pnpm"
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile --filter=app-avatax
+        run: pnpm install --frozen-lockfile --filter=saleor-app-avatax
       - name: Get Saleor snapshot
         run: |
           BACKUP=$(pnpm dlx saleor backup list --name="snapshot-ext-$SALEOR_VERSION-e2e" --latest --json)
@@ -60,5 +60,5 @@ jobs:
           AWS_ACCESS_KEY_ID: "op://Shop-ex/saleor-app-avatax-e2e-${{ env.SALEOR_VERSION }}/AWS_ACCESS_KEY_ID"
           AWS_SECRET_ACCESS_KEY: "op://Shop-ex/saleor-app-avatax-e2e-${{ env.SALEOR_VERSION }}/AWS_SECRET_ACCESS_KEY"
       - name: Run e2e tests
-        run: pnpm --filter=app-avatax e2e
+        run: pnpm --filter=saleor-app-avatax e2e
       # TODO: Add HTML report: https://linear.app/saleor/issue/SHOPX-304

.github/workflows/e2e.yml

@@ -1,8 +1,8 @@
 {
-  "name": "app-avatax",
+  "name": "saleor-app-avatax",
   "version": "1.12.8",
   "scripts": {
-    "build": " next build",
+    "build": "next build",
     "check-types": "tsc --noEmit",
     "deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
     "dev": "NODE_OPTIONS='--inspect' next dev",

README.md

@@ -1,5 +1,5 @@
 {
-  "name": "cms-v2",
+  "name": "saleor-app-cms",
   "version": "2.10.0",
   "scripts": {
     "build": "next build",

apps/avatax/CHANGELOG.md

@@ -9,6 +9,6 @@ export type BulkSyncProcessorHooks = {
 export interface BulkSyncProcessor {
   uploadProducts(
     products: BulkImportProductFragment[],
-    hooks: BulkSyncProcessorHooks
+    hooks: BulkSyncProcessorHooks,
   ): Promise<void>;
 }

apps/avatax/package.json

@@ -6,7 +6,7 @@ import { VariantsSyncStatusListItem } from "./variants-sync-status-list";
 export const useBulkSyncProductsState = () => {
   const [finished, setFinished] = useState(false);
   const [productsStatusList, setProductsStatusList] = useState<VariantsSyncStatusListItem[] | null>(
-    null
+    null,
   );
 
   useEffect(() => {
@@ -31,7 +31,7 @@ export const useBulkSyncProductsState = () => {
             })) ?? [];
 
           return items;
-        })
+        }),
       );
     }, []),
     setItemStatus: useCallback(
@@ -46,10 +46,10 @@ export const useBulkSyncProductsState = () => {
             }
 
             return item;
-          })
+          }),
         );
       },
-      []
+      [],
     ),
   };
 };

apps/cms-v2/.env.example apps/cms/.env.example

@@ -1,4 +1,4 @@
-import { ApiError,buildClient, Client, SimpleSchemaTypes } from "@datocms/cma-client-browser";
+import { ApiError, buildClient, Client, SimpleSchemaTypes } from "@datocms/cma-client-browser";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
 

apps/cms-v2/.eslintrc.cjs apps/cms/.eslintrc.cjs

@@ -1,4 +1,4 @@
-import { describe, expect,it } from "vitest";
+import { describe, expect, it } from "vitest";
 
 import { generateId } from "./generate-id";
 

apps/cms-v2/.graphqlrc.yml apps/cms/.graphqlrc.yml

@@ -1,5 +1,5 @@
 import { otelExchange } from "@saleor/apps-otel";
-import { createGraphQLClient,CreateGraphQLClientArgs } from "@saleor/apps-shared";
+import { createGraphQLClient, CreateGraphQLClientArgs } from "@saleor/apps-shared";
 
 type CreateGraphQLClientProps = Omit<CreateGraphQLClientArgs, "opts">;
 

apps/cms-v2/CHANGELOG.md apps/cms/CHANGELOG.md

@@ -23,7 +23,7 @@ export const trpcClient = createTRPCNext<AppRouter>({
 
             if (!token || !saleorApiUrl) {
               console.error(
-                "Can't initialize tRPC client before establishing the App Bridge connection"
+                "Can't initialize tRPC client before establishing the App Bridge connection",
               );
               throw new Error("Token and Saleor API URL unknown");
             }

apps/cms-v2/README.md apps/cms/README.md

@@ -1,4 +1,4 @@
-import { SALEOR_API_URL_HEADER,SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const";
+import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const";
 import { getAppBaseUrl } from "@saleor/apps-shared";
 import { inferAsyncReturnType } from "@trpc/server";
 import * as trpcNext from "@trpc/server/adapters/next";

apps/cms-v2/docs/configuration.md apps/cms/docs/configuration.md

@@ -1,5 +1,5 @@
 {
-  "name": "klaviyo",
+  "name": "saleor-app-klaviyo",
   "version": "1.12.20",
   "scripts": {
     "build": "next build",

apps/cms-v2/docs/images/cms-token.png apps/cms/docs/images/cms-token.png

@@ -1,5 +1,5 @@
 {
-  "name": "products-feed",
+  "name": "saleor-app-products-feed",
   "version": "1.21.0",
   "scripts": {
     "build": "next build",

apps/cms-v2/docs/images/content-types.png apps/cms/docs/images/content-types.png

@@ -1,5 +1,5 @@
 {
-  "name": "search",
+  "name": "saleor-app-search",
   "version": "1.22.21",
   "scripts": {
     "build": "next build",

apps/cms-v2/docs/images/content.png apps/cms/docs/images/content.png

@@ -1,5 +1,5 @@
 {
-  "name": "segment",
+  "name": "saleor-app-segment",
   "version": "2.0.6",
   "scripts": {
     "build": "next build",

apps/cms-v2/docs/images/field-mapping.png apps/cms/docs/images/field-mapping.png

@@ -1,5 +1,5 @@
 {
-  "name": "smtp",
+  "name": "saleor-app-smtp",
   "version": "1.2.23",
   "scripts": {
     "build": "next build",

apps/cms-v2/docs/images/space-id.png apps/cms/docs/images/space-id.png

@@ -31,7 +31,7 @@ flags:
       - apps/avatax/
   cms:
     paths:
-      - apps/cms-v2/
+      - apps/cms/
   products-feed:
     paths:
       - apps/products-feed/