@platformatic/vite 2.2.1 → 2.3.0

package/index.js

@@ -125,29 +125,14 @@ export class ViteStackable extends BaseStackable {
   }
 
   getMeta () {
-    let composer = { prefix: this.servicePrefix, wantsAbsoluteUrls: true, needsRootRedirect: true }
-
-    if (this.isProduction) {
-      composer = {
-        tcp: typeof this.url !== 'undefined',
-        url: this.url,
-        prefix: (this.subprocessConfig?.base ?? this.#basePath).replace(/(^\/)|(\/$)/g, ''),
-        wantsAbsoluteUrls: true,
-        needsRootRedirect: true
-      }
-    } else if (this.url) {
-      if (!this.#basePath) {
-        const config = this.subprocessConfig ?? this.#app.config
-        this.#basePath = config.base.replace(/(^\/)|(\/$)/g, '')
-      }
-
-      composer = {
-        tcp: true,
-        url: this.url,
-        prefix: this.#basePath.replace(/(^\/)|(\/$)/g, ''),
-        wantsAbsoluteUrls: true,
-        needsRootRedirect: true
-      }
+    const config = this.subprocessConfig ?? this.#app?.config
+
+    const composer = {
+      tcp: typeof this.url !== 'undefined',
+      url: this.url,
+      prefix: this.basePath ?? config?.base ?? this.#basePath,
+      wantsAbsoluteUrls: true,
+      needsRootRedirect: true
     }
 
     return { composer }
@@ -165,6 +150,14 @@ export class ViteStackable extends BaseStackable {
       ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
       : undefined
 
+    this.registerGlobals({
+      id: this.id,
+      // Always use URL to avoid serialization problem in Windows
+      root: pathToFileURL(this.root).toString(),
+      basePath: this.#basePath,
+      logLevel: this.logger.level
+    })
+
     if (command) {
       return this.startWithCommand(command)
     }
@@ -218,6 +211,13 @@ export class ViteStackable extends BaseStackable {
       ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
       : undefined
 
+    this.registerGlobals({
+      id: this.id,
+      // Always use URL to avoid serialization problem in Windows
+      root: pathToFileURL(this.root).toString(),
+      basePath: this.#basePath,
+      logLevel: this.logger.level
+    })
     if (command) {
       return this.startWithCommand(command)
     }
@@ -300,9 +300,19 @@ export class ViteSSRStackable extends NodeStackable {
 
     if (this.isProduction) {
       const clientDirectory = config.vite.ssr.clientDirectory
-      this.verifyOutputDirectory(
-        resolve(this.root, clientDirectory, config.application.outputDirectory, clientDirectory)
-      )
+      const clientOutDir = resolve(this.root, clientDirectory, config.application.outputDirectory, clientDirectory)
+
+      this.verifyOutputDirectory(clientOutDir)
+
+      const buildInfoPath = resolve(clientOutDir, '.platformatic-build.json')
+      if (!this.#basePath && existsSync(buildInfoPath)) {
+        try {
+          const buildInfo = JSON.parse(await readFile(buildInfoPath, 'utf-8'))
+          this.#basePath = buildInfo.basePath
+        } catch (e) {
+          console.log(e)
+        }
+      }
     }
 
     await super.start({ listen })
@@ -370,20 +380,16 @@ export class ViteSSRStackable extends NodeStackable {
   getMeta () {
     let composer = { prefix: this.servicePrefix, wantsAbsoluteUrls: true, needsRootRedirect: true }
 
-    if (this.url) {
-      if (!this.#basePath) {
-        const application = this._getApplication()
-        const config = application.vite.devServer?.config ?? application.vite.config.vite
-        this.#basePath = (config.base ?? '').replace(/(^\/)|(\/$)/g, '')
-      }
+    const vite = this._getApplication()?.vite
+    const config = vite?.devServer?.config ?? vite?.config.vite
+    const applicationBasePath = config?.base
 
-      composer = {
-        tcp: true,
-        url: this.url,
-        prefix: this.#basePath ?? this.servicePrefix,
-        wantsAbsoluteUrls: true,
-        needsRootRedirect: true
-      }
+    composer = {
+      tcp: typeof this.url !== 'undefined',
+      url: this.url,
+      prefix: this.basePath ?? applicationBasePath ?? this.#basePath,
+      wantsAbsoluteUrls: true,
+      needsRootRedirect: true
     }
 
     return { composer }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/vite",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Platformatic Vite Stackable",
   "main": "index.js",
   "type": "module",
@@ -18,10 +18,10 @@
     "@fastify/static": "^8.0.0",
     "fastify": "^5.0.0",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.2.1",
-    "@platformatic/config": "2.2.1",
-    "@platformatic/node": "2.2.1",
-    "@platformatic/utils": "2.2.1"
+    "@platformatic/basic": "2.3.0",
+    "@platformatic/config": "2.3.0",
+    "@platformatic/node": "2.3.0",
+    "@platformatic/utils": "2.3.0"
   },
   "devDependencies": {
     "@fastify/vite": "^7.0.1",
@@ -34,8 +34,8 @@
     "typescript": "^5.5.4",
     "vite": "^5.4.0",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.2.1",
-    "@platformatic/service": "2.2.1"
+    "@platformatic/service": "2.3.0",
+    "@platformatic/composer": "2.3.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --no-timeout",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/vite/2.2.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/vite/2.3.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Vite Stackable",
   "type": "object",