astro 1.0.0-beta.52 → 1.0.0-beta.53

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.52";
+  const version = "1.0.0-beta.53";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.52" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.53" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.52",
+          astroVersion: "1.0.0-beta.53",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.53", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.53", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.53", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.53", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.52",
+          astroVersion: "1.0.0-beta.53",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/add/index.js

@@ -289,7 +289,7 @@ async function getInstallIntegrationsCommand({
   debug("add", `package manager: ${JSON.stringify(pm)}`);
   if (!pm)
     return null;
-  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version}`).sort();
+  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`).sort();
   switch (pm.name) {
     case "npm":
       return { pm: "npm", command: "install", flags: ["--save-dev"], dependencies };

package/dist/core/build/static-build.js

@@ -98,12 +98,13 @@ async function ssrBuild(opts, internals, input) {
       outDir: fileURLToPath(out),
       rollupOptions: {
         input: [],
-        output: __spreadValues({
+        output: __spreadProps(__spreadValues({
           format: "esm",
-          entryFileNames: opts.buildConfig.serverEntry,
           chunkFileNames: "chunks/[name].[hash].mjs",
           assetFileNames: "assets/[name].[hash][extname]"
-        }, (_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output)
+        }, (_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output), {
+          entryFileNames: opts.buildConfig.serverEntry
+        })
       },
       ssr: true,
       target: "esnext",

package/dist/core/build/vite-plugin-analyzer.js

@@ -11,7 +11,7 @@ function vitePluginAnalyzer(astroConfig, internals) {
         var _a;
         const hoistedScripts = /* @__PURE__ */ new Set();
         for (let i = 0; i < scripts.length; i++) {
-          const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}`;
+          const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {

package/dist/core/dev/index.js

@@ -47,7 +47,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.52";
+  const currentVersion = "1.0.0-beta.53";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.52";
+  const version = "1.0.0-beta.53";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.52"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.53"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/runtime/server/metadata.js

@@ -30,7 +30,7 @@ class Metadata {
     for (const metadata of this.deepMetadata()) {
       let i = 0, pathname = metadata.mockURL.pathname;
       while (i < metadata.hoisted.length) {
-        yield `${pathname.replace("/@fs", "")}?astro&type=script&index=${i}`;
+        yield `${pathname.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
         i++;
       }
     }

package/dist/types/vite-plugin-astro/query.d.ts

@@ -6,7 +6,8 @@ export interface AstroQuery {
     lang?: string;
     raw?: boolean;
 }
-export declare function parseAstroRequest(id: string): {
+export interface ParsedRequestResult {
     filename: string;
     query: AstroQuery;
-};
+}
+export declare function parseAstroRequest(id: string): ParsedRequestResult;

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

@@ -31,6 +31,15 @@ function astro({ config, logging }) {
   let viteDevServer = null;
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb);
+  function resolveRelativeFromAstroParent(id, parsedFrom) {
+    const filename = normalizeFilename(parsedFrom.filename);
+    const resolvedURL = new URL(id, `file://${filename}`);
+    const resolved = resolvedURL.pathname;
+    if (isBrowserPath(resolved)) {
+      return relativeToRoot(resolved + resolvedURL.search);
+    }
+    return slash(fileURLToPath(resolvedURL)) + resolvedURL.search;
+  }
   return {
     name: "astro:build",
     enforce: "pre",
@@ -41,17 +50,15 @@ function astro({ config, logging }) {
     configureServer(server) {
       viteDevServer = server;
     },
-    async resolveId(id, from) {
+    async resolveId(id, from, opts) {
       if (from) {
         const parsedFrom = parseAstroRequest(from);
-        if (parsedFrom.query.astro && isRelativePath(id) && parsedFrom.query.type === "script") {
-          const filename = normalizeFilename(parsedFrom.filename);
-          const resolvedURL = new URL(id, `file://${filename}`);
-          const resolved = resolvedURL.pathname;
-          if (isBrowserPath(resolved)) {
-            return relativeToRoot(resolved + resolvedURL.search);
-          }
-          return slash(fileURLToPath(resolvedURL)) + resolvedURL.search;
+        const isAstroScript = parsedFrom.query.astro && parsedFrom.query.type === "script";
+        if (isAstroScript && isRelativePath(id)) {
+          return this.resolve(resolveRelativeFromAstroParent(id, parsedFrom), from, {
+            custom: opts.custom,
+            skipSelf: true
+          });
         }
       }
       const { query } = parseAstroRequest(id);
@@ -133,7 +140,12 @@ File: ${filename}`);
             }
           }
           return {
-            code: hoistedScript.type === "inline" ? hoistedScript.code : `import "${hoistedScript.src}";`
+            code: hoistedScript.type === "inline" ? hoistedScript.code : `import "${hoistedScript.src}";`,
+            meta: {
+              vite: {
+                lang: "ts"
+              }
+            }
           };
         }
       }
@@ -161,8 +173,8 @@ const $$url = ${JSON.stringify(url)};export { $$file as file, $$url as url };
           }
           let i = 0;
           while (i < transformResult.scripts.length) {
-            deps.add(`${id}?astro&type=script&index=${i}`);
-            SUFFIX += `import "${id}?astro&type=script&index=${i}";`;
+            deps.add(`${id}?astro&type=script&index=${i}&lang.ts`);
+            SUFFIX += `import "${id}?astro&type=script&index=${i}&lang.ts";`;
             i++;
           }
           SUFFIX += `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.52",
+  "version": "1.0.0-beta.53",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",