astro 1.0.0-beta.26 → 1.0.0-beta.27

package/dist/cli/index.js

@@ -11,7 +11,7 @@ import preview from "../core/preview/index.js";
 import { check } from "./check.js";
 import { openInBrowser } from "./open.js";
 import * as telemetryHandler from "./telemetry.js";
-import { loadConfig } from "../core/config.js";
+import { openConfig } from "../core/config.js";
 import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
 import { createSafeError } from "../core/util.js";
 function printAstroHelp() {
@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.26";
+  const version = "1.0.0-beta.27";
   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.26" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.27" });
   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.26",
+          astroVersion: "1.0.0-beta.27",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -107,9 +107,9 @@ async function cli(args) {
     }
     case "dev": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "dev" }, config));
-        await devServer(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.27", cliCommand: "dev" }, userConfig, flags));
+        await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
       } catch (err) {
@@ -118,24 +118,24 @@ async function cli(args) {
     }
     case "build": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "build" }, config));
-        return await build(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.27", cliCommand: "build" }, userConfig, flags));
+        return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "check": {
-      const config = await loadConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "check" }, config));
-      const ret = await check(config);
+      const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.27", cliCommand: "check" }, userConfig, flags));
+      const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "preview" }, config));
-        const server = await preview(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.27", cliCommand: "preview" }, userConfig, flags));
+        const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
         return throwAndExit(err);
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.26",
+          astroVersion: "1.0.0-beta.27",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

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

@@ -133,7 +133,7 @@ async function ssrBuild(opts, internals, input) {
     root: viteConfig.root,
     envPrefix: "PUBLIC_",
     server: viteConfig.server,
-    base: astroConfig.site ? new URL(astroConfig.site).pathname : "/",
+    base: astroConfig.base,
     ssr: viteConfig.ssr,
     resolve: viteConfig.resolve
   };

package/dist/core/config.js

@@ -27,7 +27,7 @@ import load, { resolve, ProloadError } from "@proload/core";
 import loadTypeScript from "@proload/plugin-tsm";
 import postcssrc from "postcss-load-config";
 import { arraify, isObject } from "./util.js";
-import { appendForwardSlash, trimSlashes } from "./path.js";
+import { appendForwardSlash, prependForwardSlash, trimSlashes } from "./path.js";
 load.use([loadTypeScript]);
 async function resolvePostcssConfig(inlineOptions, root) {
   if (isObject(inlineOptions)) {
@@ -72,7 +72,7 @@ const AstroConfigSchema = z.object({
   site: z.string().url().optional().transform((val) => val ? appendForwardSlash(val) : val).refine((val) => !val || new URL(val).pathname.length <= 1, {
     message: '"site" must be a valid URL origin (ex: "https://example.com") but cannot contain a URL path (ex: "https://example.com/blog"). Use "base" to configure your deployed URL path'
   }),
-  base: z.string().optional().default("/").transform((val) => appendForwardSlash(trimSlashes(val))),
+  base: z.string().optional().default("/").transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
   trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default("ignore"),
   build: z.object({
     format: z.union([z.literal("file"), z.literal("directory")]).optional().default("directory")
@@ -237,6 +237,39 @@ async function resolveConfigURL(configOptions) {
     return pathToFileURL(configPath);
   }
 }
+async function openConfig(configOptions) {
+  const root = configOptions.cwd ? path.resolve(configOptions.cwd) : process.cwd();
+  const flags = resolveFlags(configOptions.flags || {});
+  let userConfig = {};
+  let userConfigPath;
+  if (flags == null ? void 0 : flags.config) {
+    userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
+    userConfigPath = fileURLToPath(new URL(userConfigPath, appendForwardSlash(pathToFileURL(root).toString())));
+  }
+  let config;
+  try {
+    config = await load("astro", {
+      mustExist: !!userConfigPath,
+      cwd: root,
+      filePath: userConfigPath
+    });
+  } catch (err) {
+    if (err instanceof ProloadError && flags.config) {
+      throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);
+    }
+    throw err;
+  }
+  if (config) {
+    userConfig = config.value;
+  }
+  const astroConfig = await resolveConfig(userConfig, root, flags, configOptions.cmd);
+  return {
+    astroConfig,
+    userConfig,
+    flags,
+    root
+  };
+}
 async function loadConfig(configOptions) {
   const root = configOptions.cwd ? path.resolve(configOptions.cwd) : process.cwd();
   const flags = resolveFlags(configOptions.flags || {});
@@ -305,6 +338,7 @@ export {
   LEGACY_ASTRO_CONFIG_KEYS,
   loadConfig,
   mergeConfig,
+  openConfig,
   resolveConfig,
   resolveConfigURL,
   validateConfig

package/dist/core/dev/index.js

@@ -36,7 +36,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.26";
+  const currentVersion = "1.0.0-beta.27";
   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.26";
+  const version = "1.0.0-beta.27";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -199,7 +199,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.26"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.27"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/types/core/config.d.ts

@@ -243,7 +243,18 @@ interface LoadConfigOptions {
  * instead of the resolved config
  */
 export declare function resolveConfigURL(configOptions: Pick<LoadConfigOptions, 'cwd' | 'flags'>): Promise<URL | undefined>;
-/** Attempt to load an `astro.config.mjs` file */
+interface OpenConfigResult {
+    userConfig: AstroUserConfig;
+    astroConfig: AstroConfig;
+    flags: CLIFlags;
+    root: string;
+}
+/** Load a configuration file, returning both the userConfig and astroConfig */
+export declare function openConfig(configOptions: LoadConfigOptions): Promise<OpenConfigResult>;
+/**
+ * Attempt to load an `astro.config.mjs` file
+ * @deprecated
+ */
 export declare function loadConfig(configOptions: LoadConfigOptions): Promise<AstroConfig>;
 /** Attempt to resolve an Astro configuration object. Normalize, validate, and return. */
 export declare function resolveConfig(userConfig: AstroUserConfig, root: string, flags: CLIFlags | undefined, cmd: string): Promise<AstroConfig>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.26",
+  "version": "1.0.0-beta.27",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -70,7 +70,7 @@
     "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.9.4",
     "@astrojs/prism": "0.4.1",
-    "@astrojs/telemetry": "^0.1.1",
+    "@astrojs/telemetry": "^0.1.2",
     "@astrojs/webapi": "^0.11.1",
     "@babel/core": "^7.17.9",
     "@babel/generator": "^7.17.9",