@platformatic/basic 2.0.0-alpha.10 → 2.0.0-alpha.12

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.
package/lib/base.js CHANGED
@@ -1,3 +1,4 @@
1
+ import deepmerge from '@fastify/deepmerge'
1
2
  import { parseCommandString } from 'execa'
2
3
  import { spawn } from 'node:child_process'
3
4
  import { once } from 'node:events'
@@ -22,7 +23,7 @@ export class BaseStackable {
22
23
  this.options = options
23
24
  this.root = root
24
25
  this.configManager = configManager
25
- this.serverConfig = options.context.serverConfig
26
+ this.serverConfig = deepmerge(options.context.serverConfig, configManager.current.server)
26
27
  this.openapiSchema = null
27
28
  this.getGraphqlSchema = null
28
29
  this.isEntrypoint = options.context.isEntrypoint
@@ -30,7 +31,7 @@ export class BaseStackable {
30
31
 
31
32
  // Setup the logger
32
33
  const pinoOptions = {
33
- level: (this.configManager.current.server ?? this.serverConfig)?.logger?.level ?? 'trace'
34
+ level: this.serverConfig?.logger?.level ?? 'trace'
34
35
  }
35
36
 
36
37
  if (this.id) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platformatic/basic",
3
- "version": "2.0.0-alpha.10",
3
+ "version": "2.0.0-alpha.12",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "type": "module",
@@ -16,6 +16,7 @@
16
16
  "homepage": "https://github.com/platformatic/platformatic#readme",
17
17
  "dependencies": {
18
18
  "@fastify/error": "^4.0.0",
19
+ "@fastify/deepmerge": "^2.0.0",
19
20
  "execa": "^9.3.1",
20
21
  "pino": "^9.3.2",
21
22
  "pino-abstract-transport": "^2.0.0",
@@ -23,9 +24,9 @@
23
24
  "split2": "^4.2.0",
24
25
  "undici": "^6.19.5",
25
26
  "ws": "^8.18.0",
26
- "@platformatic/config": "2.0.0-alpha.10",
27
- "@platformatic/itc": "2.0.0-alpha.10",
28
- "@platformatic/utils": "2.0.0-alpha.10"
27
+ "@platformatic/config": "2.0.0-alpha.12",
28
+ "@platformatic/utils": "2.0.0-alpha.12",
29
+ "@platformatic/itc": "2.0.0-alpha.12"
29
30
  },
30
31
  "devDependencies": {
31
32
  "borp": "^0.17.0",
@@ -39,8 +40,8 @@
39
40
  "react-dom": "^18.3.1",
40
41
  "typescript": "^5.5.4",
41
42
  "vite": "^5.4.0",
42
- "@platformatic/service": "2.0.0-alpha.10",
43
- "@platformatic/composer": "2.0.0-alpha.10"
43
+ "@platformatic/service": "2.0.0-alpha.12",
44
+ "@platformatic/composer": "2.0.0-alpha.12"
44
45
  },
45
46
  "scripts": {
46
47
  "gen-schema": "node lib/schema.js > schema.json",
package/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.10.json",
2
+ "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.12.json",
3
3
  "$schema": "http://json-schema.org/draft-07/schema#",
4
4
  "title": "Platformatic Stackable",
5
5
  "type": "object",