diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3d5a23579..f0e9894be 100644 --- 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 index adf296587..db2946c18 100644 --- 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 index 0bf167196..1a472e890 100644 --- 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 index 92d1d338f..e65bb1e49 100644 --- 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 index 9db8ab9d8..e675270e4 100644 --- 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 index fc0c54e7a..90a6eb56f 100644 --- 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 b/services/comment/src/config.ts similarity index 90% rename from services/comment/src/lib/config.ts rename to services/comment/src/config.ts index ab744d4f7..52c438c05 100644 --- a/services/comment/src/lib/config.ts +++ b/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 index 8e19684d1..16b7f1e77 100644 --- 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 index df789f689..593467ef5 100644 --- 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 index 4f8d0e074..fb3ae5180 100644 --- 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(config.storage); diff --git a/services/comment/src/route/all.ts b/services/comment/src/route/all.ts index f5d1ea04a..4ee27c570 100644 --- 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 index d3933e395..91377bc32 100644 --- 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 index 254bedf5e..5174e6275 100644 --- 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 index 56f087b77..1e312e773 100644 --- 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 b/services/flight-crawler/src/config.ts similarity index 90% rename from services/flight-crawler/src/lib/config.ts rename to services/flight-crawler/src/config.ts index 577fd6882..4e7e59687 100644 --- a/services/flight-crawler/src/lib/config.ts +++ b/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 index 254e7e5e0..910aa0c50 100644 --- 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 index 69d3ce92d..72eda380b 100644 --- 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(config.storage); diff --git a/services/flight-crawler/tsconfig.json b/services/flight-crawler/tsconfig.json index aa71f9074..8ba5c2717 100644 --- 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 index b29653f60..6cd7d5220 100644 --- 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 b/services/starter/src/config.ts similarity index 77% rename from services/starter/src/lib/config.ts rename to services/starter/src/config.ts index c6cf48126..759ef5424 100644 --- a/services/starter/src/lib/config.ts +++ b/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 index f925d2a09..88d0c4a5b 100644 --- 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 index 9b07406e0..d71893de8 100644 --- 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 index 1bb5d21d1..76a2adc05 100644 --- 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 index e8cb287da..bacbdee2e 100644 --- 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"], diff --git a/services/storage-server/package.json b/services/storage-server/package.json index a2903651e..ce52817c0 100644 --- a/services/storage-server/package.json +++ b/services/storage-server/package.json @@ -36,27 +36,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-engine": "~0.25.0" }, "devDependencies": { + "@alwatr/logger": "~0.25.0", + "@alwatr/nano-server": "~0.25.0", + "@alwatr/storage-engine": "~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/storage-server/src/lib/config.ts b/services/storage-server/src/config.ts similarity index 85% rename from services/storage-server/src/lib/config.ts rename to services/storage-server/src/config.ts index 9a250d804..92a2f0f1c 100644 --- a/services/storage-server/src/lib/config.ts +++ b/services/storage-server/src/config.ts @@ -9,4 +9,4 @@ export const config = { accessToken: process.env.ACCESS_TOKEN ?? 'YOUR_SECRET_TOKEN', }; -logger.logProperty('config', {...config, token: '***'}); +logger.logProperty('config', config); diff --git a/services/storage-server/src/index.ts b/services/storage-server/src/index.ts index a59fe2d25..c8e2a381b 100644 --- a/services/storage-server/src/index.ts +++ b/services/storage-server/src/index.ts @@ -4,6 +4,6 @@ import './route/patch.js'; import './route/delete.js'; import './route/keys.js'; import './route/all.js'; -import {logger} from './lib/config.js'; +import {logger} from './config.js'; logger.logOther('..:: Alwatr Storage Nanoservice API ::..'); diff --git a/services/storage-server/src/lib/nano-server.ts b/services/storage-server/src/lib/nano-server.ts index 9b07406e0..90c358ff3 100644 --- a/services/storage-server/src/lib/nano-server.ts +++ b/services/storage-server/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}); diff --git a/services/storage-server/src/lib/storage-provider.ts b/services/storage-server/src/lib/storage-provider.ts index 72175e038..63b0c6a44 100644 --- a/services/storage-server/src/lib/storage-provider.ts +++ b/services/storage-server/src/lib/storage-provider.ts @@ -1,5 +1,5 @@ import {AlwatrStorageEngineProvider} from '@alwatr/storage-engine/provider.js'; -import {config} from './config.js'; +import {config} from '../config.js'; export const storageProvider = new AlwatrStorageEngineProvider({path: config.storagePath}); diff --git a/services/storage-server/src/route/all.ts b/services/storage-server/src/route/all.ts index 0ae6671d0..661f2d82f 100644 --- a/services/storage-server/src/route/all.ts +++ b/services/storage-server/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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/src/route/delete.ts b/services/storage-server/src/route/delete.ts index 5127cc339..a5638d6fd 100644 --- a/services/storage-server/src/route/delete.ts +++ b/services/storage-server/src/route/delete.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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/src/route/get.ts b/services/storage-server/src/route/get.ts index 59b07e83d..e7bb4c1f2 100644 --- a/services/storage-server/src/route/get.ts +++ b/services/storage-server/src/route/get.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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/src/route/has.ts b/services/storage-server/src/route/has.ts index 152526398..b1ab03901 100644 --- a/services/storage-server/src/route/has.ts +++ b/services/storage-server/src/route/has.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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/src/route/keys.ts b/services/storage-server/src/route/keys.ts index f59b6cd7e..aecaf5135 100644 --- a/services/storage-server/src/route/keys.ts +++ b/services/storage-server/src/route/keys.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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/src/route/patch.ts b/services/storage-server/src/route/patch.ts index 94a9194d6..a5558cb5c 100644 --- a/services/storage-server/src/route/patch.ts +++ b/services/storage-server/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 {storageProvider} from '../lib/storage-provider.js'; diff --git a/services/storage-server/tsconfig.json b/services/storage-server/tsconfig.json index f6d708aa2..b161547c9 100644 --- a/services/storage-server/tsconfig.json +++ b/services/storage-server/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/telegram-notifier/esbuild.config.js b/services/telegram-notifier/esbuild.config.js deleted file mode 100644 index 1d88aad79..000000000 --- a/services/telegram-notifier/esbuild.config.js +++ /dev/null @@ -1,15 +0,0 @@ -import {build} from "esbuild" - -build({ - entryPoints: ['./src/index.ts'], - bundle: true, - logLevel: "info", - minify: true, - format: "esm", - target: "esnext", - platform: "node", - outfile: 'dist/index.js', - banner: { - js: "import { createRequire } from 'module';const require = createRequire(import.meta.url);", - }, -}) diff --git a/services/telegram-notifier/esbuild.mjs b/services/telegram-notifier/esbuild.mjs new file mode 100755 index 000000000..4e947b255 --- /dev/null +++ b/services/telegram-notifier/esbuild.mjs @@ -0,0 +1,28 @@ +#!/usr/bin/env node + +import {build} from 'esbuild'; + +build({ + entryPoints: ['./src/index.ts'], + + logLevel: 'debug', + platform: 'node', + target: 'node19', + format: 'esm', + + bundle: true, + treeShaking: true, + minify: true, + sourcemap: true, + + outdir: 'dist', + outExtension: { + '.js': '.mjs', + }, + + external: ['telegraf'], + + // banner: { + // js: 'import { createRequire } from \'module\';const require = createRequire(import.meta.url);', + // }, +}); diff --git a/services/telegram-notifier/package.json b/services/telegram-notifier/package.json index 95f1c99f3..19d23ae32 100644 --- a/services/telegram-notifier/package.json +++ b/services/telegram-notifier/package.json @@ -17,32 +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": "node ./esbuild.config.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": "./esbuild.mjs", + "build:ts": "tsc --build", + "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-engine": "~0.25.0", "telegraf": "~4.11.2" }, "devDependencies": { + "@alwatr/logger": "~0.25.0", + "@alwatr/nano-server": "~0.25.0", + "@alwatr/storage-engine": "~0.25.0", "@types/node": "~18.11.12", - "crypto": "^1.0.1", + "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/telegram-notifier/src/bot/command/start.ts b/services/telegram-notifier/src/bot/command/start.ts index 60d170061..77b3cc88a 100644 --- a/services/telegram-notifier/src/bot/command/start.ts +++ b/services/telegram-notifier/src/bot/command/start.ts @@ -1,5 +1,5 @@ +import {logger} from '../../config.js'; import {bot} from '../../lib/bot.js'; -import {logger} from '../../lib/config.js'; import {storage} from '../../lib/storage.js'; import {MemberList} from '../../lib/type.js'; diff --git a/services/telegram-notifier/src/bot/send-message.ts b/services/telegram-notifier/src/bot/send-message.ts index 93260c1cd..a42e17c99 100644 --- a/services/telegram-notifier/src/bot/send-message.ts +++ b/services/telegram-notifier/src/bot/send-message.ts @@ -1,5 +1,5 @@ +import {logger} from '../config.js'; import {bot} from '../lib/bot.js'; -import {logger} from '../lib/config.js'; import {storage} from '../lib/storage.js'; export async function sendMessage(to: string, message: string): Promise { diff --git a/services/telegram-notifier/src/lib/config.ts b/services/telegram-notifier/src/config.ts similarity index 99% rename from services/telegram-notifier/src/lib/config.ts rename to services/telegram-notifier/src/config.ts index 51440751e..9a8569070 100644 --- a/services/telegram-notifier/src/lib/config.ts +++ b/services/telegram-notifier/src/config.ts @@ -1,5 +1,7 @@ import {createLogger} from '@alwatr/logger'; +export const logger = createLogger('telegram-notifier'); + const telegramBotToken = process.env.TELEGRAM_BOT_TOKEN; if (telegramBotToken == undefined) { @@ -21,6 +23,5 @@ export const config = { }, }; -export const logger = createLogger('telegram-notifier'); logger.logProperty('config', config); diff --git a/services/telegram-notifier/src/index.ts b/services/telegram-notifier/src/index.ts index 9c0e3e11d..97c45d31c 100644 --- a/services/telegram-notifier/src/index.ts +++ b/services/telegram-notifier/src/index.ts @@ -1,6 +1,6 @@ import './bot/command/start.js'; import './route/home.js'; import './route/notify.js'; -import {logger} from './lib/config.js'; +import {logger} from './config.js'; logger.logOther('..:: Flight Find Notify ::..'); diff --git a/services/telegram-notifier/src/lib/bot.ts b/services/telegram-notifier/src/lib/bot.ts index b3fd45569..8edac33ca 100644 --- a/services/telegram-notifier/src/lib/bot.ts +++ b/services/telegram-notifier/src/lib/bot.ts @@ -1,7 +1,9 @@ import {Telegraf} from 'telegraf'; -import {config} from './config.js'; +import {config, logger} from '../config.js'; export const bot = new Telegraf(config.telegramBot.token); -bot.launch(); +await bot.launch(); + +logger.logProperty('getMe', await bot.telegram.getMe()); diff --git a/services/telegram-notifier/src/lib/nano-server.ts b/services/telegram-notifier/src/lib/nano-server.ts index df789f689..593467ef5 100644 --- a/services/telegram-notifier/src/lib/nano-server.ts +++ b/services/telegram-notifier/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/telegram-notifier/src/lib/storage.ts b/services/telegram-notifier/src/lib/storage.ts index fce364a8d..9901725d2 100644 --- a/services/telegram-notifier/src/lib/storage.ts +++ b/services/telegram-notifier/src/lib/storage.ts @@ -1,6 +1,6 @@ import {AlwatrStorageEngine} from '@alwatr/storage-engine'; -import {config} from './config'; -import {MemberList} from './type'; +import {config} from '../config.js'; +import {MemberList} from './type.js'; export const storage = new AlwatrStorageEngine(config.storage); diff --git a/services/telegram-notifier/src/route/notify.ts b/services/telegram-notifier/src/route/notify.ts index c24a09306..732cee058 100644 --- a/services/telegram-notifier/src/route/notify.ts +++ b/services/telegram-notifier/src/route/notify.ts @@ -1,5 +1,5 @@ import {sendMessage} from '../bot/send-message.js'; -import {config, logger} from '../lib/config.js'; +import {config, logger} from '../config.js'; import {nanoServer} from '../lib/nano-server.js'; import type {AlwatrConnection} from '@alwatr/nano-server'; diff --git a/services/telegram-notifier/tsconfig.json b/services/telegram-notifier/tsconfig.json index 6e2065664..51397c7ea 100644 --- a/services/telegram-notifier/tsconfig.json +++ b/services/telegram-notifier/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/tsconfig.base.json b/tsconfig.base.json index 5f0f9b35a..586e573e9 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -5,7 +5,8 @@ /* Basic Options */ "incremental": true, "target": "ES2019", - "module": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", "lib": ["ES2022", "DOM", "DOM.Iterable"], // "allowJs": true, // "checkJs": true, @@ -43,7 +44,6 @@ // "noPropertyAccessFromIndexSignature": true, /* Module Resolution Options */ - "moduleResolution": "node", // "paths": {}, // "rootDirs": [], // "typeRoots": [], @@ -68,5 +68,8 @@ "skipLibCheck": true, "forceConsistentCasingInFileNames": true, "useDefineForClassFields": false, + + "listEmittedFiles": true, + // "diagnostics": true, }, } diff --git a/tsconfig.json b/tsconfig.json index e796a6a6a..91af53d79 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,10 @@ { "extends": "./tsconfig.base", - + "compilerOptions": { + "composite": true, + "tsBuildInfoFile": ".tsbuildinfo", + }, "files": [], "exclude": [], "references": [ diff --git a/uniquely/flight-finder-api/package.json b/uniquely/flight-finder-api/package.json index efe5974be..f764c558d 100644 --- a/uniquely/flight-finder-api/package.json +++ b/uniquely/flight-finder-api/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/uniquely/flight-finder-api/src/lib/config.ts b/uniquely/flight-finder-api/src/config.ts similarity index 100% rename from uniquely/flight-finder-api/src/lib/config.ts rename to uniquely/flight-finder-api/src/config.ts index 786a0f807..8c03fd3e1 100644 --- a/uniquely/flight-finder-api/src/lib/config.ts +++ b/uniquely/flight-finder-api/src/config.ts @@ -1,5 +1,7 @@ import {createLogger} from '@alwatr/logger'; +export const logger = createLogger('flight-finder-api'); + 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-api'); - logger.logProperty('config', config); diff --git a/uniquely/flight-finder-api/src/index.ts b/uniquely/flight-finder-api/src/index.ts index 0f3a38eec..75e6d1326 100644 --- a/uniquely/flight-finder-api/src/index.ts +++ b/uniquely/flight-finder-api/src/index.ts @@ -2,6 +2,6 @@ import './route/home.js'; import './route/job/put.js'; import './route/job/delete.js'; import './route/job/get.js'; -import {logger} from './lib/config.js'; +import {logger} from './config.js'; logger.logOther('..:: Flight Find API ::..'); diff --git a/uniquely/flight-finder-api/src/lib/nano-server.ts b/uniquely/flight-finder-api/src/lib/nano-server.ts index 1271b78db..9f6a61945 100644 --- a/uniquely/flight-finder-api/src/lib/nano-server.ts +++ b/uniquely/flight-finder-api/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, allowAllOrigin: true}); diff --git a/uniquely/flight-finder-api/src/lib/storage.ts b/uniquely/flight-finder-api/src/lib/storage.ts index 69d3ce92d..72eda380b 100644 --- a/uniquely/flight-finder-api/src/lib/storage.ts +++ b/uniquely/flight-finder-api/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(config.storage); diff --git a/uniquely/flight-finder-api/src/route/job/delete.ts b/uniquely/flight-finder-api/src/route/job/delete.ts index a485d45a3..955c3748b 100644 --- a/uniquely/flight-finder-api/src/route/job/delete.ts +++ b/uniquely/flight-finder-api/src/route/job/delete.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/uniquely/flight-finder-api/src/route/job/get.ts b/uniquely/flight-finder-api/src/route/job/get.ts index c1e83db0e..4b861ba5d 100644 --- a/uniquely/flight-finder-api/src/route/job/get.ts +++ b/uniquely/flight-finder-api/src/route/job/get.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/uniquely/flight-finder-api/src/route/job/put.ts b/uniquely/flight-finder-api/src/route/job/put.ts index d4224a180..fcf0a519f 100644 --- a/uniquely/flight-finder-api/src/route/job/put.ts +++ b/uniquely/flight-finder-api/src/route/job/put.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/uniquely/flight-finder-api/tsconfig.json b/uniquely/flight-finder-api/tsconfig.json index 7a5855718..5174e6275 100644 --- a/uniquely/flight-finder-api/tsconfig.json +++ b/uniquely/flight-finder-api/tsconfig.json @@ -1,11 +1,14 @@ { "extends": "../../tsconfig.base", "compilerOptions": { + "target": "ESNext", "composite": true, "tsBuildInfoFile": ".tsbuildinfo", "rootDir": "src", "outDir": "build", + // "noEmit": true }, + "include": ["src/**/*.ts"], "exclude": [], "references": [ diff --git a/uniquely/flight-finder-pwa/package.json b/uniquely/flight-finder-pwa/package.json index 7c926dd33..fb1ce6734 100644 --- a/uniquely/flight-finder-pwa/package.json +++ b/uniquely/flight-finder-pwa/package.json @@ -22,9 +22,9 @@ "s": "run-s clean build serve", "w": "yarn watch", "start": "yarn serve", - "clean": "rimraf dist build .tsbuildinfo src/**/*.{js,d.ts,map}", + "clean": "rimraf dist build .tsbuildinfo **/*.{d.ts,map} src/**/*.{js,cjs,mjs}", "build": "run-s build:ts build:es", - "build:ts": "tsc --build --pretty", + "build:ts": "tsc --build", "build:es": "rimraf dist && rollup -c", "serve": "wds", "watch": "run-s clean build:ts && run-p watch:ts serve", diff --git a/uniquely/flight-finder-pwa/src/alwatr-pwa.ts b/uniquely/flight-finder-pwa/src/alwatr-pwa.ts index 0f57a88d4..163b21478 100644 --- a/uniquely/flight-finder-pwa/src/alwatr-pwa.ts +++ b/uniquely/flight-finder-pwa/src/alwatr-pwa.ts @@ -4,12 +4,12 @@ import {router} from '@alwatr/router'; import {css, html} from 'lit'; import {customElement} from 'lit/decorators.js'; -import ionNormalize from './style/ionic.normalize'; -import ionTheming from './style/ionic.theming'; +import ionNormalize from './style/ionic.normalize.js'; +import ionTheming from './style/ionic.theming.js'; -import './component/page-flight-finder'; -import './component/ionic-components'; -import './director'; +import './component/page-flight-finder.js'; +import './component/ionic-components.js'; +import './director/index.js'; import type {RoutesConfig} from '@alwatr/router'; import type {TemplateResult} from 'lit'; diff --git a/uniquely/flight-finder-pwa/src/component/job-item.ts b/uniquely/flight-finder-pwa/src/component/job-item.ts index 759bd72c3..da23ba392 100644 --- a/uniquely/flight-finder-pwa/src/component/job-item.ts +++ b/uniquely/flight-finder-pwa/src/component/job-item.ts @@ -5,12 +5,12 @@ import {customElement, property} from 'lit/decorators.js'; import '@alwatr/icon'; -import ionNormalize from '../style/ionic.normalize'; -import ionTheming from '../style/ionic.theming'; +import ionNormalize from '../style/ionic.normalize.js'; +import ionTheming from '../style/ionic.theming.js'; import './ionic-components'; -import type {Job, JobDetail, JobResult} from '../type'; +import type {Job, JobDetail, JobResult} from '../type.js'; import type {TemplateResult} from 'lit'; declare global { diff --git a/uniquely/flight-finder-pwa/src/component/page-flight-finder.ts b/uniquely/flight-finder-pwa/src/component/page-flight-finder.ts index 4c0ba3780..f96f63617 100644 --- a/uniquely/flight-finder-pwa/src/component/page-flight-finder.ts +++ b/uniquely/flight-finder-pwa/src/component/page-flight-finder.ts @@ -5,12 +5,12 @@ import {css, html} from 'lit'; import {customElement, state} from 'lit/decorators.js'; import {map} from 'lit/directives/map.js'; -import {cityList} from '../city-list'; -import ionNormalize from '../style/ionic.normalize'; -import ionTheming from '../style/ionic.theming'; -import {i18nDayPartList} from './job-item'; +import {cityList} from '../city-list.js'; +import ionNormalize from '../style/ionic.normalize.js'; +import ionTheming from '../style/ionic.theming.js'; +import {i18nDayPartList} from './job-item.js'; -import type {dayParts, Job, NewJobDetail} from '../type'; +import type {dayParts, Job, NewJobDetail} from '../type.js'; import type {InputCustomEvent, SelectCustomEvent} from '@ionic/core'; import type {TemplateResult} from 'lit'; diff --git a/uniquely/flight-finder-pwa/src/director/index.ts b/uniquely/flight-finder-pwa/src/director/index.ts index 262bb6fba..884183416 100644 --- a/uniquely/flight-finder-pwa/src/director/index.ts +++ b/uniquely/flight-finder-pwa/src/director/index.ts @@ -1,4 +1,4 @@ import './job-add'; import './job-delete'; -import './job-list'; -import './toast'; +import './job-list.js'; +import './toast.js'; diff --git a/uniquely/flight-finder-pwa/src/director/job-add.ts b/uniquely/flight-finder-pwa/src/director/job-add.ts index 9dbf97d02..0bf54bc3f 100644 --- a/uniquely/flight-finder-pwa/src/director/job-add.ts +++ b/uniquely/flight-finder-pwa/src/director/job-add.ts @@ -1,10 +1,10 @@ import {fetch} from '@alwatr/fetch'; import {SignalInterface} from '@alwatr/signal'; -import {jobListSignal} from './job-list'; -import {showToastSignal} from './toast'; +import {jobListSignal} from './job-list.js'; +import {showToastSignal} from './toast.js'; -import type {Job} from '../type'; +import type {Job} from '../type.js'; import type {AlwatrServiceResponse} from '@alwatr/fetch'; export const jobAddSignal = new SignalInterface('job-add'); diff --git a/uniquely/flight-finder-pwa/src/director/job-delete.ts b/uniquely/flight-finder-pwa/src/director/job-delete.ts index 15033c349..e847da8d8 100644 --- a/uniquely/flight-finder-pwa/src/director/job-delete.ts +++ b/uniquely/flight-finder-pwa/src/director/job-delete.ts @@ -1,8 +1,8 @@ import {fetch} from '@alwatr/fetch'; import {SignalInterface} from '@alwatr/signal'; -import {jobListSignal} from './job-list'; -import {showToastSignal} from './toast'; +import {jobListSignal} from './job-list.js'; +import {showToastSignal} from './toast.js'; import type {AlwatrServiceResponse} from '@alwatr/fetch'; diff --git a/uniquely/flight-finder-pwa/src/director/job-list.ts b/uniquely/flight-finder-pwa/src/director/job-list.ts index 66e9c49a2..4a28f06f8 100644 --- a/uniquely/flight-finder-pwa/src/director/job-list.ts +++ b/uniquely/flight-finder-pwa/src/director/job-list.ts @@ -1,9 +1,9 @@ import {fetch} from '@alwatr/fetch'; import {SignalInterface} from '@alwatr/signal'; -import {showToastSignal} from './toast'; +import {showToastSignal} from './toast.js'; -import type {Job} from '../type'; +import type {Job} from '../type.js'; import type {AlwatrServiceResponse} from '@alwatr/fetch'; export const jobListSignal = new SignalInterface('job-list'); diff --git a/yarn.lock b/yarn.lock index 1dba6be16..d0acbc072 100644 --- a/yarn.lock +++ b/yarn.lock @@ -914,10 +914,115 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@esbuild/linux-loong64@0.14.54": - version "0.14.54" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" - integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== +"@esbuild/android-arm64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.4.tgz#4b31b9e3da2e4c12a8170bd682f713c775f68ab1" + integrity sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q== + +"@esbuild/android-arm@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.4.tgz#057d3e8b0ee41ff59386c33ba6dcf20f4bedd1f7" + integrity sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw== + +"@esbuild/android-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.4.tgz#62ccab8ac1d3e6ef1df3fa2e1974bc2b8528d74a" + integrity sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g== + +"@esbuild/darwin-arm64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.4.tgz#c19a6489d626c36fc611c85ccd8a3333c1f2a930" + integrity sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg== + +"@esbuild/darwin-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.4.tgz#b726bbc84a1e277f6ec2509d10b8ee03f242b776" + integrity sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA== + +"@esbuild/freebsd-arm64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.4.tgz#364568e6ca2901297f247de0681c9b14bbe658c8" + integrity sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w== + +"@esbuild/freebsd-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.4.tgz#44701ba4a5497ba64eec0a6c9e221d8f46a25e72" + integrity sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q== + +"@esbuild/linux-arm64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.4.tgz#b58fb418ec9ac714d8dbb38c787ff2441eb1d9db" + integrity sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g== + +"@esbuild/linux-arm@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.4.tgz#b37f15ecddb53eeea466e5960e31a58f33e0e87e" + integrity sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA== + +"@esbuild/linux-ia32@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.4.tgz#117e32a9680b5deac184ebee122f8575369fad1b" + integrity sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw== + +"@esbuild/linux-loong64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.4.tgz#dd504fb83c280752d4b485d9acb3cf391cb7bf5b" + integrity sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg== + +"@esbuild/linux-mips64el@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.4.tgz#9ab77e31cf3be1e35572afff94b51df8149d15bd" + integrity sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA== + +"@esbuild/linux-ppc64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.4.tgz#69d56c2a960808bee1c7b9b84a115220ec9ce05c" + integrity sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g== + +"@esbuild/linux-riscv64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.4.tgz#9fc23583f4a1508a8d352bd376340e42217e8a90" + integrity sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA== + +"@esbuild/linux-s390x@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.4.tgz#4cae1f70ac2943f076dd130c3c80d28f57bf75d1" + integrity sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A== + +"@esbuild/linux-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.4.tgz#fdf494de07cda23a2dc4b71ff1e0848e4ee6539c" + integrity sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw== + +"@esbuild/netbsd-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.4.tgz#b59ecb49087119c575c0f64d7e66001d52799e24" + integrity sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ== + +"@esbuild/openbsd-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.4.tgz#c51e36db875948b7b11d08bafa355605a1aa289c" + integrity sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw== + +"@esbuild/sunos-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.4.tgz#0b50e941cd44f069e9f2573321aec984244ec228" + integrity sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ== + +"@esbuild/win32-arm64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.4.tgz#d1c93b20f17355ab2221cd18e13ae2f1b68013e3" + integrity sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ== + +"@esbuild/win32-ia32@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.4.tgz#df5910e76660e0acbbdceb8d4ae6bf1efeade6ae" + integrity sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w== + +"@esbuild/win32-x64@0.16.4": + version "0.16.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz#6ec594468610c176933da1387c609558371d37e0" + integrity sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ== "@eslint/eslintrc@^1.3.3": version "1.3.3" @@ -3688,11 +3793,6 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -crypto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037" - integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig== - dargs@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" @@ -4074,132 +4174,33 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" - integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== - -esbuild-android-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" - integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== - -esbuild-darwin-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" - integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== - -esbuild-darwin-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" - integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== - -esbuild-freebsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" - integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== - -esbuild-freebsd-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" - integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== - -esbuild-linux-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" - integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== - -esbuild-linux-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" - integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== - -esbuild-linux-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" - integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== - -esbuild-linux-arm@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" - integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== - -esbuild-linux-mips64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" - integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== - -esbuild-linux-ppc64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" - integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== - -esbuild-linux-riscv64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" - integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== - -esbuild-linux-s390x@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" - integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== - -esbuild-netbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" - integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== - -esbuild-openbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" - integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== - -esbuild-sunos-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" - integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== - -esbuild-windows-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" - integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== - -esbuild-windows-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" - integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== - -esbuild-windows-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" - integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== - -"esbuild@^0.12 || ^0.13 || ^0.14": - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" - integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== +"esbuild@^0.12 || ^0.13 || ^0.14", esbuild@~0.16.4: + version "0.16.4" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.4.tgz#06c86298d233386f5e41bcc14d36086daf3f40bd" + integrity sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA== optionalDependencies: - "@esbuild/linux-loong64" "0.14.54" - esbuild-android-64 "0.14.54" - esbuild-android-arm64 "0.14.54" - esbuild-darwin-64 "0.14.54" - esbuild-darwin-arm64 "0.14.54" - esbuild-freebsd-64 "0.14.54" - esbuild-freebsd-arm64 "0.14.54" - esbuild-linux-32 "0.14.54" - esbuild-linux-64 "0.14.54" - esbuild-linux-arm "0.14.54" - esbuild-linux-arm64 "0.14.54" - esbuild-linux-mips64le "0.14.54" - esbuild-linux-ppc64le "0.14.54" - esbuild-linux-riscv64 "0.14.54" - esbuild-linux-s390x "0.14.54" - esbuild-netbsd-64 "0.14.54" - esbuild-openbsd-64 "0.14.54" - esbuild-sunos-64 "0.14.54" - esbuild-windows-32 "0.14.54" - esbuild-windows-64 "0.14.54" - esbuild-windows-arm64 "0.14.54" + "@esbuild/android-arm" "0.16.4" + "@esbuild/android-arm64" "0.16.4" + "@esbuild/android-x64" "0.16.4" + "@esbuild/darwin-arm64" "0.16.4" + "@esbuild/darwin-x64" "0.16.4" + "@esbuild/freebsd-arm64" "0.16.4" + "@esbuild/freebsd-x64" "0.16.4" + "@esbuild/linux-arm" "0.16.4" + "@esbuild/linux-arm64" "0.16.4" + "@esbuild/linux-ia32" "0.16.4" + "@esbuild/linux-loong64" "0.16.4" + "@esbuild/linux-mips64el" "0.16.4" + "@esbuild/linux-ppc64" "0.16.4" + "@esbuild/linux-riscv64" "0.16.4" + "@esbuild/linux-s390x" "0.16.4" + "@esbuild/linux-x64" "0.16.4" + "@esbuild/netbsd-x64" "0.16.4" + "@esbuild/openbsd-x64" "0.16.4" + "@esbuild/sunos-x64" "0.16.4" + "@esbuild/win32-arm64" "0.16.4" + "@esbuild/win32-ia32" "0.16.4" + "@esbuild/win32-x64" "0.16.4" escalade@^3.1.1: version "3.1.1" @@ -8639,7 +8640,7 @@ typegram@^4.1.0: resolved "https://registry.yarnpkg.com/typegram/-/typegram-4.1.0.tgz#fb1c8f59d387c5b4966be9aac745aa9fcedc0a2d" integrity sha512-OejXXNRh3bb6TQKbUM0k1p1wnEYCrZd66TNLeZeV2S6s4XWkCmVHONXqBTPtWpaq+IUxSyQwKJ1XXyN17Lr0+w== -typescript@4.9.4, "typescript@^2.9.2 || ^3.0.0 || ^4.0.0", "typescript@^3 || ^4", typescript@~4.9.4: +"typescript@^2.9.2 || ^3.0.0 || ^4.0.0", "typescript@^3 || ^4", typescript@~4.9.4: version "4.9.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==