feat: Lerna shared

bigcapitalhq · Oct 6, 2024 · 6cad929 · 6cad929
1 parent 1846480
commit 6cad929
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 22 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,7 @@
   "version": "independent",
   "npmClient": "pnpm",
   "packages": [
-    "packages/*"
+    "packages/*",
+    "shared/*"
   ]
 }
diff --git a/package.json b/package.json
@@ -4,11 +4,11 @@
   "scripts": {
     "dev": "lerna run dev",
     "build": "lerna run build",
-    "dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
-    "build:webapp": "lerna run build --scope \"@bigcapital/webapp\"",
-    "dev:server": "lerna run dev --scope \"@bigcapital/server\"",
-    "build:server": "lerna run build --scope \"@bigcapital/server\"",
-    "serve:server": "lerna run serve --scope \"@bigcapital/server\"",
+    "dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\" --scope \"@bigcapital/utils\"",
+    "build:webapp": "lerna run build --scope \"@bigcapital/webapp\" --scope \"@bigcapital/utils\"",
+    "dev:server": "lerna run dev --scope \"@bigcapital/server\" --scope \"@bigcapital/utils\"",
+    "build:server": "lerna run build --scope \"@bigcapital/server\" --scope \"@bigcapital/utils\"",
+    "serve:server": "lerna run serve --scope \"@bigcapital/server\" --scope \"@bigcapital/utils\"",
     "test:e2e": "playwright test",
     "prepare": "husky install"
   },

diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile
@@ -90,11 +90,7 @@ RUN chown node:node /
 RUN npm install -g pnpm
 
 # Copy application dependency manifests to the container image.
-COPY ./package*.json ./
-COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
-COPY ./lerna.json ./lerna.json
-COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
-COPY ./packages/server/package*.json ./packages/server/
+COPY --chown=node:node ./ ./
 
 # Install application dependencies
 RUN apk update
@@ -109,6 +105,6 @@ RUN pnpm install
 COPY --chown=node:node ./packages/server ./packages/server
 
 # # Creates a "dist" folder with the production build
-RUN npm run build:server --skip-nx-cache
+RUN pnpm run build:server --skip-nx-cache
 
 CMD [ "node", "./packages/server/build/index.js" ]
diff --git a/packages/webapp/Dockerfile b/packages/webapp/Dockerfile
@@ -5,11 +5,7 @@ USER root
 WORKDIR /app
 
 # Copy application dependency manifests to the container image.
-COPY ./package*.json ./
-COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
-COPY ./lerna.json ./lerna.json
-COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
-COPY ./packages/webapp/package*.json ./packages/webapp/
+COPY . .
 
 # Install application dependencies
 RUN apk update
@@ -23,7 +19,6 @@ RUN npm install -g pnpm
 RUN pnpm install
 
 # Build webapp package
-COPY ./packages/webapp /app/packages/webapp
 RUN pnpm run build:webapp
 
 FROM nginx

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 packages:
   # all packages in direct subdirs of packages/
   - 'packages/*'
+  - 'shared/*'
diff --git a/packages/bigcapital-utils/.gitignore → shared/bigcapital-utils/.gitignore b/packages/bigcapital-utils/.gitignore → shared/bigcapital-utils/.gitignore
diff --git a/packages/bigcapital-utils/package.json → shared/bigcapital-utils/package.json b/packages/bigcapital-utils/package.json → shared/bigcapital-utils/package.json
diff --git a/...igcapital-utils/src/countries/constant.ts → ...igcapital-utils/src/countries/constant.ts b/...igcapital-utils/src/countries/constant.ts → ...igcapital-utils/src/countries/constant.ts
diff --git a/...s/bigcapital-utils/src/countries/index.ts → ...d/bigcapital-utils/src/countries/index.ts b/...s/bigcapital-utils/src/countries/index.ts → ...d/bigcapital-utils/src/countries/index.ts
diff --git a/...s/bigcapital-utils/src/countries/types.ts → ...d/bigcapital-utils/src/countries/types.ts b/...s/bigcapital-utils/src/countries/types.ts → ...d/bigcapital-utils/src/countries/types.ts
diff --git a/packages/bigcapital-utils/src/index.ts → shared/bigcapital-utils/src/index.ts b/packages/bigcapital-utils/src/index.ts → shared/bigcapital-utils/src/index.ts
diff --git a/packages/bigcapital-utils/tsconfig.json → shared/bigcapital-utils/tsconfig.json b/packages/bigcapital-utils/tsconfig.json → shared/bigcapital-utils/tsconfig.json