feat: working poc

README.md

@@ -1,6 +1,30 @@
-# 🚀 Nitopack
+#  Nitopack
 
-> Next Generation Web Framework
+> Next Generation Web Tooling
+
+## 🚀 Quick Start
+
+1️⃣ Create `api/test.ts`:
+
+```ts [api/test.ts]
+export default () => 'Nitro is amazing!'
+```
+
+2️⃣ Start development server with HMR using `npx nitropack dev` command:
+
+> Your API is ready at http://localhost:3000/api/test
+
+3️⃣ You can now build your production ready server:
+
+```bash
+npx nitropack build
+````
+
+4️⃣ Output is in `.output` directory and ready to be deployed on almost any VPS with no dependencies. You can locally try it too:
+
+```bash
+node .output/server/index.mjs
+```
 
 ## 💻 Development
 

package.json

@@ -1,6 +1,7 @@
 {
   "name": "nitropack",
   "version": "0.0.0",
+  "description": "Next Generation Web Tooling",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -20,6 +21,7 @@
     "build": "unbuild",
     "dev": "yarn nitro dev playground",
     "dev:build": "yarn nitro build playground",
+    "dev:start": "node playground/.output/server/index.mjs",
     "lint": "eslint --ext .ts,.mjs,.cjs .",
     "nitro": "jiti ./src/cli.ts",
     "prepack": "yarn build"

playground/api/test.mjs

@@ -0,0 +1 @@
+export default () => 'API Works!'

src/build.ts

@@ -87,7 +87,7 @@ async function writeTypes (nitro: Nitro) {
 }
 
 async function _build (nitro: Nitro) {
-  nitro.scannedMiddleware = await scanMiddleware(nitro.options.serverDir)
+  nitro.scannedMiddleware = await scanMiddleware(nitro.options.srcDir)
   await writeTypes(nitro)
 
   consola.start('Building server...')
@@ -153,6 +153,7 @@ function startRollupWatcher (nitro: Nitro) {
       case 'END':
         nitro.hooks.callHook('nitro:compiled', nitro)
         consola.success('Nitro built', start ? `in ${Date.now() - start} ms` : '')
+        nitro.hooks.callHook('nitro:dev:reload')
         return
 
       // Encountered an error while bundling
@@ -166,8 +167,7 @@ function startRollupWatcher (nitro: Nitro) {
 
 async function _watch (nitro: Nitro) {
   let watcher = startRollupWatcher(nitro)
-
-  nitro.scannedMiddleware = await scanMiddleware(nitro.options.serverDir,
+  nitro.scannedMiddleware = await scanMiddleware(nitro.options.srcDir,
     (middleware, event) => {
       nitro.scannedMiddleware = middleware
       if (['add', 'addDir'].includes(event)) {

src/cli.ts

@@ -12,7 +12,7 @@ async function main () {
   const rootDir = resolve(args._[1] || '.')
 
   if (command === 'dev') {
-    const nitro = createNitro({
+    const nitro = await createNitro({
       rootDir,
       dev: true,
       preset: 'dev'
@@ -21,12 +21,11 @@ async function main () {
     await server.listen({})
     await prepare(nitro)
     await build(nitro)
-    await server.reload()
     return
   }
 
   if (command === 'build') {
-    const nitro = createNitro({
+    const nitro = await createNitro({
       rootDir,
       dev: false,
       preset: 'server'

src/nitro.ts

@@ -1,67 +1,12 @@
 import { resolve } from 'pathe'
-import defu from 'defu'
 import { createHooks } from 'hookable'
-import { tryImport, resolvePath, detectTarget } from './utils'
-import * as PRESETS from './presets'
-import type { Nitro, NitroOptions, NitroConfig } from './types'
-// import { mergeHooks } from 'hookable'
-import { pkgDir, runtimeDir } from './dirs'
+import type { NitroConfig, Nitro } from './types'
+import { resolvePath } from './utils'
+import { loadOptions } from './options'
 
-const nitroDefaults: NitroConfig = {
-  alias: {
-    '#nitro': runtimeDir
-  },
-  unenv: {},
-  analyze: false,
-  experiments: {},
-  moduleSideEffects: ['unenv/runtime/polyfill/'],
-  middleware: [],
-  modulesDir: [],
-  ignore: [],
-  hooks: {},
-  output: {
-    dir: '{{ rootDir }}/.output',
-    serverDir: '{{ output.dir }}/server',
-    publicDir: '{{ output.dir }}/public'
-  },
-  storage: { mounts: {} },
-  commands: {},
-  assets: {
-    // inline: !config.dev,
-    dirs: {}
-  },
-  publicDir: 'public',
-  serverDir: 'server',
-  routerBase: '/',
-  publicPath: '/',
-  runtimeConfig: {
-    public: {
-      app: {
-        baseURL: '/',
-        cdnURL: undefined,
-        buildAssetsDir: '_dist'
-      }
-    },
-    private: {}
-  }
-}
-
-export function createNitro (config: NitroConfig = {}): Nitro {
-  // Apply nitro defaults
-  config = defu(config, nitroDefaults)
-
-  // Apply preset defaults
-  config.extends = config.preset = process.env.NITRO_PRESET || config.extends || config.preset || detectTarget() || 'server'
-  config = extendConfig(config)
-
-  // Normalize options
-  const options = config as NitroOptions
-  options.rootDir = resolve(options.rootDir || '.')
-  for (const key of ['srcDir', 'publicDir', 'serverDir', 'generateDir', 'buildDir']) {
-    options[key] = resolve(options.rootDir, options[key])
-  }
-  options.modulesDir.push(resolve(options.rootDir, 'node_modules'))
-  options.modulesDir.push(resolve(pkgDir, 'node_modules'))
+export async function createNitro (config: NitroConfig = {}): Promise<Nitro> {
+  // Resolve options
+  const options = await loadOptions(config)
 
   // Create context
   const nitro: Nitro = {
@@ -102,30 +47,3 @@ export function createNitro (config: NitroConfig = {}): Nitro {
 
   return nitro
 }
-
-function extendConfig (config: NitroConfig): NitroConfig {
-  if (!config.extends) {
-    return config
-  }
-
-  let _extends = config.extends
-  if (typeof config.extends === 'string') {
-    type Preset = NitroConfig['preset']
-    _extends = (PRESETS as Record<string, Preset>)[config.extends] || tryImport(config.rootDir, config.extends) || {}
-    if (!_extends) {
-      throw new Error('Cannot resolve config: ' + config.extends)
-    }
-    _extends = (_extends as any).default || _extends
-  }
-  if (typeof _extends === 'function') {
-    _extends = _extends(config)
-  }
-
-  // TODO: Merge hooks
-  const preset = extendConfig(_extends as NitroConfig)
-  return defu(config, preset)
-}
-
-export function defineNitroPreset (preset: NitroConfig['extends']) {
-  return preset
-}

src/options.ts

@@ -0,0 +1,89 @@
+import defu from 'defu'
+import { resolve } from 'pathe'
+import type { NitroConfig, NitroOptions } from './types'
+import { runtimeDir, pkgDir } from './dirs'
+import * as PRESETS from './presets'
+import { tryImport, detectTarget } from './utils'
+
+const defaultNitroConfig = () => ({
+  alias: {
+    '#nitro': runtimeDir
+  },
+  unenv: {},
+  analyze: false,
+  experiments: {},
+  moduleSideEffects: ['unenv/runtime/polyfill/'],
+  middleware: [],
+  modulesDir: [],
+  ignore: [],
+  hooks: {},
+  output: {
+    dir: '{{ rootDir }}/.output',
+    serverDir: '{{ output.dir }}/server',
+    publicDir: '{{ output.dir }}/public'
+  },
+  storage: { mounts: {} },
+  commands: {},
+  assets: {
+    // inline: !config.dev,
+    dirs: {}
+  },
+  publicDir: 'public',
+  srcDir: undefined,
+  routerBase: '/',
+  publicPath: '/',
+  runtimeConfig: {
+    public: {
+      app: {
+        baseURL: '/',
+        cdnURL: undefined,
+        buildAssetsDir: '_dist'
+      }
+    },
+    private: {}
+  }
+}) as NitroConfig
+
+export function loadOptions (config: NitroConfig = {}): NitroOptions {
+  // Apply nitro defaults
+  config = defu(config, defaultNitroConfig())
+
+  // Apply preset defaults
+  config.extends = config.preset = process.env.NITRO_PRESET || config.extends || config.preset || detectTarget() || 'server'
+  config = extendConfig(config)
+
+  // Normalize options
+  const options = config as NitroOptions
+  options.rootDir = resolve(options.rootDir || '.')
+  options.srcDir = resolve(options.srcDir || options.rootDir)
+  for (const key of ['srcDir', 'publicDir', 'generateDir', 'buildDir']) {
+    options[key] = resolve(options.rootDir, options[key])
+  }
+  options.modulesDir.push(resolve(options.rootDir, 'node_modules'))
+  options.modulesDir.push(resolve(pkgDir, 'node_modules'))
+
+  return options
+}
+
+function extendConfig (config: NitroConfig): NitroConfig {
+  if (!config.extends) {
+    return config
+  }
+
+  let _extends = config.extends
+  if (typeof config.extends === 'string') {
+    type Preset = NitroConfig['preset']
+    _extends = (PRESETS as Record<string, Preset>)[config.extends] || tryImport(config.rootDir, config.extends) || {}
+    if (!_extends) {
+      throw new Error('Cannot resolve config: ' + config.extends)
+    }
+    _extends = (_extends as any).default || _extends
+  }
+  if (typeof _extends === 'function') {
+    _extends = _extends(config)
+  }
+
+  // TODO: Merge hooks
+  const preset = extendConfig(_extends as NitroConfig)
+  return defu(config, preset)
+}

src/preset.ts

@@ -0,0 +1,5 @@
+import type { NitroConfig } from './types'
+
+export function defineNitroPreset (preset: NitroConfig['extends']) {
+  return preset
+}

src/presets/azure.ts

@@ -2,7 +2,7 @@ import fse from 'fs-extra'
 import { globby } from 'globby'
 import { join, resolve } from 'pathe'
 import { writeFile } from '../utils'
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 import type { Nitro } from '../types'
 
 export const azure = defineNitroPreset({

src/presets/azure_functions.ts

@@ -2,7 +2,7 @@ import { createWriteStream } from 'fs'
 import archiver from 'archiver'
 import { join, resolve } from 'pathe'
 import { writeFile } from '../utils'
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 import type { Nitro } from '../types'
 
 // eslint-disable-next-line
@@ -68,7 +68,7 @@ async function writeRoutes (nitro: Nitro) {
     ]
   }
 
-  await writeFile(resolve(nitro.options.serverDir, 'function.json'), JSON.stringify(functionDefinition))
+  await writeFile(resolve(nitro.options.srcDir, 'function.json'), JSON.stringify(functionDefinition))
   await writeFile(resolve(nitro.options.output.dir, 'host.json'), JSON.stringify(host))
   await zipDirectory(nitro.options.output.dir, join(nitro.options.output.dir, 'deploy.zip'))
 }

src/presets/browser.ts

@@ -3,7 +3,7 @@ import { resolve } from 'pathe'
 import consola from 'consola'
 import { joinURL } from 'ufo'
 import { prettyPath } from '../utils'
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 
 export const browser = defineNitroPreset((_input) => {
   // TODO

src/presets/cli.ts

@@ -1,9 +1,9 @@
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 
 export const cli = defineNitroPreset({
   extends: 'node',
   entry: '#nitro/entries/cli',
   commands: {
-    preview: 'Run with node {{ options.serverDir }} [route]'
+    preview: 'Run with node {{ options.srcDir }} [route]'
   }
 })

src/presets/cloudflare.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'pathe'
 import { writeFile } from '../utils'
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 import type { Nitro } from '../types'
 
 export const cloudflare = defineNitroPreset({

src/presets/dev.ts

@@ -1,10 +1,10 @@
-import { defineNitroPreset } from '../nitro'
+import { defineNitroPreset } from '../preset'
 
 export const dev = defineNitroPreset({
   extends: 'node',
   entry: '#nitro/entries/dev',
   output: {
-    serverDir: '{{ options.buildDir }}/nitro'
+    serverDir: '{{ buildDir }}/nitro'
   },
   externals: { trace: false },
   inlineDynamicImports: true, // externals plugin limitation