Merge remote-tracking branch 'origin/upstream'

zhcndoc · Jul 15, 2024 · 645daa3 · 645daa3
2 parents d621968 + e727afd
commit 645daa3
Show file tree

Hide file tree

Showing 184 changed files with 364 additions and 1,069 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 Create web servers that run anywhere! 📖 [**documentation**](https://nitro.unjs.io)
 
 > [!NOTE]
-> You are on the v2 branch. Check [main branch](https://github.com/unjs/nitro/tree/main) for v3 development tree.
+> You are on the v3 development branch. Check [here](https://github.com/unjs/nitro/pull/2521/) for status.
 
 ## Contribution
 

diff --git a/build.config.ts b/build.config.ts
@@ -42,12 +42,12 @@ export default defineBuildConfig({
     { input: "src/types/index.ts" },
   ],
   alias: {
-    nitropack: "nitropack",
-    "nitropack/meta": resolve(srcDir, "../meta.ts"),
-    "nitropack/runtime/meta": resolve(srcDir, "../runtime-meta.mjs"),
+    nitro: "nitro",
+    "nitro/meta": resolve(srcDir, "../meta.ts"),
+    "nitro/runtime/meta": resolve(srcDir, "../runtime-meta.mjs"),
     ...Object.fromEntries(
       subpaths.map((subpath) => [
-        `nitropack/${subpath}`,
+        `nitro/${subpath}`,
         resolve(srcDir, `${subpath}/index.ts`),
       ])
     ),
@@ -63,9 +63,9 @@ export default defineBuildConfig({
     },
   },
   externals: [
-    "nitropack",
-    "nitropack/runtime/meta",
-    ...subpaths.map((subpath) => `nitropack/${subpath}`),
+    "nitro",
+    "nitro/runtime/meta",
+    ...subpaths.map((subpath) => `nitro/${subpath}`),
     "firebase-functions",
     "@scalar/api-reference",
   ],

diff --git a/docs/1.guide/9.plugins.md b/docs/1.guide/9.plugins.md
@@ -54,7 +54,7 @@ export default defineNitroPlugin((nitro) => {
 
 ### Available hooks
 
-See the [source code](https://github.com/unjs/nitro/blob/main/src/runtime/types.ts#L24) for list of all available runtime hooks.
+See the [source code](https://github.com/unjs/nitro/blob/main/src/types/runtime/nitro.ts#L46) for list of all available runtime hooks.
 
 - `"close", () => {}`
 - `"error", (error, { event? }) => {}`

diff --git a/examples/graceful-shutdown/nitro.config.ts b/examples/graceful-shutdown/nitro.config.ts
@@ -1,3 +1,3 @@
-import { defineNitroConfig } from "nitropack/config";
+import { defineNitroConfig } from "nitro/config";
 
 export default defineNitroConfig({});
diff --git a/examples/renderer/api/hello.ts b/examples/renderer/api/hello.ts
@@ -0,0 +1 @@
+export default defineEventHandler(() => "Nitro is amazing!");
diff --git a/examples/renderer/nitro.config.ts b/examples/renderer/nitro.config.ts
@@ -0,0 +1,4 @@
+export default defineNitroConfig({
+  compatibilityDate: "2024-06-21",
+  renderer: "~/renderer",
+});
diff --git a/examples/renderer/package.json b/examples/renderer/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "example-renderer",
+  "private": true,
+  "scripts": {
+    "dev": "nitro dev",
+    "build": "nitro build"
+  },
+  "devDependencies": {
+    "nitropack": "latest"
+  }
+}
diff --git a/examples/renderer/renderer.ts b/examples/renderer/renderer.ts
@@ -0,0 +1,15 @@
+import { defineRenderHandler } from "nitropack/runtime";
+
+export default defineRenderHandler((_event) => {
+  return {
+    body: /* html */ `<!DOCTYPE html>
+    <html>
+      <head>
+        <title>Rendered Page</title>
+        </head>
+        <body>
+            <h1>Rendered by Nitro!</h1>
+        </body>
+    </html>`,
+  };
+});
diff --git a/examples/renderer/tsconfig.json b/examples/renderer/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./.nitro/types/tsconfig.json"
+}
diff --git a/patches/[email protected] b/patches/[email protected]
diff --git a/playground/nitro.config.ts b/playground/nitro.config.ts
@@ -1,4 +1,4 @@
-import { defineNitroConfig } from "nitropack/config";
+import { defineNitroConfig } from "nitro/config";
 
 export default defineNitroConfig({
   compatibilityDate: "2024-06-12",

diff --git a/scripts/gen-presets.ts b/scripts/gen-presets.ts
@@ -2,9 +2,9 @@ import { existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { consola } from "consola";
-import createJITI from "jiti";
+import { createJiti } from "jiti";
 import { findTypeExports } from "mlly";
-import type { NitroPreset, NitroPresetMeta } from "nitropack/types";
+import type { NitroPreset, NitroPresetMeta } from "nitro/types";
 import { camelCase, kebabCase, pascalCase, snakeCase } from "scule";
 import { subpaths } from "../build.config";
 
@@ -21,14 +21,13 @@ const presetDirs: string[] = readdirSync(presetsDir, { withFileTypes: true })
   .map((dir) => dir.name);
 
 // --- Load presets ---
-const jitiRequire = createJITI(presetsDir, {
-  esmResolve: true,
+const jiti = createJiti(presetsDir, {
   interopDefault: true,
   alias: {
-    nitropack: fileURLToPath(new URL("../src/core/index.ts", import.meta.url)),
+    nitro: fileURLToPath(new URL("../src/core/index.ts", import.meta.url)),
     ...Object.fromEntries(
       subpaths.map((pkg) => [
-        `nitropack/${pkg}`,
+        `nitro/${pkg}`,
         fileURLToPath(new URL(`../src/${pkg}/index.ts`, import.meta.url)),
       ])
     ),
@@ -37,7 +36,7 @@ const jitiRequire = createJITI(presetsDir, {
 const allPresets: (NitroPreset & { _meta?: NitroPresetMeta })[] = [];
 for (const preset of presetDirs) {
   const presetPath = resolve(presetsDir, preset, "preset.ts");
-  const _presets = jitiRequire(presetPath);
+  const _presets = (await jiti.import(presetPath)) as NitroPreset[];
   allPresets.push(..._presets);
 }
 
@@ -91,7 +90,7 @@ writeFileSync(
 ${presetsWithType
   .map(
     (preset) =>
-      `import { PresetOptions as ${pascalCase(
+      `import type { PresetOptions as ${pascalCase(
         preset
       )}Options } from "./${preset}/preset";`
   )

diff --git a/scripts/release-nightly.sh b/scripts/release-nightly.sh
@@ -8,7 +8,7 @@ set -xe
 git restore -s@ -SW  -- .
 
 # Bump according to changelog
-pnpm changelogen --bump
+pnpm changelogen --bump -r 3.0.0-beta
 
 # Bump versions to nightly
 pnpm jiti ./scripts/bump-nightly
@@ -31,8 +31,8 @@ fi
 # Release packages
 
 echo "Publishing main package..."
-npm publish --access public --tolerate-republish
+npm publish --access public --tolerate-republish --tag 3x
 
 echo "Publishing mirror package..."
 cd .mirror
-npm publish --access public --tolerate-republish
+npm publish --access public --tolerate-republish --tag 3x
diff --git a/src/cli/commands/build.ts b/src/cli/commands/build.ts
@@ -6,7 +6,7 @@ import {
   createNitro,
   prepare,
   prerender,
-} from "nitropack/core";
+} from "nitro/core";
 import { resolve } from "pathe";
 import { commonArgs } from "../common";
 

diff --git a/src/cli/commands/dev.ts b/src/cli/commands/dev.ts
@@ -1,8 +1,8 @@
 import { defineCommand } from "citty";
 import { consola } from "consola";
 import { getArgs, parseArgs } from "listhen/cli";
-import { build, createDevServer, createNitro, prepare } from "nitropack/core";
-import type { Nitro } from "nitropack/types";
+import { build, createDevServer, createNitro, prepare } from "nitro/core";
+import type { Nitro } from "nitro/types";
 import { resolve } from "pathe";
 import { commonArgs } from "../common";
 

diff --git a/src/cli/commands/prepare.ts b/src/cli/commands/prepare.ts
@@ -1,5 +1,5 @@
 import { defineCommand } from "citty";
-import { createNitro, writeTypes } from "nitropack/core";
+import { createNitro, writeTypes } from "nitro/core";
 import { resolve } from "pathe";
 import { commonArgs } from "../common";
 

diff --git a/src/cli/commands/task/list.ts b/src/cli/commands/task/list.ts
@@ -1,6 +1,6 @@
 import { defineCommand } from "citty";
 import { consola } from "consola";
-import { listTasks } from "nitropack/core";
+import { listTasks } from "nitro/core";
 import { resolve } from "pathe";
 
 export default defineCommand({

diff --git a/src/cli/commands/task/run.ts b/src/cli/commands/task/run.ts
@@ -1,7 +1,7 @@
 import { defineCommand } from "citty";
 import { consola } from "consola";
 import destr from "destr";
-import { runTask } from "nitropack/core";
+import { runTask } from "nitro/core";
 import { resolve } from "pathe";
 
 export default defineCommand({

diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from "citty";
-import { version as nitroVersion } from "nitropack/meta";
+import { version as nitroVersion } from "nitro/meta";
 
 const main = defineCommand({
   meta: {

diff --git a/src/config/index.ts b/src/config/index.ts
@@ -1,6 +1,6 @@
-import type { NitroConfig } from "nitropack/types";
+import type { NitroConfig } from "nitro/types";
 
-export type { NitroConfig } from "nitropack/types";
+export type { NitroConfig } from "nitro/types";
 
 export function defineNitroConfig(config: NitroConfig): NitroConfig {
   return config;

diff --git a/src/core/build/assets.ts b/src/core/build/assets.ts
@@ -1,7 +1,7 @@
 import { existsSync, promises as fsp } from "node:fs";
 import { globby } from "globby";
-import { isDirectory, prettyPath } from "nitropack/kit";
-import type { Nitro } from "nitropack/types";
+import { isDirectory, prettyPath } from "nitro/kit";
+import type { Nitro } from "nitro/types";
 import { join, relative, resolve } from "pathe";
 import { compressPublicAssets } from "../utils/compress";
 

diff --git a/src/core/build/build.ts b/src/core/build/build.ts
@@ -1,5 +1,5 @@
-import { getRollupConfig } from "nitropack/rollup";
-import type { Nitro } from "nitropack/types";
+import { getRollupConfig } from "nitro/rollup";
+import type { Nitro } from "nitro/types";
 import { watchDev } from "./dev";
 import { buildProduction } from "./prod";
 

diff --git a/src/core/build/dev.ts b/src/core/build/dev.ts
@@ -1,6 +1,6 @@
 import { watch } from "chokidar";
 import defu from "defu";
-import type { Nitro, RollupConfig } from "nitropack/types";
+import type { Nitro, RollupConfig } from "nitro/types";
 import { join } from "pathe";
 import { debounce } from "perfect-debounce";
 import * as rollup from "rollup";

diff --git a/src/core/build/prepare.ts b/src/core/build/prepare.ts
@@ -1,6 +1,6 @@
 import fsp from "node:fs/promises";
 import fse from "fs-extra";
-import type { Nitro } from "nitropack";
+import type { Nitro } from "nitro/types";
 
 export async function prepare(nitro: Nitro) {
   await prepareDir(nitro.options.output.dir);

diff --git a/src/core/build/prod.ts b/src/core/build/prod.ts
@@ -1,8 +1,8 @@
 import { promises as fsp } from "node:fs";
 import { formatCompatibilityDate } from "compatx";
-import { writeFile } from "nitropack/kit";
-import { version as nitroVersion } from "nitropack/meta";
-import type { Nitro, NitroBuildInfo, RollupConfig } from "nitropack/types";
+import { writeFile } from "nitro/kit";
+import { version as nitroVersion } from "nitro/meta";
+import type { Nitro, NitroBuildInfo, RollupConfig } from "nitro/types";
 import { dirname, join, relative, resolve } from "pathe";
 import * as rollup from "rollup";
 import { scanHandlers } from "../scan";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export default defineEventHandler(() => "Nitro is amazing!");