From 6aaa91c506366d936aac1391398a4a17c6ec23b6 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Wed, 15 May 2024 11:54:37 -0700 Subject: [PATCH] feat(model-ad): generate Angular app for MODEL-AD (#2679) --- .devcontainer/devcontainer.json | 49 +- apps/model-ad/app/.eslintrc.json | 33 + apps/model-ad/app/jest.config.ts | 22 + apps/model-ad/app/project.json | 88 ++ apps/model-ad/app/server.ts | 59 ++ apps/model-ad/app/src/app/app.component.html | 1 + .../src/app/app.component.scss} | 0 .../app/src/app/app.component.spec.ts.off | 25 + apps/model-ad/app/src/app/app.component.ts | 14 + .../model-ad/app/src/app/app.config.server.ts | 9 + apps/model-ad/app/src/app/app.config.ts | 8 + apps/model-ad/app/src/app/app.routes.ts | 3 + .../app/src/app/nx-welcome.component.ts | 907 ++++++++++++++++++ apps/model-ad/app/src/assets/.gitkeep | 0 apps/model-ad/app/src/favicon.ico | Bin 0 -> 15086 bytes apps/model-ad/app/src/index.html | 13 + apps/model-ad/app/src/main.server.ts | 7 + apps/model-ad/app/src/main.ts | 7 + apps/model-ad/app/src/styles.scss | 1 + apps/model-ad/app/src/test-setup.ts | 8 + apps/model-ad/app/tsconfig.app.json | 10 + apps/model-ad/app/tsconfig.editor.json | 6 + apps/model-ad/app/tsconfig.json | 33 + apps/model-ad/app/tsconfig.spec.json | 11 + nx.json | 11 +- package.json | 2 + yarn.lock | 89 +- 27 files changed, 1405 insertions(+), 11 deletions(-) create mode 100644 apps/model-ad/app/.eslintrc.json create mode 100644 apps/model-ad/app/jest.config.ts create mode 100644 apps/model-ad/app/project.json create mode 100644 apps/model-ad/app/server.ts create mode 100644 apps/model-ad/app/src/app/app.component.html rename apps/model-ad/{.gitkeep => app/src/app/app.component.scss} (100%) create mode 100644 apps/model-ad/app/src/app/app.component.spec.ts.off create mode 100644 apps/model-ad/app/src/app/app.component.ts create mode 100644 apps/model-ad/app/src/app/app.config.server.ts create mode 100644 apps/model-ad/app/src/app/app.config.ts create mode 100644 apps/model-ad/app/src/app/app.routes.ts create mode 100644 apps/model-ad/app/src/app/nx-welcome.component.ts create mode 100644 apps/model-ad/app/src/assets/.gitkeep create mode 100644 apps/model-ad/app/src/favicon.ico create mode 100644 apps/model-ad/app/src/index.html create mode 100644 apps/model-ad/app/src/main.server.ts create mode 100644 apps/model-ad/app/src/main.ts create mode 100644 apps/model-ad/app/src/styles.scss create mode 100644 apps/model-ad/app/src/test-setup.ts create mode 100644 apps/model-ad/app/tsconfig.app.json create mode 100644 apps/model-ad/app/tsconfig.editor.json create mode 100644 apps/model-ad/app/tsconfig.json create mode 100644 apps/model-ad/app/tsconfig.spec.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b6f2bed437..7d35129584 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -22,7 +22,9 @@ }, "customizations": { "codespaces": { - "openFiles": ["README.md"] + "openFiles": [ + "README.md" + ] }, "vscode": { "extensions": [ @@ -66,9 +68,41 @@ } }, "forwardPorts": [ - 2432, 3000, 3306, 4200, 4211, 5017, 5200, 5432, 5601, 7010, 7443, 7200, 7888, 8010, 8071, 8000, - 8080, 8081, 8082, 8083, 8084, 8085, 8086, 8090, 8091, 8092, 8200, 8787, 8888, 8889, 9090, 9104, - 9200, 9411, 27017 + 2432, + 3000, + 3306, + 4200, + 4211, + 5017, + 5200, + 5432, + 5601, + 7010, + 7443, + 7200, + 7888, + 8010, + 8071, + 8000, + 8080, + 8081, + 8082, + 8083, + 8084, + 8085, + 8086, + 8090, + 8091, + 8092, + 8200, + 8787, + 8888, + 8889, + 9090, + 9104, + 9200, + 9411, + 27017 ], "portsAttributes": { "2432": { @@ -218,5 +252,8 @@ }, "remoteUser": "vscode", "shutdownAction": "stopContainer", - "runArgs": ["--name", "sage_devcontainer"] -} + "runArgs": [ + "--name", + "sage_devcontainer" + ] +} \ No newline at end of file diff --git a/apps/model-ad/app/.eslintrc.json b/apps/model-ad/app/.eslintrc.json new file mode 100644 index 0000000000..36040daaee --- /dev/null +++ b/apps/model-ad/app/.eslintrc.json @@ -0,0 +1,33 @@ +{ + "extends": ["../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts"], + "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"], + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "app", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "app", + "style": "kebab-case" + } + ] + } + }, + { + "files": ["*.html"], + "extends": ["plugin:@nx/angular-template"], + "rules": {} + } + ] +} diff --git a/apps/model-ad/app/jest.config.ts b/apps/model-ad/app/jest.config.ts new file mode 100644 index 0000000000..edcd93783e --- /dev/null +++ b/apps/model-ad/app/jest.config.ts @@ -0,0 +1,22 @@ +/* eslint-disable */ +export default { + displayName: 'model-ad-app', + preset: '../../../jest.preset.js', + setupFilesAfterEnv: ['/src/test-setup.ts'], + coverageDirectory: '../../../coverage/apps/model-ad/app', + transform: { + '^.+\\.(ts|mjs|js|html)$': [ + 'jest-preset-angular', + { + tsconfig: '/tsconfig.spec.json', + stringifyContentPathRegex: '\\.(html|svg)$', + }, + ], + }, + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + snapshotSerializers: [ + 'jest-preset-angular/build/serializers/no-ng-attributes', + 'jest-preset-angular/build/serializers/ng-snapshot', + 'jest-preset-angular/build/serializers/html-comment', + ], +}; diff --git a/apps/model-ad/app/project.json b/apps/model-ad/app/project.json new file mode 100644 index 0000000000..cc621d386e --- /dev/null +++ b/apps/model-ad/app/project.json @@ -0,0 +1,88 @@ +{ + "name": "model-ad-app", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "projectType": "application", + "prefix": "app", + "sourceRoot": "apps/model-ad/app/src", + "tags": [], + "targets": { + "build": { + "executor": "@angular-devkit/build-angular:application", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/apps/model-ad/app", + "index": "apps/model-ad/app/src/index.html", + "browser": "apps/model-ad/app/src/main.ts", + "polyfills": ["zone.js"], + "tsConfig": "apps/model-ad/app/tsconfig.app.json", + "inlineStyleLanguage": "scss", + "assets": ["apps/model-ad/app/src/favicon.ico", "apps/model-ad/app/src/assets"], + "styles": ["apps/model-ad/app/src/styles.scss"], + "scripts": [], + "server": "apps/model-ad/app/src/main.server.ts", + "prerender": true, + "ssr": { + "entry": "apps/model-ad/app/server.ts" + } + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "500kb", + "maximumError": "1mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "2kb", + "maximumError": "4kb" + } + ], + "outputHashing": "all" + }, + "development": { + "optimization": false, + "extractLicenses": false, + "sourceMap": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "executor": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "buildTarget": "model-ad-app:build:production" + }, + "development": { + "buildTarget": "model-ad-app:build:development" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "executor": "@angular-devkit/build-angular:extract-i18n", + "options": { + "buildTarget": "model-ad-app:build" + } + }, + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@nx/jest:jest", + "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], + "options": { + "jestConfig": "apps/model-ad/app/jest.config.ts" + } + }, + "serve-static": { + "executor": "@nx/web:file-server", + "options": { + "buildTarget": "model-ad-app:build", + "staticFilePath": "dist/apps/model-ad/app/browser" + } + } + } +} diff --git a/apps/model-ad/app/server.ts b/apps/model-ad/app/server.ts new file mode 100644 index 0000000000..b1493d0eae --- /dev/null +++ b/apps/model-ad/app/server.ts @@ -0,0 +1,59 @@ +import { APP_BASE_HREF } from '@angular/common'; +import { CommonEngine } from '@angular/ssr'; +import express from 'express'; +import { fileURLToPath } from 'node:url'; +import { dirname, join, resolve } from 'node:path'; +import bootstrap from './src/main.server'; + +// The Express app is exported so that it can be used by serverless Functions. +export function app(): express.Express { + const server = express(); + const serverDistFolder = dirname(fileURLToPath(import.meta.url)); + const browserDistFolder = resolve(serverDistFolder, '../browser'); + const indexHtml = join(serverDistFolder, 'index.server.html'); + + const commonEngine = new CommonEngine(); + + server.set('view engine', 'html'); + server.set('views', browserDistFolder); + + // Example Express Rest API endpoints + // server.get('/api/**', (req, res) => { }); + // Serve static files from /browser + server.get( + '*.*', + express.static(browserDistFolder, { + maxAge: '1y', + }) + ); + + // All regular routes use the Angular engine + server.get('*', (req, res, next) => { + const { protocol, originalUrl, baseUrl, headers } = req; + + commonEngine + .render({ + bootstrap, + documentFilePath: indexHtml, + url: `${protocol}://${headers.host}${originalUrl}`, + publicPath: browserDistFolder, + providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }], + }) + .then((html) => res.send(html)) + .catch((err) => next(err)); + }); + + return server; +} + +function run(): void { + const port = process.env['PORT'] || 4000; + + // Start up the Node server + const server = app(); + server.listen(port, () => { + console.log(`Node Express server listening on http://localhost:${port}`); + }); +} + +run(); diff --git a/apps/model-ad/app/src/app/app.component.html b/apps/model-ad/app/src/app/app.component.html new file mode 100644 index 0000000000..0f4018b6d7 --- /dev/null +++ b/apps/model-ad/app/src/app/app.component.html @@ -0,0 +1 @@ + diff --git a/apps/model-ad/.gitkeep b/apps/model-ad/app/src/app/app.component.scss similarity index 100% rename from apps/model-ad/.gitkeep rename to apps/model-ad/app/src/app/app.component.scss diff --git a/apps/model-ad/app/src/app/app.component.spec.ts.off b/apps/model-ad/app/src/app/app.component.spec.ts.off new file mode 100644 index 0000000000..334381e66a --- /dev/null +++ b/apps/model-ad/app/src/app/app.component.spec.ts.off @@ -0,0 +1,25 @@ +import { TestBed } from '@angular/core/testing'; +import { AppComponent } from './app.component'; +import { NxWelcomeComponent } from './nx-welcome.component'; +import { RouterTestingModule } from '@angular/router/testing'; + +describe('AppComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [AppComponent, NxWelcomeComponent, RouterTestingModule], + }).compileComponents(); + }); + + it('should render title', () => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.nativeElement as HTMLElement; + expect(compiled.querySelector('h1')?.textContent).toContain('Welcome model-ad-app'); + }); + + it(`should have as title 'model-ad-app'`, () => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.componentInstance; + expect(app.title).toEqual('model-ad-app'); + }); +}); diff --git a/apps/model-ad/app/src/app/app.component.ts b/apps/model-ad/app/src/app/app.component.ts new file mode 100644 index 0000000000..e5bfabd849 --- /dev/null +++ b/apps/model-ad/app/src/app/app.component.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { NxWelcomeComponent } from './nx-welcome.component'; + +@Component({ + standalone: true, + imports: [NxWelcomeComponent, RouterModule], + selector: 'app-root', + templateUrl: './app.component.html', + styleUrl: './app.component.scss', +}) +export class AppComponent { + title = 'model-ad-app'; +} diff --git a/apps/model-ad/app/src/app/app.config.server.ts b/apps/model-ad/app/src/app/app.config.server.ts new file mode 100644 index 0000000000..1980cfe118 --- /dev/null +++ b/apps/model-ad/app/src/app/app.config.server.ts @@ -0,0 +1,9 @@ +import { mergeApplicationConfig, ApplicationConfig } from '@angular/core'; +import { provideServerRendering } from '@angular/platform-server'; +import { appConfig } from './app.config'; + +const serverConfig: ApplicationConfig = { + providers: [provideServerRendering()], +}; + +export const config = mergeApplicationConfig(appConfig, serverConfig); diff --git a/apps/model-ad/app/src/app/app.config.ts b/apps/model-ad/app/src/app/app.config.ts new file mode 100644 index 0000000000..bc73e31e9e --- /dev/null +++ b/apps/model-ad/app/src/app/app.config.ts @@ -0,0 +1,8 @@ +import { ApplicationConfig } from '@angular/core'; +import { provideRouter } from '@angular/router'; +import { appRoutes } from './app.routes'; +import { provideClientHydration } from '@angular/platform-browser'; + +export const appConfig: ApplicationConfig = { + providers: [provideClientHydration(), provideRouter(appRoutes)], +}; diff --git a/apps/model-ad/app/src/app/app.routes.ts b/apps/model-ad/app/src/app/app.routes.ts new file mode 100644 index 0000000000..8762dfe2c6 --- /dev/null +++ b/apps/model-ad/app/src/app/app.routes.ts @@ -0,0 +1,3 @@ +import { Route } from '@angular/router'; + +export const appRoutes: Route[] = []; diff --git a/apps/model-ad/app/src/app/nx-welcome.component.ts b/apps/model-ad/app/src/app/nx-welcome.component.ts new file mode 100644 index 0000000000..9492a96637 --- /dev/null +++ b/apps/model-ad/app/src/app/nx-welcome.component.ts @@ -0,0 +1,907 @@ +import { Component, ViewEncapsulation } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +@Component({ + selector: 'app-nx-welcome', + standalone: true, + imports: [CommonModule], + template: ` + + +
+
+ +
+

+ Hello there, + Welcome model-ad-app 👋 +

+
+ +
+
+

+ + + + You're up and running +

+ What's next? +
+
+ + + +
+
+ +
+ + +
+ +
+

Next steps

+

Here are some things you can do with Nx:

+
+ + + + + Add UI library + + 
# Generate UI lib
+nx g @nx/angular:lib ui
+# Add a component
+nx g @nx/angular:component ui/src/lib/button
+
+
+ + + + + View project details + + 
nx show project model-ad-app --web
+
+
+ + + + + View interactive project graph + + 
nx graph
+
+
+ + + + + Run affected commands + + 
# see what's been affected by changes
+nx affected:graph
+# run tests for current changes
+nx affected:test
+# run e2e tests for current changes
+nx affected:e2e
+
+
+

+ Carefully crafted with + + + +

+
+
+ `, + styles: [], + encapsulation: ViewEncapsulation.None, +}) +export class NxWelcomeComponent {} diff --git a/apps/model-ad/app/src/assets/.gitkeep b/apps/model-ad/app/src/assets/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/model-ad/app/src/favicon.ico b/apps/model-ad/app/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..317ebcb2336e0833a22dddf0ab287849f26fda57 GIT binary patch literal 15086 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 + + + + model-ad-app + + + + + + + + diff --git a/apps/model-ad/app/src/main.server.ts b/apps/model-ad/app/src/main.server.ts new file mode 100644 index 0000000000..4b9d4d1545 --- /dev/null +++ b/apps/model-ad/app/src/main.server.ts @@ -0,0 +1,7 @@ +import { bootstrapApplication } from '@angular/platform-browser'; +import { AppComponent } from './app/app.component'; +import { config } from './app/app.config.server'; + +const bootstrap = () => bootstrapApplication(AppComponent, config); + +export default bootstrap; diff --git a/apps/model-ad/app/src/main.ts b/apps/model-ad/app/src/main.ts new file mode 100644 index 0000000000..514c89a08e --- /dev/null +++ b/apps/model-ad/app/src/main.ts @@ -0,0 +1,7 @@ +import { bootstrapApplication } from '@angular/platform-browser'; +import { appConfig } from './app/app.config'; +import { AppComponent } from './app/app.component'; + +bootstrapApplication(AppComponent, appConfig).catch((err) => + console.error(err) +); diff --git a/apps/model-ad/app/src/styles.scss b/apps/model-ad/app/src/styles.scss new file mode 100644 index 0000000000..90d4ee0072 --- /dev/null +++ b/apps/model-ad/app/src/styles.scss @@ -0,0 +1 @@ +/* You can add global styles to this file, and also import other style files */ diff --git a/apps/model-ad/app/src/test-setup.ts b/apps/model-ad/app/src/test-setup.ts new file mode 100644 index 0000000000..ac689041bb --- /dev/null +++ b/apps/model-ad/app/src/test-setup.ts @@ -0,0 +1,8 @@ +// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment +import 'jest-preset-angular/setup-jest'; +globalThis.ngJest = { + testEnvironmentOptions: { + errorOnUnknownElements: true, + errorOnUnknownProperties: true, + }, +}; diff --git a/apps/model-ad/app/tsconfig.app.json b/apps/model-ad/app/tsconfig.app.json new file mode 100644 index 0000000000..2afe01ea4a --- /dev/null +++ b/apps/model-ad/app/tsconfig.app.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "types": ["node"] + }, + "files": ["src/main.ts", "src/main.server.ts", "server.ts"], + "include": ["src/**/*.d.ts"], + "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"] +} diff --git a/apps/model-ad/app/tsconfig.editor.json b/apps/model-ad/app/tsconfig.editor.json new file mode 100644 index 0000000000..a8ac182c08 --- /dev/null +++ b/apps/model-ad/app/tsconfig.editor.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"], + "compilerOptions": {}, + "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"] +} diff --git a/apps/model-ad/app/tsconfig.json b/apps/model-ad/app/tsconfig.json new file mode 100644 index 0000000000..4383e7eb81 --- /dev/null +++ b/apps/model-ad/app/tsconfig.json @@ -0,0 +1,33 @@ +{ + "compilerOptions": { + "target": "es2022", + "useDefineForClassFields": false, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.editor.json" + }, + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.spec.json" + } + ], + "extends": "../../../tsconfig.base.json", + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + } +} diff --git a/apps/model-ad/app/tsconfig.spec.json b/apps/model-ad/app/tsconfig.spec.json new file mode 100644 index 0000000000..e637bf83b5 --- /dev/null +++ b/apps/model-ad/app/tsconfig.spec.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "target": "es2016", + "types": ["jest", "node"] + }, + "files": ["src/test-setup.ts"], + "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"] +} diff --git a/nx.json b/nx.json index 3a6b1cdd03..ee714d083a 100644 --- a/nx.json +++ b/nx.json @@ -10,10 +10,10 @@ }, "generators": { "@nx/angular:application": { - "style": "scss", + "e2eTestRunner": "cypress", "linter": "eslint", - "unitTestRunner": "jest", - "e2eTestRunner": "cypress" + "style": "scss", + "unitTestRunner": "jest" }, "@nx/angular:library": { "linter": "eslint", @@ -70,6 +70,11 @@ "{workspaceRoot}/.eslintrc.json", "{workspaceRoot}/tools/eslint-rules/**/*" ] + }, + "@angular-devkit/build-angular:application": { + "cache": true, + "dependsOn": ["^build"], + "inputs": ["production", "^production"] } }, "namedInputs": { diff --git a/package.json b/package.json index f57d3f002e..717d59de42 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "commander": "9.4.1", "constructs": "10.2.13", "core-js": "3.25.5", + "express": "~4.18.2", "keycloak-angular": "12.1.0", "keycloak-js": "19.0.3", "lodash": "4.17.21", @@ -87,6 +88,7 @@ "@swc-node/register": "~1.8.0", "@swc/cli": "0.1.62", "@swc/core": "~1.3.85", + "@types/express": "4.17.14", "@types/jest": "29.4.4", "@types/lodash": "4.14.191", "@types/node": "^18.16.9", diff --git a/yarn.lock b/yarn.lock index 9f92902531..cf5cb56d2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8715,6 +8715,18 @@ __metadata: languageName: node linkType: hard +"@types/express-serve-static-core@npm:^4.17.18": + version: 4.19.0 + resolution: "@types/express-serve-static-core@npm:4.19.0" + dependencies: + "@types/node": "*" + "@types/qs": "*" + "@types/range-parser": "*" + "@types/send": "*" + checksum: 39c09fcb3f61de96ed56d97273874cafe50e6675ac254af4d77014e569e4fdc29d1d0d1dd12e11f008cb9a52785b07c2801c6ba91397965392b20c75ee01fb4e + languageName: node + linkType: hard + "@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.9": version: 4.17.17 resolution: "@types/express@npm:4.17.17" @@ -8727,6 +8739,18 @@ __metadata: languageName: node linkType: hard +"@types/express@npm:4.17.14": + version: 4.17.14 + resolution: "@types/express@npm:4.17.14" + dependencies: + "@types/body-parser": "*" + "@types/express-serve-static-core": ^4.17.18 + "@types/qs": "*" + "@types/serve-static": "*" + checksum: 15c1af46d02de834e4a225eccaa9d85c0370fdbb3ed4e1bc2d323d24872309961542b993ae236335aeb3e278630224a6ea002078d39e651d78a3b0356b1eaa79 + languageName: node + linkType: hard + "@types/geojson@npm:^7946.0.10": version: 7946.0.10 resolution: "@types/geojson@npm:7946.0.10" @@ -10911,6 +10935,26 @@ __metadata: languageName: node linkType: hard +"body-parser@npm:1.20.2": + version: 1.20.2 + resolution: "body-parser@npm:1.20.2" + dependencies: + bytes: 3.1.2 + content-type: ~1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.2 + type-is: ~1.6.18 + unpipe: 1.0.0 + checksum: 14d37ec638ab5c93f6099ecaed7f28f890d222c650c69306872e00b9efa081ff6c596cd9afb9930656aae4d6c4e1c17537bea12bb73c87a217cb3cfea8896737 + languageName: node + linkType: hard + "bonjour-service@npm:^1.0.11": version: 1.1.1 resolution: "bonjour-service@npm:1.1.1" @@ -12243,7 +12287,7 @@ __metadata: languageName: node linkType: hard -"content-type@npm:^1.0.5, content-type@npm:~1.0.4": +"content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766 @@ -15198,6 +15242,45 @@ __metadata: languageName: node linkType: hard +"express@npm:~4.18.2": + version: 4.18.3 + resolution: "express@npm:4.18.3" + dependencies: + accepts: ~1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.2 + content-disposition: 0.5.4 + content-type: ~1.0.4 + cookie: 0.5.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + etag: ~1.8.1 + finalhandler: 1.2.0 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.1 + methods: ~1.1.2 + on-finished: 2.4.1 + parseurl: ~1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: ~2.0.7 + qs: 6.11.0 + range-parser: ~1.2.1 + safe-buffer: 5.2.1 + send: 0.18.0 + serve-static: 1.15.0 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: ~1.6.18 + utils-merge: 1.0.1 + vary: ~1.1.2 + checksum: 3d7fc8762a81dee0adf0b604f11627db2af082c5f2234e78a4aa8134f22c51f96c6282063f2f8b87f5dbc70679a3087caccb93b6107e324c6feb3a70960a5864 + languageName: node + linkType: hard + "ext-list@npm:^2.0.0": version: 2.2.2 resolution: "ext-list@npm:2.2.2" @@ -24126,7 +24209,7 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:^2.3.2": +"raw-body@npm:2.5.2, raw-body@npm:^2.3.2": version: 2.5.2 resolution: "raw-body@npm:2.5.2" dependencies: @@ -25014,6 +25097,7 @@ __metadata: "@swc/core": ~1.3.85 "@swc/helpers": ~0.5.2 "@types/commander": ^2.12.2 + "@types/express": 4.17.14 "@types/jest": 29.4.4 "@types/lodash": 4.14.191 "@types/node": ^18.16.9 @@ -25047,6 +25131,7 @@ __metadata: eslint-plugin-playwright: ^0.15.3 eslint-plugin-prettier: 4.2.1 eslint-plugin-promise: 6.1.1 + express: ~4.18.2 glob: 8.0.3 google-java-format: 1.1.0 hint: 7.1.3