Merge pull request #492 from AliMD/feat/build

feat: new build process
Alwatr · Dec 12, 2022 · 4d9ebfa · 4d9ebfa
2 parents 234b052 + ecce1df
commit 4d9ebfa
Show file tree

Hide file tree

Showing 68 changed files with 378 additions and 308 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -43,4 +43,7 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: 🚀 Build Typescript
-        run: yarn build
+        run: yarn build:ts && yarn lerna run build:ts
+
+      - name: 🚀 Extra Packages Build
+        run: yarn lerna run build
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -21,12 +21,14 @@
     "alwatr",
     "calt",
     "currentcolor",
+    "esbuild",
     "Kubernetes",
     "mastmalize",
     "mihandoost",
     "nanoserver",
     "nanoservice",
     "noncallable",
+    "outdir",
     "preconnect",
     "preload",
     "roundot",

diff --git a/cloud/container/alwatr-services.dockerfile b/cloud/container/alwatr-services.dockerfile
@@ -47,18 +47,19 @@ WORKDIR /app
 # Install tini for recive system signal in nodejs
 RUN apk add --no-cache tini
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["node", "index.js"]
+CMD ["node", "index.*js"]
 
 ENV NODE_ENV production
+ENV NODE_OPTIONS --enable-source-maps
 ENV ALWATR_DEBUG *
 ENV HOST 0.0.0.0
 ENV PORT 80
 EXPOSE 80
 
 # Tell nodejs to run as ESM Modules
-RUN echo '{"type":"module"}' > package.json
+# RUN echo '{"type":"module"}' > package.json
 
-# Copy all deps from last stage (temporary until refactor build)
+# Copy all deps from last stage
 COPY --from=builder /app/node_modules/ ./node_modules/
 
 # Copy builded files from last stage

diff --git a/core/fetch/src/fetch.ts b/core/fetch/src/fetch.ts
@@ -6,7 +6,7 @@ import type {
   CacheStrategy,
   AlwatrDocumentObject,
   AlwatrServiceResponse,
-} from './type';
+} from './type.js';
 
 export {
   FetchOptions,

diff --git a/package.json b/package.json
@@ -20,6 +20,8 @@
   "scripts": {
     "l": "yarn lint",
     "b": "yarn build",
+    "br": "run-s build:ts build:r",
+    "c": "yarn clean",
     "cb": "run-s clean build",
     "s": "run-s build serve",
     "w": "yarn watch",
@@ -30,8 +32,9 @@
     "pp": "run-s pull clean build ver-patch push",
     "lint": "run-s lint:*",
     "lint:ts": "eslint . --config .eslintrc.json --ext .ts --ignore-path .gitignore",
-    "build": "run-s build:ts && lerna run build",
+    "build": "yarn build:ts",
     "build:ts": "tsc --build",
+    "build:r": "lerna run build",
     "format": "run-s format:prettier format:eslint",
     "format:eslint": "yarn lint:ts --fix",
     "format:prettier": "prettier . --ignore-path .gitignore --write",
@@ -65,5 +68,8 @@
     "rimraf": "~3.0.2",
     "ts-lit-plugin": "~1.2.1",
     "typescript": "~4.9.4"
+  },
+  "resolutions": {
+    "esbuild": "~0.16.4"
   }
 }
diff --git a/services/comment/package.json b/services/comment/package.json
@@ -34,27 +34,31 @@
   },
   "scripts": {
     "b": "yarn build",
+    "c": "yarn clean",
     "cb": "run-s clean build",
     "s": "run-s clean build serve",
     "w": "yarn watch",
     "start": "yarn serve",
-    "build": "run-s build:*",
-    "build:es": "esbuild src/index.ts --bundle --format=esm --minify --target=es2022 --platform=node --outfile=dist/index.js",
-    "clean": "rimraf dist build .tsbuildinfo src/**/*.{js,d.ts,map}",
-    "serve": "node dist/index.js",
-    "serve:debug": "node --inspect dist/index.js",
-    "watch": "run-s clean build && run-p watch:ts watch:node",
-    "watch:node": "nodemon -w dist/ dist/index.js",
-    "watch:debug-node": "nodemon -w dist/ --inspect dist/index.js",
-    "watch:ts": "yarn build:ts --watch --preserveWatchOutput"
+    "build": "yarn build:es --analyze=verbose",
+    "build:ts": "tsc --build",
+    "build:es": "esbuild src/index.ts --platform=node --target=node19 --bundle --format=esm --minify --sourcemap --outdir=dist --out-extension:.js=.mjs",
+    "clean": "rimraf dist build .tsbuildinfo **/*.{d.ts,map} src/**/*.{js,cjs,mjs}",
+    "serve": "node --enable-source-maps dist/index.*js",
+    "serve:debug": "node --inspect --enable-source-maps dist/index.*js",
+    "watch": "run-s clean build && run-p watch:es watch:node",
+    "watch:node": "nodemon -w dist/ --enable-source-maps dist/index.*js",
+    "watch:debug-node": "nodemon -w dist/ --inspect --enable-source-maps dist/index.*js",
+    "watch:ts": "yarn build:ts --watch --preserveWatchOutput",
+    "watch:es": "yarn build:es --watch"
   },
   "dependencies": {
-    "@alwatr/logger": "~0.25.0",
-    "@alwatr/nano-server": "~0.25.0",
-    "@alwatr/storage-client": "~0.25.0"
   },
   "devDependencies": {
+    "@alwatr/logger": "~0.25.0",
+    "@alwatr/nano-server": "~0.25.0",
+    "@alwatr/storage-client": "~0.25.0",
     "@types/node": "~18.11.12",
+    "esbuild": "~0.16.4",
     "nodemon": "~2.0.20",
     "npm-run-all": "~4.1.5",
     "rimraf": "~3.0.2",

diff --git a/services/comment/src/lib/config.ts → services/comment/src/config.ts b/services/comment/src/lib/config.ts → services/comment/src/config.ts
@@ -16,4 +16,4 @@ export const config = {
   },
 };
 
-logger.logProperty('config', {...config, token: '***'});
+logger.logProperty('config', config);
diff --git a/services/comment/src/index.ts b/services/comment/src/index.ts
@@ -1,6 +1,6 @@
 import './route/home.js';
 import './route/patch.js';
 import './route/all.js';
-import {logger} from './lib/config.js';
+import {logger} from './config.js';
 
 logger.logOther('..:: Alwatr Comment Nanoservice API ::..');
diff --git a/services/comment/src/lib/nano-server.ts b/services/comment/src/lib/nano-server.ts
@@ -1,5 +1,5 @@
 import {AlwatrNanoServer} from '@alwatr/nano-server';
 
-import {config} from './config.js';
+import {config} from '../config.js';
 
 export const nanoServer = new AlwatrNanoServer(config.nanoServer);
diff --git a/services/comment/src/lib/storage.ts b/services/comment/src/lib/storage.ts
@@ -1,6 +1,6 @@
 import {AlwatrStorageClient} from '@alwatr/storage-client';
 
-import {config} from './config.js';
+import {config} from '../config.js';
 import {Message} from './type.js';
 
 export const storage = new AlwatrStorageClient<Message>(config.storage);
diff --git a/services/comment/src/route/all.ts b/services/comment/src/route/all.ts
@@ -1,4 +1,4 @@
-import {config, logger} from '../lib/config.js';
+import {config, logger} from '../config.js';
 import {nanoServer} from '../lib/nano-server.js';
 import {storage} from '../lib/storage.js';
 

diff --git a/services/comment/src/route/patch.ts b/services/comment/src/route/patch.ts
@@ -1,4 +1,4 @@
-import {config, logger} from '../lib/config.js';
+import {config, logger} from '../config.js';
 import {nanoServer} from '../lib/nano-server.js';
 import {storage} from '../lib/storage.js';
 import {Message} from '../lib/type.js';

diff --git a/services/comment/tsconfig.json b/services/comment/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
+    "target": "ESNext",
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",
     "rootDir": "src",
-    "outDir": "build"
+    "outDir": "build",
+    // "noEmit": true
   },
 
   "include": ["src/**/*.ts"],

diff --git a/services/flight-crawler/package.json b/services/flight-crawler/package.json
@@ -17,30 +17,34 @@
   },
   "scripts": {
     "b": "yarn build",
+    "c": "yarn clean",
     "cb": "run-s clean build",
     "s": "run-s clean build serve",
     "w": "yarn watch",
     "start": "yarn serve",
-    "build": "run-s build:*",
-        "build:es": "esbuild src/index.ts --bundle --format=esm --minify --target=es2022 --platform=node --outfile=dist/index.js",
-    "clean": "rimraf dist build .tsbuildinfo src/**/*.{js,d.ts,map}",
-    "serve": "node dist/index.js",
-    "serve:debug": "node --inspect dist/index.js",
-    "watch": "run-s clean build && run-p watch:ts watch:node",
-    "watch:node": "nodemon -w dist/ dist/index.js",
-    "watch:debug-node": "nodemon -w dist/ --inspect dist/index.js",
-    "watch:ts": "yarn build:ts --watch --preserveWatchOutput"
+    "build": "yarn build:es --analyze=verbose",
+    "build:ts": "tsc --build",
+    "build:es": "esbuild src/index.ts --platform=node --target=node19 --bundle --format=esm --minify --sourcemap --outdir=dist --out-extension:.js=.mjs",
+    "clean": "rimraf dist build .tsbuildinfo **/*.{d.ts,map} src/**/*.{js,cjs,mjs}",
+    "serve": "node --enable-source-maps dist/index.*js",
+    "serve:debug": "node --inspect --enable-source-maps dist/index.*js",
+    "watch": "run-s clean build && run-p watch:es watch:node",
+    "watch:node": "nodemon -w dist/ --enable-source-maps dist/index.*js",
+    "watch:debug-node": "nodemon -w dist/ --inspect --enable-source-maps dist/index.*js",
+    "watch:ts": "yarn build:ts --watch --preserveWatchOutput",
+    "watch:es": "yarn build:es --watch"
   },
   "dependencies": {
-    "@alwatr/logger": "~0.25.0",
-    "@alwatr/nano-server": "~0.25.0",
-    "@alwatr/storage-client": "~0.25.0"
   },
   "devDependencies": {
+    "@alwatr/logger": "~0.25.0",
+    "@alwatr/nano-server": "~0.25.0",
+    "@alwatr/storage-client": "~0.25.0",
     "@types/node": "~18.11.12",
+    "esbuild": "~0.16.4",
     "nodemon": "~2.0.20",
     "npm-run-all": "~4.1.5",
     "rimraf": "~3.0.2",
-    "typescript": "4.9.4"
+    "typescript": "~4.9.4"
   }
 }
diff --git a/services/flight-crawler/src/lib/config.ts → services/flight-crawler/src/config.ts b/services/flight-crawler/src/lib/config.ts → services/flight-crawler/src/config.ts
@@ -1,5 +1,7 @@
 import {createLogger} from '@alwatr/logger';
 
+export const logger = createLogger('flight-crawler');
+
 export const config = {
   storage: {
     host: process.env.STORAGE_HOST ?? '127.0.0.1',
@@ -14,6 +16,4 @@ export const config = {
   },
 };
 
-export const logger = createLogger('flight-finder-crawler');
-
 logger.logProperty('config', config);
diff --git a/services/flight-crawler/src/crawl.ts b/services/flight-crawler/src/crawl.ts
@@ -1,6 +1,6 @@
 import {fetch} from '@alwatr/fetch';
 
-import {config, logger} from './lib/config.js';
+import {config, logger} from './config.js';
 import {storage} from './lib/storage.js';
 
 import type {Job, JobDetail, JobResult, SepehrResponse} from './lib/type.js';

diff --git a/services/flight-crawler/src/lib/storage.ts b/services/flight-crawler/src/lib/storage.ts
@@ -1,7 +1,7 @@
 import {AlwatrStorageClient} from '@alwatr/storage-client';
 
-import {config} from './config.js';
+import {config} from '../config.js';
 
-import type {Job} from './type';
+import type {Job} from './type.js';
 
 export const storage = new AlwatrStorageClient<Job>(config.storage);
diff --git a/services/flight-crawler/tsconfig.json b/services/flight-crawler/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
+    "target": "ESNext",
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",
     "rootDir": "src",
-    "outDir": "build"
+    "outDir": "build",
+    // "noEmit": true
   },
 
   "include": ["src/**/*.ts"],

diff --git a/services/starter/package.json b/services/starter/package.json
@@ -29,26 +29,30 @@
   },
   "scripts": {
     "b": "yarn build",
+    "c": "yarn clean",
     "cb": "run-s clean build",
     "s": "run-s clean build serve",
     "w": "yarn watch",
     "start": "yarn serve",
-    "build": "run-s build:*",
-        "build:es": "esbuild src/index.ts --bundle --format=esm --minify --target=es2022 --platform=node --outfile=dist/index.js",
-    "clean": "rimraf dist build .tsbuildinfo src/**/*.{js,d.ts,map}",
-    "serve": "node dist/index.js",
-    "serve:debug": "node --inspect dist/index.js",
-    "watch": "run-s clean build && run-p watch:ts watch:node",
-    "watch:node": "nodemon -w dist/ dist/index.js",
-    "watch:debug-node": "nodemon -w dist/ --inspect dist/index.js",
-    "watch:ts": "yarn build:ts --watch --preserveWatchOutput"
+    "build": "yarn build:es --analyze=verbose",
+    "build:ts": "tsc --build",
+    "build:es": "esbuild src/index.ts --platform=node --target=node19 --bundle --format=esm --minify --sourcemap --outdir=dist --out-extension:.js=.mjs",
+    "clean": "rimraf dist build .tsbuildinfo **/*.{d.ts,map} src/**/*.{js,cjs,mjs}",
+    "serve": "node --enable-source-maps dist/index.*js",
+    "serve:debug": "node --inspect --enable-source-maps dist/index.*js",
+    "watch": "run-s clean build && run-p watch:es watch:node",
+    "watch:node": "nodemon -w dist/ --enable-source-maps dist/index.*js",
+    "watch:debug-node": "nodemon -w dist/ --inspect --enable-source-maps dist/index.*js",
+    "watch:ts": "yarn build:ts --watch --preserveWatchOutput",
+    "watch:es": "yarn build:es --watch"
   },
   "dependencies": {
-    "@alwatr/logger": "~0.25.0",
-    "@alwatr/nano-server": "~0.25.0"
   },
   "devDependencies": {
+    "@alwatr/logger": "~0.25.0",
+    "@alwatr/nano-server": "~0.25.0",
     "@types/node": "~18.11.12",
+    "esbuild": "~0.16.4",
     "nodemon": "~2.0.20",
     "npm-run-all": "~4.1.5",
     "rimraf": "~3.0.2",

diff --git a/services/starter/src/lib/config.ts → services/starter/src/config.ts b/services/starter/src/lib/config.ts → services/starter/src/config.ts
@@ -4,7 +4,7 @@ export const logger = createLogger('nanoservice-starter');
 
 export const config = {
   host: process.env.HOST ?? '0.0.0.0',
-  port: process.env.PORT != null ? +process.env.PORT : 80,
+  port: process.env.PORT != null ? +process.env.PORT : 8000,
 };
 
 logger.logProperty('config', config);
diff --git a/services/starter/src/index.ts b/services/starter/src/index.ts
@@ -1,5 +1,5 @@
 import './route/home.js';
 import './route/echo.js';
-import {logger} from './lib/config.js';
+import {logger} from './config.js';
 
 logger.logOther('..:: Alwatr Nanoservice Starter Kit ::..');
diff --git a/services/starter/src/lib/nano-server.ts b/services/starter/src/lib/nano-server.ts
@@ -1,5 +1,5 @@
 import {AlwatrNanoServer} from '@alwatr/nano-server';
 
-import {config} from './config.js';
+import {config} from '../config.js';
 
-export const nanoServer = new AlwatrNanoServer({host: config.host, port: config.port});
+export const nanoServer = new AlwatrNanoServer(config);
diff --git a/services/starter/src/route/echo.ts b/services/starter/src/route/echo.ts
@@ -1,4 +1,4 @@
-import {logger} from '../lib/config.js';
+import {logger} from '../config.js';
 import {nanoServer} from '../lib/nano-server.js';
 
 import type {AlwatrConnection} from '@alwatr/nano-server';

diff --git a/services/starter/tsconfig.json b/services/starter/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
+    "target": "ESNext",
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",
     "rootDir": "src",
-    "outDir": "build"
+    "outDir": "build",
+    // "noEmit": true
   },
 
   "include": ["src/**/*.ts"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ export const config = { @@
       },
     };
-    logger.logProperty('config', {...config, token: '***'});
+    logger.logProperty('config', config);