astro 2.9.7 → 3.0.0-beta.0

package/dist/vite-plugin-scanner/scan.js

@@ -44,7 +44,7 @@ async function scan(code, id, settings) {
           message: AstroErrorData.InvalidPrerenderExport.message(
             prefix,
             suffix,
-            (settings == null ? void 0 : settings.config.output) === "hybrid"
+            settings?.config.output === "hybrid"
           ),
           location: { file: id }
         });

package/dist/vite-plugin-scripts/index.js

@@ -29,7 +29,7 @@ function astroScriptsPlugin({ settings }) {
     },
     buildStart() {
       const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
-      if (hasHydrationScripts && (env == null ? void 0 : env.command) === "build" && !(env == null ? void 0 : env.ssrBuild)) {
+      if (hasHydrationScripts && env?.command === "build" && !env?.ssrBuild) {
         this.emitFile({
           type: "chunk",
           id: BEFORE_HYDRATION_SCRIPT_ID,

package/dist/vite-plugin-scripts/page-ssr.js

@@ -9,7 +9,7 @@ function astroScriptsPostPlugin({
     name: "astro:scripts:page-ssr",
     enforce: "post",
     transform(code, id, options) {
-      if (!(options == null ? void 0 : options.ssr))
+      if (!options?.ssr)
         return;
       const hasInjectedScript = settings.scripts.some((s2) => s2.stage === "page-ssr");
       if (!hasInjectedScript)
@@ -29,7 +29,7 @@ function astroScriptsPostPlugin({
 `);
       return {
         code: s.toString(),
-        map: s.generateMap({ hires: true })
+        map: s.generateMap({ hires: "boundary" })
       };
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.9.7",
+  "version": "3.0.0-beta.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -56,6 +56,7 @@
     "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
+    "./assets/services/noop": "./dist/assets/services/noop.js",
     "./content/runtime": "./dist/content/runtime.js",
     "./content/runtime-assets": "./dist/content/runtime-assets.js",
     "./debug": "./components/Debug.astro",
@@ -102,12 +103,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.6.3",
-    "@astrojs/internal-helpers": "^0.1.1",
-    "@astrojs/language-server": "^1.0.0",
-    "@astrojs/markdown-remark": "^2.2.1",
-    "@astrojs/telemetry": "^2.1.1",
-    "@astrojs/webapi": "^2.2.0",
+    "@astrojs/compiler": "^1.8.0",
     "@babel/core": "^7.22.5",
     "@babel/generator": "^7.22.5",
     "@babel/parser": "^7.22.5",
@@ -128,8 +124,8 @@
     "devalue": "^4.3.2",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.3.0",
-    "esbuild": "^0.17.19",
-    "estree-walker": "3.0.0",
+    "esbuild": "^0.18.16",
+    "estree-walker": "^3.0.3",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.12",
     "github-slugger": "^2.0.0",
@@ -137,10 +133,11 @@
     "html-escaper": "^3.0.3",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.4",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.2",
     "mime": "^3.0.0",
     "network-information-types": "^0.1.1",
     "ora": "^6.3.1",
+    "sharp": "^0.32.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.2.1",
     "preferred-pm": "^3.0.3",
@@ -152,14 +149,16 @@
     "string-width": "^5.1.2",
     "strip-ansi": "^7.1.0",
     "tsconfig-resolver": "^3.0.1",
-    "typescript": "*",
     "unist-util-visit": "^4.1.2",
     "vfile": "^5.3.7",
     "vite": "^4.4.6",
     "vitefu": "^0.2.4",
     "which-pm": "^2.0.0",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.20.6"
+    "zod": "^3.20.6",
+    "@astrojs/internal-helpers": "0.2.0-beta.0",
+    "@astrojs/markdown-remark": "3.0.0-beta.0",
+    "@astrojs/telemetry": "3.0.0-beta.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.29.2",
@@ -184,6 +183,7 @@
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
     "@types/unist": "^2.0.6",
+    "@astrojs/check": "^0.1.0",
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
@@ -196,22 +196,13 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^3.25.1",
     "sass": "^1.63.4",
-    "sharp": "^0.32.1",
     "srcset-parse": "^1.1.0",
     "undici": "^5.22.1",
     "unified": "^10.1.2",
     "astro-scripts": "0.0.14"
   },
-  "peerDependencies": {
-    "sharp": ">=0.31.0"
-  },
-  "peerDependenciesMeta": {
-    "sharp": {
-      "optional": true
-    }
-  },
   "engines": {
-    "node": ">=16.12.0",
+    "node": ">=18.14.1",
     "npm": ">=6.14.0"
   },
   "scripts": {

package/tsconfigs/base.json

@@ -5,14 +5,19 @@
     "target": "ESNext",
     "module": "ESNext",
     // Enable node-style module resolution, for things like npm package imports.
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
+    // Allow importing TypeScript files using their native extension (.ts(x)).
+    "allowImportingTsExtensions": true,
     // Enable JSON imports.
     "resolveJsonModule": true,
-    // Enable stricter transpilation for better output.
+    // Enforce the usage of type-only imports when needed, which helps avoiding bundling issues.
+    "verbatimModuleSyntax": true,
+    // Ensure that each file can be transpiled without relying on other imports.
+    // This is redundant with the previous option, however it ensures that it's on even if someone disable `verbatimModuleSyntax`
     "isolatedModules": true,
     // Astro directly run TypeScript code, no transpilation needed.
     "noEmit": true,
-    // Report an error when importing a file using a casing different from the casing on disk.
+    // Report an error when importing a file using a casing different from another import of the same file.
     "forceConsistentCasingInFileNames": true,
     // Properly support importing CJS modules in ESM
     "esModuleInterop": true,
@@ -23,9 +28,6 @@
     "paths": {
       "~/assets/*": ["src/assets/*"]
     },
-    // TypeScript 5.0 changed how `isolatedModules` and `importsNotUsedAsValues` works, deprecating the later
-    // Until the majority of users are on TypeScript 5.0, we'll have to supress those deprecation errors
-    "ignoreDeprecations": "5.0",
     // Allow JavaScript files to be imported
     "allowJs": true
   }

package/tsconfigs/strict.json

@@ -2,8 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "./base.json",
   "compilerOptions": {
-    "strict": true,
-    // Error when a value import is only used as a type.
-    "importsNotUsedAsValues": "error"
+    // Enable strict mode. This enables a few options at a time, see https://www.typescriptlang.org/tsconfig#strict for a list.
+    "strict": true
   }
 }

package/dist/cli/check/print.d.ts

@@ -1,2 +0,0 @@
-import { type Diagnostic } from '@astrojs/language-server';
-export declare function printDiagnostic(filePath: string, text: string, diag: Diagnostic): string;

package/dist/cli/check/print.js

@@ -1,95 +0,0 @@
-import { DiagnosticSeverity, offsetAt } from "@astrojs/language-server";
-import {
-  bgRed,
-  bgWhite,
-  bgYellow,
-  black,
-  bold,
-  cyan,
-  gray,
-  red,
-  white,
-  yellow
-} from "kleur/colors";
-import { fileURLToPath } from "node:url";
-import stringWidth from "string-width";
-function printDiagnostic(filePath, text, diag) {
-  let result = [];
-  const realStartLine = diag.range.start.line + 1;
-  const realStartCharacter = diag.range.start.character + 1;
-  const IDEFilePath = `${bold(cyan(fileURLToPath(filePath)))}:${bold(yellow(realStartLine))}:${bold(
-    yellow(realStartCharacter)
-  )}`;
-  result.push(
-    `${IDEFilePath} ${bold(getColorForSeverity(diag, getStringForSeverity(diag)))}: ${diag.message}`
-  );
-  const previousLine = getLine(diag.range.start.line - 1, text);
-  if (previousLine) {
-    result.push(`${getPrintableLineNumber(realStartLine - 1)}  ${gray(previousLine)}`);
-  }
-  const str = getLine(diag.range.start.line, text);
-  const lineNumStr = realStartLine.toString().padStart(2, "0");
-  const lineNumLen = lineNumStr.length;
-  result.push(`${getBackgroundForSeverity(diag, lineNumStr)}  ${str}`);
-  const tildes = generateString("~", diag.range.end.character - diag.range.start.character);
-  const beforeChars = stringWidth(str.substring(0, diag.range.start.character));
-  const spaces = generateString(" ", beforeChars + lineNumLen - 1);
-  result.push(`   ${spaces}${bold(getColorForSeverity(diag, tildes))}`);
-  const nextLine = getLine(diag.range.start.line + 1, text);
-  if (nextLine) {
-    result.push(`${getPrintableLineNumber(realStartLine + 1)}  ${gray(nextLine)}`);
-  }
-  result.push("");
-  return result.join("\n");
-}
-function generateString(str, len) {
-  return Array.from({ length: len }, () => str).join("");
-}
-function getStringForSeverity(diag) {
-  switch (diag.severity) {
-    case DiagnosticSeverity.Error:
-      return "Error";
-    case DiagnosticSeverity.Warning:
-      return "Warning";
-    case DiagnosticSeverity.Hint:
-      return "Hint";
-    default:
-      return "Unknown";
-  }
-}
-function getColorForSeverity(diag, text) {
-  switch (diag.severity) {
-    case DiagnosticSeverity.Error:
-      return red(text);
-    case DiagnosticSeverity.Warning:
-      return yellow(text);
-    case DiagnosticSeverity.Hint:
-      return gray(text);
-    default:
-      return text;
-  }
-}
-function getBackgroundForSeverity(diag, text) {
-  switch (diag.severity) {
-    case DiagnosticSeverity.Error:
-      return bgRed(white(text));
-    case DiagnosticSeverity.Warning:
-      return bgYellow(white(text));
-    case DiagnosticSeverity.Hint:
-      return bgWhite(black(text));
-    default:
-      return text;
-  }
-}
-function getPrintableLineNumber(line) {
-  return bgWhite(black(line.toString().padStart(2, "0")));
-}
-function getLine(line, text) {
-  return text.substring(
-    offsetAt({ line, character: 0 }, text),
-    offsetAt({ line, character: Number.MAX_SAFE_INTEGER }, text)
-  ).replace(/\t/g, " ").trimEnd();
-}
-export {
-  printDiagnostic
-};