diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 032bde0..9d3f846 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: - name: Build and prepare services run: | - cd ./cdk/src/services/common + cd ./services/common make install make clean make build diff --git a/cdk/src/stacks/react-router-7-contacts-stack.ts b/cdk/src/stacks/react-router-7-contacts-stack.ts index 80578de..255da87 100644 --- a/cdk/src/stacks/react-router-7-contacts-stack.ts +++ b/cdk/src/stacks/react-router-7-contacts-stack.ts @@ -16,7 +16,7 @@ export class ReactRouter7ContactsStack extends cdk.Stack { super(scope, id, props); const reactRouterDomain = "react-router-7-contacts.bronifty.org"; - const projectRoot = `${FsUtils.getProjectRoot()}/src/services/react-router-7-contacts`; + const projectRoot = `${FsUtils.getProjectRoot()}/../services/react-router-7-contacts`; const lambda = new cdk.aws_lambda_nodejs.NodejsFunction( this, diff --git a/cdk/src/stacks/remix-stack.ts b/cdk/src/stacks/remix-stack.ts index 0003af3..78d8232 100644 --- a/cdk/src/stacks/remix-stack.ts +++ b/cdk/src/stacks/remix-stack.ts @@ -12,7 +12,7 @@ export class RemixStack extends cdk.Stack { super(scope, id, props); const ssrDomain = "ssr.bronifty.org"; - const projectRoot = `${FsUtils.getProjectRoot()}/src/services/vite-remix`; + const projectRoot = `${FsUtils.getProjectRoot()}/../services/vite-remix`; const lambda = new cdk.aws_lambda_nodejs.NodejsFunction( this, "remix-lambda", diff --git a/cdk/src/services/common/Makefile b/services/common/Makefile similarity index 100% rename from cdk/src/services/common/Makefile rename to services/common/Makefile diff --git a/cdk/src/services/common/build.sh b/services/common/build.sh similarity index 100% rename from cdk/src/services/common/build.sh rename to services/common/build.sh diff --git a/cdk/src/services/common/bundle.sh b/services/common/bundle.sh similarity index 100% rename from cdk/src/services/common/bundle.sh rename to services/common/bundle.sh diff --git a/cdk/src/services/common/clean.sh b/services/common/clean.sh similarity index 100% rename from cdk/src/services/common/clean.sh rename to services/common/clean.sh diff --git a/cdk/src/services/common/createHandler.mjs b/services/common/createHandler.mjs similarity index 100% rename from cdk/src/services/common/createHandler.mjs rename to services/common/createHandler.mjs diff --git a/cdk/src/services/common/esbuild.mjs b/services/common/esbuild.mjs similarity index 100% rename from cdk/src/services/common/esbuild.mjs rename to services/common/esbuild.mjs diff --git a/cdk/src/services/common/events/apig.json b/services/common/events/apig.json similarity index 100% rename from cdk/src/services/common/events/apig.json rename to services/common/events/apig.json diff --git a/cdk/src/services/common/events/cloudfront.json b/services/common/events/cloudfront.json similarity index 100% rename from cdk/src/services/common/events/cloudfront.json rename to services/common/events/cloudfront.json diff --git a/cdk/src/services/common/events/request.mjs b/services/common/events/request.mjs similarity index 100% rename from cdk/src/services/common/events/request.mjs rename to services/common/events/request.mjs diff --git a/cdk/src/services/common/install.sh b/services/common/install.sh similarity index 100% rename from cdk/src/services/common/install.sh rename to services/common/install.sh diff --git a/cdk/src/services/common/package-lock.json b/services/common/package-lock.json similarity index 100% rename from cdk/src/services/common/package-lock.json rename to services/common/package-lock.json diff --git a/cdk/src/services/common/package.json b/services/common/package.json similarity index 100% rename from cdk/src/services/common/package.json rename to services/common/package.json diff --git a/cdk/src/services/common/pnpm-lock.yaml b/services/common/pnpm-lock.yaml similarity index 100% rename from cdk/src/services/common/pnpm-lock.yaml rename to services/common/pnpm-lock.yaml diff --git a/cdk/src/services/common/service1.mjs b/services/common/service1.mjs similarity index 100% rename from cdk/src/services/common/service1.mjs rename to services/common/service1.mjs diff --git a/cdk/src/services/common/service2.mjs b/services/common/service2.mjs similarity index 100% rename from cdk/src/services/common/service2.mjs rename to services/common/service2.mjs diff --git a/cdk/src/services/common/test/service1.local.cjs b/services/common/test/service1.local.cjs similarity index 100% rename from cdk/src/services/common/test/service1.local.cjs rename to services/common/test/service1.local.cjs diff --git a/cdk/src/services/common/test/service1.local.mjs b/services/common/test/service1.local.mjs similarity index 100% rename from cdk/src/services/common/test/service1.local.mjs rename to services/common/test/service1.local.mjs diff --git a/cdk/src/services/common/test/service2.local.mjs b/services/common/test/service2.local.mjs similarity index 100% rename from cdk/src/services/common/test/service2.local.mjs rename to services/common/test/service2.local.mjs diff --git a/cdk/src/services/common/zip.sh b/services/common/zip.sh similarity index 100% rename from cdk/src/services/common/zip.sh rename to services/common/zip.sh diff --git a/cdk/src/services/react-router-7-contacts/.gitignore b/services/react-router-7-contacts/.gitignore similarity index 100% rename from cdk/src/services/react-router-7-contacts/.gitignore rename to services/react-router-7-contacts/.gitignore diff --git a/cdk/src/services/react-router-7-contacts/README.md b/services/react-router-7-contacts/README.md similarity index 100% rename from cdk/src/services/react-router-7-contacts/README.md rename to services/react-router-7-contacts/README.md diff --git a/cdk/src/services/react-router-7-contacts/app/app.css b/services/react-router-7-contacts/app/app.css similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/app.css rename to services/react-router-7-contacts/app/app.css diff --git a/cdk/src/services/react-router-7-contacts/app/data.ts b/services/react-router-7-contacts/app/data.ts similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/data.ts rename to services/react-router-7-contacts/app/data.ts diff --git a/cdk/src/services/react-router-7-contacts/app/root.tsx b/services/react-router-7-contacts/app/root.tsx similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/root.tsx rename to services/react-router-7-contacts/app/root.tsx diff --git a/cdk/src/services/react-router-7-contacts/app/routes.ts b/services/react-router-7-contacts/app/routes.ts similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/routes.ts rename to services/react-router-7-contacts/app/routes.ts diff --git a/cdk/src/services/react-router-7-contacts/app/routes/contacts/destroy.tsx b/services/react-router-7-contacts/app/routes/contacts/destroy.tsx similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/routes/contacts/destroy.tsx rename to services/react-router-7-contacts/app/routes/contacts/destroy.tsx diff --git a/cdk/src/services/react-router-7-contacts/app/routes/contacts/details.tsx b/services/react-router-7-contacts/app/routes/contacts/details.tsx similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/routes/contacts/details.tsx rename to services/react-router-7-contacts/app/routes/contacts/details.tsx diff --git a/cdk/src/services/react-router-7-contacts/app/routes/contacts/edit.tsx b/services/react-router-7-contacts/app/routes/contacts/edit.tsx similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/routes/contacts/edit.tsx rename to services/react-router-7-contacts/app/routes/contacts/edit.tsx diff --git a/cdk/src/services/react-router-7-contacts/app/routes/home.tsx b/services/react-router-7-contacts/app/routes/home.tsx similarity index 100% rename from cdk/src/services/react-router-7-contacts/app/routes/home.tsx rename to services/react-router-7-contacts/app/routes/home.tsx diff --git a/cdk/src/services/react-router-7-contacts/esbuild.mjs b/services/react-router-7-contacts/esbuild.mjs similarity index 100% rename from cdk/src/services/react-router-7-contacts/esbuild.mjs rename to services/react-router-7-contacts/esbuild.mjs diff --git a/cdk/src/services/react-router-7-contacts/events/apig.json b/services/react-router-7-contacts/events/apig.json similarity index 100% rename from cdk/src/services/react-router-7-contacts/events/apig.json rename to services/react-router-7-contacts/events/apig.json diff --git a/cdk/src/services/react-router-7-contacts/events/cloudfront.json b/services/react-router-7-contacts/events/cloudfront.json similarity index 100% rename from cdk/src/services/react-router-7-contacts/events/cloudfront.json rename to services/react-router-7-contacts/events/cloudfront.json diff --git a/cdk/src/services/react-router-7-contacts/events/request.mjs b/services/react-router-7-contacts/events/request.mjs similarity index 100% rename from cdk/src/services/react-router-7-contacts/events/request.mjs rename to services/react-router-7-contacts/events/request.mjs diff --git a/cdk/src/services/react-router-7-contacts/lambda.cjs b/services/react-router-7-contacts/lambda.cjs similarity index 100% rename from cdk/src/services/react-router-7-contacts/lambda.cjs rename to services/react-router-7-contacts/lambda.cjs diff --git a/cdk/src/services/react-router-7-contacts/lambda.js b/services/react-router-7-contacts/lambda.js similarity index 100% rename from cdk/src/services/react-router-7-contacts/lambda.js rename to services/react-router-7-contacts/lambda.js diff --git a/cdk/src/services/react-router-7-contacts/lambda.ts b/services/react-router-7-contacts/lambda.ts similarity index 100% rename from cdk/src/services/react-router-7-contacts/lambda.ts rename to services/react-router-7-contacts/lambda.ts diff --git a/cdk/src/services/react-router-7-contacts/package-lock.json b/services/react-router-7-contacts/package-lock.json similarity index 100% rename from cdk/src/services/react-router-7-contacts/package-lock.json rename to services/react-router-7-contacts/package-lock.json diff --git a/cdk/src/services/react-router-7-contacts/package.json b/services/react-router-7-contacts/package.json similarity index 100% rename from cdk/src/services/react-router-7-contacts/package.json rename to services/react-router-7-contacts/package.json diff --git a/cdk/src/services/react-router-7-contacts/pnpm-lock.yaml b/services/react-router-7-contacts/pnpm-lock.yaml similarity index 100% rename from cdk/src/services/react-router-7-contacts/pnpm-lock.yaml rename to services/react-router-7-contacts/pnpm-lock.yaml diff --git a/cdk/src/services/react-router-7-contacts/public/favicon.ico b/services/react-router-7-contacts/public/favicon.ico similarity index 100% rename from cdk/src/services/react-router-7-contacts/public/favicon.ico rename to services/react-router-7-contacts/public/favicon.ico diff --git a/cdk/src/services/react-router-7-contacts/test/local.js b/services/react-router-7-contacts/test/local.js similarity index 100% rename from cdk/src/services/react-router-7-contacts/test/local.js rename to services/react-router-7-contacts/test/local.js diff --git a/cdk/src/services/react-router-7-contacts/tsconfig.json b/services/react-router-7-contacts/tsconfig.json similarity index 100% rename from cdk/src/services/react-router-7-contacts/tsconfig.json rename to services/react-router-7-contacts/tsconfig.json diff --git a/cdk/src/services/react-router-7-contacts/vite.config.ts b/services/react-router-7-contacts/vite.config.ts similarity index 100% rename from cdk/src/services/react-router-7-contacts/vite.config.ts rename to services/react-router-7-contacts/vite.config.ts diff --git a/cdk/src/services/vite-remix/.eslintrc.cjs b/services/vite-remix/.eslintrc.cjs similarity index 100% rename from cdk/src/services/vite-remix/.eslintrc.cjs rename to services/vite-remix/.eslintrc.cjs diff --git a/cdk/src/services/vite-remix/.gitignore b/services/vite-remix/.gitignore similarity index 100% rename from cdk/src/services/vite-remix/.gitignore rename to services/vite-remix/.gitignore diff --git a/cdk/src/services/vite-remix/README.md b/services/vite-remix/README.md similarity index 100% rename from cdk/src/services/vite-remix/README.md rename to services/vite-remix/README.md diff --git a/cdk/src/services/vite-remix/app/components/counter.tsx b/services/vite-remix/app/components/counter.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/components/counter.tsx rename to services/vite-remix/app/components/counter.tsx diff --git a/cdk/src/services/vite-remix/app/components/nav.tsx b/services/vite-remix/app/components/nav.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/components/nav.tsx rename to services/vite-remix/app/components/nav.tsx diff --git a/cdk/src/services/vite-remix/app/entry.client.tsx b/services/vite-remix/app/entry.client.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/entry.client.tsx rename to services/vite-remix/app/entry.client.tsx diff --git a/cdk/src/services/vite-remix/app/entry.server.tsx b/services/vite-remix/app/entry.server.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/entry.server.tsx rename to services/vite-remix/app/entry.server.tsx diff --git a/cdk/src/services/vite-remix/app/root.tsx b/services/vite-remix/app/root.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/root.tsx rename to services/vite-remix/app/root.tsx diff --git a/cdk/src/services/vite-remix/app/routes/_index.tsx b/services/vite-remix/app/routes/_index.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/routes/_index.tsx rename to services/vite-remix/app/routes/_index.tsx diff --git a/cdk/src/services/vite-remix/app/routes/about.tsx b/services/vite-remix/app/routes/about.tsx similarity index 100% rename from cdk/src/services/vite-remix/app/routes/about.tsx rename to services/vite-remix/app/routes/about.tsx diff --git a/cdk/src/services/vite-remix/app/tailwind.css b/services/vite-remix/app/tailwind.css similarity index 100% rename from cdk/src/services/vite-remix/app/tailwind.css rename to services/vite-remix/app/tailwind.css diff --git a/cdk/src/services/vite-remix/esbuild.mjs b/services/vite-remix/esbuild.mjs similarity index 100% rename from cdk/src/services/vite-remix/esbuild.mjs rename to services/vite-remix/esbuild.mjs diff --git a/cdk/src/services/vite-remix/events/apig.json b/services/vite-remix/events/apig.json similarity index 100% rename from cdk/src/services/vite-remix/events/apig.json rename to services/vite-remix/events/apig.json diff --git a/cdk/src/services/vite-remix/events/cloudfront.json b/services/vite-remix/events/cloudfront.json similarity index 100% rename from cdk/src/services/vite-remix/events/cloudfront.json rename to services/vite-remix/events/cloudfront.json diff --git a/cdk/src/services/vite-remix/lambda.cjs b/services/vite-remix/lambda.cjs similarity index 100% rename from cdk/src/services/vite-remix/lambda.cjs rename to services/vite-remix/lambda.cjs diff --git a/cdk/src/services/vite-remix/lambda.js b/services/vite-remix/lambda.js similarity index 100% rename from cdk/src/services/vite-remix/lambda.js rename to services/vite-remix/lambda.js diff --git a/cdk/src/services/vite-remix/lambda.ts b/services/vite-remix/lambda.ts similarity index 100% rename from cdk/src/services/vite-remix/lambda.ts rename to services/vite-remix/lambda.ts diff --git a/cdk/src/services/vite-remix/package-lock.json b/services/vite-remix/package-lock.json similarity index 100% rename from cdk/src/services/vite-remix/package-lock.json rename to services/vite-remix/package-lock.json diff --git a/cdk/src/services/vite-remix/package.json b/services/vite-remix/package.json similarity index 100% rename from cdk/src/services/vite-remix/package.json rename to services/vite-remix/package.json diff --git a/cdk/src/services/vite-remix/pnpm-lock.yaml b/services/vite-remix/pnpm-lock.yaml similarity index 100% rename from cdk/src/services/vite-remix/pnpm-lock.yaml rename to services/vite-remix/pnpm-lock.yaml diff --git a/cdk/src/services/vite-remix/postcss.config.js b/services/vite-remix/postcss.config.js similarity index 100% rename from cdk/src/services/vite-remix/postcss.config.js rename to services/vite-remix/postcss.config.js diff --git a/cdk/src/services/vite-remix/public/favicon.ico b/services/vite-remix/public/favicon.ico similarity index 100% rename from cdk/src/services/vite-remix/public/favicon.ico rename to services/vite-remix/public/favicon.ico diff --git a/cdk/src/services/vite-remix/tailwind.config.ts b/services/vite-remix/tailwind.config.ts similarity index 100% rename from cdk/src/services/vite-remix/tailwind.config.ts rename to services/vite-remix/tailwind.config.ts diff --git a/cdk/src/services/vite-remix/test/local.js b/services/vite-remix/test/local.js similarity index 100% rename from cdk/src/services/vite-remix/test/local.js rename to services/vite-remix/test/local.js diff --git a/cdk/src/services/vite-remix/tsconfig.json b/services/vite-remix/tsconfig.json similarity index 100% rename from cdk/src/services/vite-remix/tsconfig.json rename to services/vite-remix/tsconfig.json diff --git a/cdk/src/services/vite-remix/vite.config.ts b/services/vite-remix/vite.config.ts similarity index 100% rename from cdk/src/services/vite-remix/vite.config.ts rename to services/vite-remix/vite.config.ts