one 1.1.295 → 1.1.296

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.295",
+  "version": "1.1.296",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "sideEffects": false,
@@ -89,13 +89,13 @@
     "@react-navigation/native-stack": "~6.9.13",
     "@react-navigation/routers": "~6.1.9",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/tslib-lite": "1.1.295",
-    "@vxrn/universal-color-scheme": "1.1.295",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.295",
+    "@vxrn/tslib-lite": "1.1.296",
+    "@vxrn/universal-color-scheme": "1.1.296",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.296",
     "babel-dead-code-elimination": "^1.0.6",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.295",
+    "create-vxrn": "1.1.296",
     "dotenv": "^16.4.5",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
@@ -117,7 +117,7 @@
     "url-parse": "^1.5.10",
     "vite": "6.0.0-beta.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.295",
+    "vxrn": "1.1.296",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/cli/label-process.ts

@@ -0,0 +1,7 @@
+import { homedir } from 'node:os'
+
+export function labelProcess(title: string) {
+  const home = homedir()
+  const cwd = process.cwd()
+  process.title = `Onejs:${title} > ${cwd.replace(home, '~')}`
+}

package/src/cli/run.ts

@@ -1,4 +1,5 @@
 import { virtualEntryIdNative } from '../vite/virtualEntryPlugin'
+import { labelProcess } from './label-process'
 
 export async function run(args: {
   clean?: boolean
@@ -6,6 +7,7 @@ export async function run(args: {
   port?: string
   https?: boolean
 }) {
+  labelProcess('dev')
   const { dev } = await import('vxrn')
   const { start, stop } = await dev({
     clean: args.clean,

package/src/cli.ts

@@ -1,13 +1,31 @@
 import { defineCommand, runMain } from 'citty'
 import { loadEnv } from './vite/loadEnv'
-// import packageJson from 'one/package.json' with { type: 'json' }
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+function getPackageVersion() {
+  let dirname
+  if (typeof __dirname !== 'undefined') {
+    // CommonJS
+    dirname = __dirname
+  } else {
+    // ESM
+    dirname = path.dirname(fileURLToPath(import.meta.url))
+  }
+  const packagePath = path.join(dirname, '..', '..', 'package.json')
+  const packageJson = JSON.parse(readFileSync(packagePath, 'utf-8'))
+  return packageJson.version
+}
+
+const version = getPackageVersion()
 
 void loadEnv(process.cwd())
 
 const dev = defineCommand({
   meta: {
     name: 'dev',
-    // version: packageJson.version,
+    version: version,
     description: 'Start the dev server',
   },
   args: {
@@ -33,7 +51,7 @@ const dev = defineCommand({
 const buildCommand = defineCommand({
   meta: {
     name: 'build',
-    version: '0.0.0',
+    version: version,
     description: 'Build your app',
   },
   args: {
@@ -58,7 +76,7 @@ const buildCommand = defineCommand({
 const serveCommand = defineCommand({
   meta: {
     name: 'serve',
-    version: '0.0.0',
+    version: version,
     description: 'Serve a built app for production',
   },
   args: {
@@ -93,7 +111,7 @@ const serveCommand = defineCommand({
 const prebuild = defineCommand({
   meta: {
     name: 'prebuild',
-    version: '0.0.0',
+    version: version,
     description: 'Prebuild native iOS project', // TODO: Android
   },
   args: {},
@@ -121,8 +139,8 @@ const clean = defineCommand({
 const main = defineCommand({
   meta: {
     name: 'main',
-    version: '0.0.0',
-    description: 'Welcome to vxrn',
+    version: version,
+    description: 'Welcome to One',
   },
   args: {},
   async run({ args }) {

package/src/serve.ts

@@ -13,12 +13,14 @@ import { removeUndefined } from './utils/removeUndefined'
 import { resolveAPIRequest } from './vite/resolveAPIRequest'
 import type { One } from './vite/types'
 import { loadUserOneOptions } from './vite/one'
+import { labelProcess } from './cli/label-process'
 
 process.on('uncaughtException', (err) => {
   console.error(`[one] Uncaught exception`, err?.stack || err)
 })
 
 export async function serve(args: VXRNOptions['server'] = {}) {
+  labelProcess('serve')
   const oneOptions = await loadUserOneOptions('serve')
 
   // TODO make this better, this ensures we get react 19

package/src/vite/build.ts

@@ -5,7 +5,13 @@ import Path, { join, relative } from 'node:path'
 import type { OutputAsset } from 'rollup'
 import { nodeExternals } from 'rollup-plugin-node-externals'
 import { mergeConfig, build as viteBuild, type InlineConfig } from 'vite'
-import { fillOptions, getOptimizeDeps, build as vxrnBuild, type ClientManifestEntry } from 'vxrn'
+import {
+  fillOptions,
+  getOptimizeDeps,
+  rollupRemoveUnusedImportsPlugin,
+  build as vxrnBuild,
+  type ClientManifestEntry,
+} from 'vxrn'
 import { getLoaderPath, getPreloadPath } from '../cleanUrl'
 import type { RouteInfo } from '../server/createRoutesManifest'
 import type { LoaderProps, RenderApp } from '../types'
@@ -13,6 +19,7 @@ import { getManifest } from './getManifest'
 import { loadUserOneOptions } from './one'
 import { replaceLoader } from './replaceLoader'
 import type { One } from './types'
+import { labelProcess } from '../cli/label-process'
 
 const { ensureDir, readFile, outputFile } = FSExtra
 
@@ -24,6 +31,7 @@ export async function build(args: {
   step?: string
   only?: string
 }) {
+  labelProcess('build')
   const userOptions = await loadUserOneOptions('build')
   const serverOutputFormat = userOptions.build?.server?.outputFormat ?? 'esm'
 
@@ -115,6 +123,12 @@ export async function build(args: {
             treeshake: {
               moduleSideEffects: 'no-external',
             },
+
+            plugins: [
+              // otherwise rollup is leaving commonjs-only top level imports...
+              apiOutputFormat === 'esm' ? rollupRemoveUnusedImportsPlugin : null,
+            ].filter(Boolean),
+
             // too many issues
             // treeshake: {
             //   moduleSideEffects: false,

package/src/vite/one.ts

@@ -318,7 +318,7 @@ async function getUserOneOptions(command?: 'serve' | 'build') {
     await loadUserOneOptions(command)
   }
   if (!oneOptions) {
-    throw new Error(`No one options loaded`)
+    throw new Error(`No One options were loaded`)
   }
   return oneOptions
 }
@@ -329,11 +329,11 @@ export async function loadUserOneOptions(command: 'serve' | 'build') {
     command,
   })
   if (!found) {
-    throw new Error(`No config found`)
+    throw new Error(`No config found in ${process.cwd()}. Is this the correct directory?`)
   }
   const foundOptions = getUserOneOptions()
   if (!foundOptions) {
-    throw new Error(`No One plugin added to config`)
+    throw new Error(`No One plugin found in this vite.config`)
   }
   return foundOptions
 }

package/types/cli/label-process.d.ts

@@ -0,0 +1,2 @@
+export declare function labelProcess(title: string): void;
+//# sourceMappingURL=label-process.d.ts.map

package/types/cli/label-process.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"label-process.d.ts","sourceRoot":"","sources":["../../src/cli/label-process.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,QAIzC"}

package/types/cli/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAEA,wBAAsB,GAAG,CAAC,IAAI,EAAE;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,iBA8BA"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,CAAC,IAAI,EAAE;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,iBA+BA"}

package/types/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAK3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAevC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAM;mDAdJ,YAC9C;+CAER,YAAY;gDAED,YAAY;iDAElB,YAAW;+CAGS,YAAY;mDAIR,YAAY;GAyB1C"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAK3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAgBvC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAM;mDAfJ,YAC9C;+CAER,YAAY;gDAED,YAAY;iDAElB,YAAW;+CAEW,YAAW;mDAGO,YAAY;GA6B1D"}

package/types/vite/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AAsBA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,iBA8fA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AA6BA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,iBAqgBA"}