@builder6/server 3.0.12 → 3.1.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,5 +2,5 @@ import { DynamicModule } from '@nestjs/common';
2
2
  export declare class AppModule {
3
3
  private readonly logger;
4
4
  onModuleInit(): void;
5
- static forRoot(appConfig: any): DynamicModule;
5
+ static forRoot(moleculerConfig: any): DynamicModule;
6
6
  }
@@ -21,9 +21,6 @@ const steedos_1 = require("@builder6/steedos");
21
21
  const rooms_1 = require("@builder6/rooms");
22
22
  const files_1 = require("@builder6/files");
23
23
  const moleculer_1 = require("@builder6/moleculer");
24
- const sharepoint_1 = require("@builder6/sharepoint");
25
- const oidc_1 = require("@builder6/oidc");
26
- const app_controller_1 = require("./app.controller");
27
24
  const core_3 = require("@builder6/core");
28
25
  const email_1 = require("@builder6/email");
29
26
  const pages_1 = require("@builder6/pages");
@@ -35,29 +32,25 @@ const onlyoffice_1 = require("@builder6/onlyoffice");
35
32
  const docs_1 = require("@builder6/docs");
36
33
  const core_5 = require("@builder6/core");
37
34
  const microservices_1 = require("@builder6/microservices");
35
+ const sharepoint_1 = require("@builder6/sharepoint");
36
+ const oidc_1 = require("@builder6/oidc");
37
+ const oidc_provider_1 = require("@builder6/oidc-provider");
38
38
  const startModules = [];
39
- if (process.env.B6_ONLYOFFICE_ENABLED === 'true') {
40
- startModules.push(onlyoffice_1.OnlyOfficeModule);
41
- startModules.push(docs_1.DocsModule);
42
- }
43
- if (process.env.B6_OIDC_PROVIDER_ENABLED === 'true') {
44
- const oidcProvider = require('@builder6/oidc-provider');
45
- startModules.push(oidcProvider.OidcProviderModule);
39
+ if (process.env.STEEDOS_LICENSE) {
40
+ startModules.push([
41
+ onlyoffice_1.OnlyOfficeModule,
42
+ docs_1.DocsModule,
43
+ oidc_1.OidcModule,
44
+ oidc_provider_1.OidcProviderModule,
45
+ sharepoint_1.SharepointModule,
46
+ ]);
46
47
  }
47
- const getMoleculerConfig = (appConfig) => {
48
- var _a;
49
- const config = Object.assign(Object.assign({ namespace: 'steedos', transporter: process.env.B6_TRANSPORTER }, (0, core_4.getMoleculerConfigs)()), (0, core_4.getEnvConfigs)());
50
- if ((_a = appConfig === null || appConfig === void 0 ? void 0 : appConfig.modulesConfig) === null || _a === void 0 ? void 0 : _a.moleculer) {
51
- return appConfig.modulesConfig.moleculer(config);
52
- }
53
- return config;
54
- };
55
48
  let AppModule = AppModule_1 = class AppModule {
56
49
  constructor() {
57
50
  this.logger = new common_1.Logger(AppModule_1.name);
58
51
  }
59
52
  onModuleInit() { }
60
- static forRoot(appConfig) {
53
+ static forRoot(moleculerConfig) {
61
54
  return {
62
55
  module: AppModule_1,
63
56
  imports: [
@@ -66,7 +59,7 @@ let AppModule = AppModule_1 = class AppModule {
66
59
  isGlobal: true,
67
60
  }),
68
61
  nestjs_pino_1.LoggerModule.forRoot(core_5.pinoConfig),
69
- moleculer_1.MoleculerModule.forRoot(getMoleculerConfig(appConfig)),
62
+ moleculer_1.MoleculerModule.forRoot((0, core_4.getMoleculerConfigs)(moleculerConfig)),
70
63
  core_2.AuthModule,
71
64
  core_1.MongodbModule,
72
65
  schedule_1.ScheduleModule.forRoot(),
@@ -77,14 +70,13 @@ let AppModule = AppModule_1 = class AppModule {
77
70
  tables_1.TablesModule,
78
71
  pages_1.PagesModule,
79
72
  rooms_1.RoomsModule,
80
- sharepoint_1.SharepointModule,
81
73
  oidc_1.OidcModule,
74
+ microservices_1.MicroserviceModule,
82
75
  ...startModules,
83
76
  core_3.PluginModule.forRootAsync(),
84
- microservices_1.MicroserviceModule,
85
77
  ],
86
- controllers: [app_controller_1.AppController, ...((appConfig === null || appConfig === void 0 ? void 0 : appConfig.controllers) || [])],
87
- providers: [...((appConfig === null || appConfig === void 0 ? void 0 : appConfig.providers) || [])],
78
+ controllers: [],
79
+ providers: [],
88
80
  };
89
81
  }
90
82
  };
@@ -1 +1 @@
1
- {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA+D;AAC/D,2CAA8C;AAC9C,6CAA2C;AAE3C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,+CAAkD;AAClD,2CAA8C;AAC9C,2CAA8C;AAC9C,mDAAsD;AACtD,yCAA8C;AAC9C,2CAA8C;AAC9C,2CAA8C;AAC9C,iDAAoD;AACpD,yCAIwB;AACxB,mEAAsC;AACtC,+CAAkD;AAClD,qDAAwD;AACxD,yCAA4C;AAE5C,yCAA4C;AAE5C,2DAA6D;AAC7D,qDAAwD;AACxD,yCAA4C;AAC5C,2DAA6D;AAE7D,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IAChC,YAAY,CAAC,IAAI,CAAC;QAChB,6BAAgB;QAChB,iBAAU;QACV,iBAAU;QACV,kCAAkB;QAClB,6BAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AAGM,IAAM,SAAS,iBAAf,MAAM,SAAS;IAAf;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,WAAS,CAAC,IAAI,CAAC,CAAC;IAiCvD,CAAC;IA/BC,YAAY,KAAI,CAAC;IAEjB,MAAM,CAAC,OAAO,CAAC,eAAoB;QACjC,OAAO;YACL,MAAM,EAAE,WAAS;YACjB,OAAO,EAAE;gBACP,qBAAY,CAAC,OAAO,CAAC;oBACnB,IAAI,EAAE,CAAC,iBAAU,CAAC;oBAClB,QAAQ,EAAE,IAAI;iBACf,CAAC;gBACF,0BAAY,CAAC,OAAO,CAAC,iBAAU,CAAC;gBAChC,2BAAe,CAAC,OAAO,CAAC,IAAA,0BAAmB,EAAC,eAAe,CAAC,CAAC;gBAC7D,iBAAU;gBACV,oBAAa;gBACb,yBAAc,CAAC,OAAO,EAAE;gBACxB,uBAAa;gBACb,mBAAW;gBACX,mBAAW;gBACX,yBAAc;gBACd,qBAAY;gBACZ,mBAAW;gBACX,mBAAW;gBACX,iBAAU;gBACV,kCAAkB;gBAClB,GAAG,YAAY;gBACf,mBAAY,CAAC,YAAY,EAAE;aAC5B;YACD,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,EAAE;SACd,CAAC;IACJ,CAAC;CACF,CAAA;AAlCY,8BAAS;oBAAT,SAAS;IADrB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,SAAS,CAkCrB;AAED,MAAM,OAAO,GAAG,IAAA,iBAAU,GAAE,CAAC;AAC7B,OAAO,CAAC,GAAG,CACT,uFAAuF,CACxF,CAAC;AACF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AACtC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CAAC,eAAe,sBAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AACxC,OAAO,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;AAClD,OAAO,CAAC,GAAG,CAAC,mBAAmB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CACT,uFAAuF,CACxF,CAAC;AACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { NestExpressApplication } from '@nestjs/platform-express';
2
+ export { AppModule } from './app.module';
3
+ export declare function getNestExpressApplication(): Promise<NestExpressApplication<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;
4
+ export declare function bootstrap(): Promise<void>;
@@ -12,6 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.AppModule = void 0;
16
+ exports.getNestExpressApplication = getNestExpressApplication;
15
17
  exports.bootstrap = bootstrap;
16
18
  const core_1 = require("@nestjs/core");
17
19
  const app_module_1 = require("./app.module");
@@ -26,25 +28,20 @@ const express_session_1 = __importDefault(require("express-session"));
26
28
  const connect_redis_1 = require("connect-redis");
27
29
  const ioredis_1 = __importDefault(require("ioredis"));
28
30
  const utils_1 = require("ioredis/built/utils");
29
- const http_proxy_middleware_1 = require("http-proxy-middleware");
30
31
  const package_json_1 = __importDefault(require("../package.json"));
31
32
  const core_2 = require("@builder6/core");
32
33
  const core_3 = require("@builder6/core");
33
- const app_config_1 = require("./app.config");
34
- function bootstrap(appConfig) {
34
+ var app_module_2 = require("./app.module");
35
+ Object.defineProperty(exports, "AppModule", { enumerable: true, get: function () { return app_module_2.AppModule; } });
36
+ function getNestExpressApplication() {
35
37
  return __awaiter(this, void 0, void 0, function* () {
36
- var _a, _b, _c;
37
- if (!appConfig) {
38
- appConfig = (0, app_config_1.getAppConfig)();
39
- }
40
- const app = yield core_1.NestFactory.create(app_module_1.AppModule.forRoot(appConfig), {
38
+ const app = yield core_1.NestFactory.create(app_module_1.AppModule.forRoot({}), {
41
39
  bufferLogs: true,
42
40
  });
43
41
  app.connectMicroservice({
44
42
  transport: microservices_1.Transport.REDIS,
45
43
  options: Object.assign({}, (0, utils_1.parseURL)(process.env.B6_CLUSTER_TRANSPORTER)),
46
44
  });
47
- global['app'] = app;
48
45
  app.useLogger(app.get(nestjs_pino_1.Logger));
49
46
  app.useGlobalFilters(new core_2.AllExceptionsFilter());
50
47
  app.useWebSocketAdapter(new core_3.HybridAdapter(app));
@@ -61,7 +58,7 @@ function bootstrap(appConfig) {
61
58
  });
62
59
  const redisStore = new connect_redis_1.RedisStore({
63
60
  client: redisClient,
64
- prefix: process.env.SESSION_PREFIX || 'steedos-session:',
61
+ prefix: process.env.B6_SESSION_PREFIX || 'steedos-session:',
65
62
  });
66
63
  app.use((0, express_session_1.default)({
67
64
  store: redisStore,
@@ -102,40 +99,16 @@ function bootstrap(appConfig) {
102
99
  app.use((0, express_1.json)({ limit: '50mb' }));
103
100
  app.use((0, express_1.urlencoded)({ extended: true, limit: '100mb', parameterLimit: 1000000 }));
104
101
  app.use((0, compression_1.default)());
105
- if (process.env.B6_PROXY_TARGET) {
106
- const server = app.getHttpAdapter().getInstance();
107
- server.use('/', (0, http_proxy_middleware_1.createProxyMiddleware)({
108
- pathFilter: (path) => {
109
- return (!path.match('^/login/') &&
110
- !path.match('^/docs/') &&
111
- !path.match('^/api/v6') &&
112
- !path.match('^/b6/') &&
113
- !path.match('^/v7') &&
114
- !path.match('^/v2/c/'));
115
- },
116
- target: process.env.B6_PROXY_TARGET,
117
- changeOrigin: true,
118
- toProxy: true,
119
- ws: true,
120
- on: {
121
- proxyReq: http_proxy_middleware_1.fixRequestBody,
122
- },
123
- followRedirects: true,
124
- ejectPlugins: true,
125
- logger: console,
126
- plugins: [
127
- http_proxy_middleware_1.debugProxyErrorsPlugin,
128
- http_proxy_middleware_1.loggerPlugin,
129
- http_proxy_middleware_1.errorResponsePlugin,
130
- http_proxy_middleware_1.proxyEventsPlugin,
131
- ],
132
- }));
133
- }
134
102
  yield app.startAllMicroservices();
135
103
  console.log('Microservice is listening');
136
- yield ((_a = appConfig.beforeServerStart) === null || _a === void 0 ? void 0 : _a.call(appConfig, { app }));
137
- yield app.listen((_b = process.env.B6_PORT) !== null && _b !== void 0 ? _b : 5100);
138
- yield ((_c = appConfig.afterServerStart) === null || _c === void 0 ? void 0 : _c.call(appConfig, { app }));
104
+ return app;
139
105
  });
140
106
  }
141
- //# sourceMappingURL=bootstrap.js.map
107
+ function bootstrap() {
108
+ return __awaiter(this, void 0, void 0, function* () {
109
+ var _a;
110
+ const app = yield getNestExpressApplication();
111
+ yield app.listen((_a = process.env.B6_PORT) !== null && _a !== void 0 ? _a : 5100);
112
+ });
113
+ }
114
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/main.js CHANGED
@@ -1,5 +1,21 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const bootstrap_1 = require("./bootstrap");
4
- (0, bootstrap_1.bootstrap)();
12
+ const _1 = require(".");
13
+ function bootstrap() {
14
+ return __awaiter(this, void 0, void 0, function* () {
15
+ var _a;
16
+ const app = yield (0, _1.getNestExpressApplication)();
17
+ yield app.listen((_a = process.env.B6_PORT) !== null && _a !== void 0 ? _a : 5100);
18
+ });
19
+ }
20
+ bootstrap();
5
21
  //# sourceMappingURL=main.js.map
package/dist/main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,2CAAwC;AAExC,IAAA,qBAAS,GAAE,CAAC"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wBAA8C;AAE9C,SAAe,SAAS;;;QACtB,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAyB,GAAE,CAAC;QAC9C,MAAM,GAAG,CAAC,MAAM,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,OAAO,mCAAI,IAAI,CAAC,CAAC;IAChD,CAAC;CAAA;AAED,SAAS,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder6/server",
3
- "version": "3.0.12",
3
+ "version": "3.1.0-alpha.0",
4
4
  "description": "The Builder6 is a comprehensive low-code platform designed to facilitate a wide range of functionalities and integrations.",
5
5
  "author": "",
6
6
  "license": "AGPL-3.0-only",
@@ -9,7 +9,7 @@
9
9
  "public",
10
10
  "views"
11
11
  ],
12
- "main": "dist/bootstrap.js",
12
+ "main": "dist/index.js",
13
13
  "scripts": {
14
14
  "build": "nest build",
15
15
  "build:webpack": "webpack --config webpack.config.js",
@@ -28,23 +28,23 @@
28
28
  "test:e2e": "jest --config ./test/jest-e2e.json"
29
29
  },
30
30
  "dependencies": {
31
- "@builder6/cli": "3.0.12",
32
- "@builder6/core": "3.0.12",
33
- "@builder6/docs": "3.0.12",
34
- "@builder6/email": "3.0.12",
35
- "@builder6/files": "3.0.12",
36
- "@builder6/microservices": "3.0.12",
37
- "@builder6/moleculer": "3.0.12",
38
- "@builder6/oidc": "3.0.12",
39
- "@builder6/oidc-provider": "3.0.12",
40
- "@builder6/onlyoffice": "3.0.12",
41
- "@builder6/pages": "3.0.12",
42
- "@builder6/query-mongodb": "3.0.12",
43
- "@builder6/rooms": "3.0.12",
44
- "@builder6/services": "3.0.12",
45
- "@builder6/sharepoint": "3.0.12",
46
- "@builder6/steedos": "3.0.12",
47
- "@builder6/tables": "3.0.12",
31
+ "@builder6/cli": "3.1.0-alpha.0",
32
+ "@builder6/core": "3.1.0-alpha.0",
33
+ "@builder6/docs": "3.1.0-alpha.0",
34
+ "@builder6/email": "3.1.0-alpha.0",
35
+ "@builder6/files": "3.1.0-alpha.0",
36
+ "@builder6/microservices": "3.1.0-alpha.0",
37
+ "@builder6/moleculer": "3.1.0-alpha.0",
38
+ "@builder6/oidc": "3.1.0-alpha.0",
39
+ "@builder6/oidc-provider": "3.1.0-alpha.0",
40
+ "@builder6/onlyoffice": "3.1.0-alpha.0",
41
+ "@builder6/pages": "3.1.0-alpha.0",
42
+ "@builder6/query-mongodb": "3.1.0-alpha.0",
43
+ "@builder6/rooms": "3.1.0-alpha.0",
44
+ "@builder6/services": "3.1.0-alpha.0",
45
+ "@builder6/sharepoint": "3.1.0-alpha.0",
46
+ "@builder6/steedos": "3.1.0-alpha.0",
47
+ "@builder6/tables": "3.1.0-alpha.0",
48
48
  "@nestjs/common": "^11.0.0",
49
49
  "@nestjs/config": "^4.0.1",
50
50
  "@nestjs/core": "^11.0.0",
@@ -137,5 +137,5 @@
137
137
  "publishConfig": {
138
138
  "access": "public"
139
139
  },
140
- "gitHead": "cf827542b51ac65ea45ee99d5d0ff5a201956dad"
140
+ "gitHead": "4aac6bcc2c9a43356dcc7d45541d15ebb2de1076"
141
141
  }
@@ -1,10 +0,0 @@
1
- export type AppConfig = {
2
- modules: {
3
- [key: string]: Function;
4
- };
5
- beforeServerStart?: Function;
6
- afterServerStart?: Function;
7
- controllers: any[];
8
- providers: any[];
9
- };
10
- export declare const getAppConfig: () => AppConfig;
@@ -1,53 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
- Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.getAppConfig = void 0;
37
- const path = __importStar(require("path"));
38
- const fs = __importStar(require("fs"));
39
- const loadAppConfig = () => {
40
- const configPath = path.join(process.cwd(), 'app.config.js');
41
- return fs.existsSync(configPath)
42
- ? require(configPath)
43
- : { modules: {}, beforeServerStart: null, afterServerStart: null };
44
- };
45
- const getAppConfig = () => {
46
- const globalKey = 'STEEDOS__APP_CONFIG__';
47
- if (!global[globalKey]) {
48
- global[globalKey] = loadAppConfig();
49
- }
50
- return global[globalKey];
51
- };
52
- exports.getAppConfig = getAppConfig;
53
- //# sourceMappingURL=app.config.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"app.config.js","sourceRoot":"","sources":["../src/app.config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2CAA6B;AAC7B,uCAAyB;AAazB,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;IAC7D,OAAO,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAC9B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACrB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;AACvE,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,GAAc,EAAE;IAC1C,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,GAAG,aAAa,EAAE,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB"}
@@ -1,2 +0,0 @@
1
- export declare class AppController {
2
- }
@@ -1,17 +0,0 @@
1
- "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.AppController = void 0;
10
- const common_1 = require("@nestjs/common");
11
- let AppController = class AppController {
12
- };
13
- exports.AppController = AppController;
14
- exports.AppController = AppController = __decorate([
15
- (0, common_1.Controller)('/')
16
- ], AppController);
17
- //# sourceMappingURL=app.controller.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAMwB;AAGjB,IAAM,aAAa,GAAnB,MAAM,aAAa;CACzB,CAAA;AADY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,EAAC,GAAG,CAAC;GACH,aAAa,CACzB"}
@@ -1 +0,0 @@
1
- export declare function bootstrap(appConfig?: any): Promise<void>;
@@ -1 +0,0 @@
1
- {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}