@rimelight/config 0.0.9 → 0.0.11

package/astro.d.ts

@@ -3,4 +3,3 @@
 declare module "*.astro" {
   export default {} as import("astro/runtime/server").AstroComponentFactory
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimelight/config",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "private": false,
   "description": "Rimelight Entertainment's shared configuration package",
   "homepage": "https://rimelight.com/docs",
@@ -47,12 +47,6 @@
   },
   "devDependencies": {
     "@astrojs/cloudflare": "14.3.1",
-    "@rimelight/auth": "0.0.6",
-    "@rimelight/cms": "0.0.9",
-    "@rimelight/i18n": "0.0.12",
-    "@rimelight/security": "0.0.12",
-    "@rimelight/seo": "0.0.7",
-    "@rimelight/ui": "0.0.51",
     "astro": "7.3.2",
     "drizzle-kit": "0.31.10",
     "typescript": "6.0.3",
@@ -61,11 +55,11 @@
   "peerDependencies": {
     "@astrojs/cloudflare": ">=14.0.0",
     "@astrojs/solid-js": ">=7.0.0",
-    "@rimelight/cms": ">=0.0.1",
-    "@rimelight/i18n": ">=0.0.1",
-    "@rimelight/security": ">=0.0.1",
-    "@rimelight/seo": ">=0.0.1",
-    "@rimelight/ui": ">=0.0.1",
+    "@rimelight/cms": "0.0.11",
+    "@rimelight/i18n": "0.0.13",
+    "@rimelight/security": "0.0.15",
+    "@rimelight/seo": "0.0.8",
+    "@rimelight/ui": "0.0.52",
     "astro": ">=7.0.0",
     "drizzle-kit": ">=0.30.0"
   },

package/tsconfig/astro.json

@@ -6,9 +6,7 @@
         "name": "@astrojs/ts-plugin"
       }
     ],
-    "types": [
-      "@rimelight/config/astro-env"
-    ]
+    "types": ["@rimelight/config/astro-env"]
   },
   "display": "Rimelight Astro",
   "extends": "./base.json"

package/vite-plus/base.js

@@ -59,6 +59,13 @@ export function rimelightConfig() {
     },
     test: {
       environment: "node"
+    },
+    run: {
+      tasks: {
+        test: {
+          command: "vp test"
+        }
+      }
     }
   }
 }
@@ -116,6 +123,34 @@ export function verifyPackageExports(pkgJsonPath = "package.json", srcDir = "src
   }
 }
 
+export function findVirtualExternals(baseDir = "src") {
+  if (!fs.existsSync(baseDir)) {
+    return []
+  }
+
+  const externals = new Set()
+
+  function walk(currentDir) {
+    const files = fs.readdirSync(currentDir, { withFileTypes: true })
+    for (const file of files) {
+      const fullPath = path.join(currentDir, file.name)
+      if (file.isDirectory()) {
+        walk(fullPath)
+      } else if (file.isFile() && /\.(ts|tsx|js|jsx|astro|vue)$/.test(file.name)) {
+        const content = fs.readFileSync(fullPath, "utf8")
+        const regex = /["']((?:virtual|cloudflare):[^"']+)["']/g
+        let match
+        while ((match = regex.exec(content)) !== null) {
+          externals.add(match[1])
+        }
+      }
+    }
+  }
+
+  walk(baseDir)
+  return Array.from(externals)
+}
+
 export function rimelightPackConfig(options = {}) {
   const { entry, autoEntry, pack = {}, autoExternal = true, ...rest } = options
 
@@ -134,22 +169,35 @@ export function rimelightPackConfig(options = {}) {
   }
 
   const discoveredExternals = autoExternal ? findPackageExternals() : []
+  const discoveredVirtualExternals = autoExternal ? findVirtualExternals() : []
   const userExternal = pack["external"] || []
   const userExternalList = Array.isArray(userExternal) ? userExternal : [userExternal]
-  const userNeverBundle = pack["deps"]?.["neverBundle"] || []
+  const userDeps = pack["deps"] || {}
+  const userNeverBundle = userDeps["neverBundle"] || []
   const userNeverBundleList = Array.isArray(userNeverBundle) ? userNeverBundle : [userNeverBundle]
   const mergedExternal = Array.from(
-    new Set([...userExternalList, ...userNeverBundleList, ...discoveredExternals])
+    new Set([
+      ...userExternalList,
+      ...userNeverBundleList,
+      ...discoveredExternals,
+      ...discoveredVirtualExternals
+    ])
   ).filter(Boolean)
 
+  const hasUserDeps = pack["deps"] !== undefined
+  const hasExternals = mergedExternal.length > 0
+
   return {
     ...rimelightConfig(),
     ...rest,
     pack: {
       entry: resolvedEntry,
       dts: true,
-      ...(mergedExternal.length > 0 ? { deps: { neverBundle: mergedExternal } } : {}),
-      ...pack
+      checks: { pluginTimings: false },
+      ...pack,
+      ...(hasUserDeps || hasExternals
+        ? { deps: { ...userDeps, ...(hasExternals ? { neverBundle: mergedExternal } : {}) } }
+        : {})
     }
   }
 }

package/vite-plus/base.ts

@@ -60,6 +60,13 @@ export function rimelightConfig(): UserConfig {
     },
     test: {
       environment: "node"
+    },
+    run: {
+      tasks: {
+        test: {
+          command: "vp test"
+        }
+      }
     }
   }
 }
@@ -126,6 +133,34 @@ export function verifyPackageExports(
   }
 }
 
+export function findVirtualExternals(baseDir = "src"): string[] {
+  if (!fs.existsSync(baseDir)) {
+    return []
+  }
+
+  const externals = new Set<string>()
+
+  function walk(currentDir: string) {
+    const files = fs.readdirSync(currentDir, { withFileTypes: true })
+    for (const file of files) {
+      const fullPath = path.join(currentDir, file.name)
+      if (file.isDirectory()) {
+        walk(fullPath)
+      } else if (file.isFile() && /\.(ts|tsx|js|jsx|astro|vue)$/.test(file.name)) {
+        const content = fs.readFileSync(fullPath, "utf8")
+        const regex = /["']((?:virtual|cloudflare):[^"']+)["']/g
+        let match: RegExpExecArray | null
+        while ((match = regex.exec(content)) !== null) {
+          externals.add(match[1]!)
+        }
+      }
+    }
+  }
+
+  walk(baseDir)
+  return Array.from(externals)
+}
+
 export interface RimelightPackOptions {
   entry?: string[] | "auto"
   autoEntry?: boolean | string
@@ -152,22 +187,35 @@ export function rimelightPackConfig(options: RimelightPackOptions = {}): any {
   }
 
   const discoveredExternals = autoExternal ? findPackageExternals() : []
+  const discoveredVirtualExternals = autoExternal ? findVirtualExternals() : []
   const userExternal = pack["external"] || []
   const userExternalList = Array.isArray(userExternal) ? userExternal : [userExternal]
-  const userNeverBundle = (pack["deps"] as Record<string, any> | undefined)?.["neverBundle"] || []
+  const userDeps = (pack["deps"] as Record<string, any> | undefined) || {}
+  const userNeverBundle = userDeps["neverBundle"] || []
   const userNeverBundleList = Array.isArray(userNeverBundle) ? userNeverBundle : [userNeverBundle]
   const mergedExternal = Array.from(
-    new Set([...userExternalList, ...userNeverBundleList, ...discoveredExternals])
+    new Set([
+      ...userExternalList,
+      ...userNeverBundleList,
+      ...discoveredExternals,
+      ...discoveredVirtualExternals
+    ])
   ).filter(Boolean)
 
+  const hasUserDeps = pack["deps"] !== undefined
+  const hasExternals = mergedExternal.length > 0
+
   return {
     ...rimelightConfig(),
     ...rest,
     pack: {
       entry: resolvedEntry,
       dts: true,
-      ...(mergedExternal.length > 0 ? { deps: { neverBundle: mergedExternal } } : {}),
-      ...pack
+      checks: { pluginTimings: false },
+      ...pack,
+      ...(hasUserDeps || hasExternals
+        ? { deps: { ...userDeps, ...(hasExternals ? { neverBundle: mergedExternal } : {}) } }
+        : {})
     }
   }
 }