chore(ditsmod): upgrade Ditsmod, removed bun.lockb and bun-providers.ts.

TechEmpower · Aug 16, 2024 · 4a462a9 · 4a462a9
1 parent b669efd
commit 4a462a9
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 36 deletions.
diff --git a/frameworks/TypeScript/ditsmod/.gitignore b/frameworks/TypeScript/ditsmod/.gitignore
@@ -5,3 +5,4 @@ dist*
 .pnp*
 nodemon.json
 package-lock.json
+bun.lockb
diff --git a/frameworks/TypeScript/ditsmod/benchmark_config.json b/frameworks/TypeScript/ditsmod/benchmark_config.json
@@ -139,7 +139,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "None",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "None",
@@ -159,7 +159,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "None",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "None",
@@ -182,7 +182,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "Raw",
@@ -205,7 +205,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "Raw",
@@ -228,7 +228,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "Raw",
@@ -251,7 +251,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "Ditsmod",
+        "framework": "ditsmod-bun",
         "language": "TypeScript",
         "flavor": "None",
         "orm": "Raw",

diff --git a/frameworks/TypeScript/ditsmod/bun.lockb b/frameworks/TypeScript/ditsmod/bun.lockb
diff --git a/frameworks/TypeScript/ditsmod/ditsmod-bun-mysql.dockerfile b/frameworks/TypeScript/ditsmod/ditsmod-bun-mysql.dockerfile
@@ -6,7 +6,6 @@ RUN bun install
 RUN bun run build
 
 ENV NODE_ENV production
-ENV IS_BUN true
 ENV DATABASE mysql
 ENV MYSQL_HOST tfb-database
 ENV MYSQL_USER benchmarkdbuser

diff --git a/frameworks/TypeScript/ditsmod/ditsmod-bun-postgres.dockerfile b/frameworks/TypeScript/ditsmod/ditsmod-bun-postgres.dockerfile
@@ -6,7 +6,6 @@ RUN bun install
 RUN bun run build
 
 ENV NODE_ENV production
-ENV IS_BUN true
 ENV DATABASE postgres
 ENV PG_HOST tfb-database
 ENV PG_USER benchmarkdbuser

diff --git a/frameworks/TypeScript/ditsmod/ditsmod-bun.dockerfile b/frameworks/TypeScript/ditsmod/ditsmod-bun.dockerfile
@@ -6,7 +6,6 @@ RUN bun install
 RUN bun run build
 
 ENV NODE_ENV production
-ENV IS_BUN true
 
 EXPOSE 8080
 CMD rm node_modules/@ditsmod/*/tsconfig.json && bun src/app/bun-integration/spawn.ts
diff --git a/frameworks/TypeScript/ditsmod/package.json b/frameworks/TypeScript/ditsmod/package.json
@@ -19,7 +19,7 @@
   "author": "Костя Третяк",
   "license": "MIT",
   "dependencies": {
-    "@ditsmod/core": "~2.54.2",
+    "@ditsmod/core": "~2.55.0",
     "@ditsmod/routing": "~2.3.0",
     "handlebars": "^4.7.8",
     "lru-cache": "^11.0.0",

diff --git a/frameworks/TypeScript/ditsmod/src/app/app.module.ts b/frameworks/TypeScript/ditsmod/src/app/app.module.ts
@@ -1,13 +1,13 @@
-import { PreRouter, rootModule } from '@ditsmod/core';
+import { PreRouter, Providers, rootModule } from '@ditsmod/core';
 
 import { SimpleModule } from '#routed/simple/simple.module.js';
 import { BunPreRouter } from './bun-integration/pre-router.js';
-import { BunProviders } from './bun-integration/bun-providers.js';
 
 @rootModule({
   appends: [SimpleModule],
-  providersPerApp: [
-    ...new BunProviders().useLogConfig({ level: 'off' }).if(process.env.IS_BUN).useClass(PreRouter, BunPreRouter),
-  ],
+  providersPerApp: new Providers()
+    .useLogConfig({ level: 'off' })
+    .$if(global['Bun'])
+    .useClass(PreRouter, BunPreRouter),
 })
 export class AppModule {}
diff --git a/frameworks/TypeScript/ditsmod/src/app/bun-integration/bun-providers.ts b/frameworks/TypeScript/ditsmod/src/app/bun-integration/bun-providers.ts