Skip to content

Commit

Permalink
Allowing Vite to handle base config for deploying to subpaths (#3178)
Browse files Browse the repository at this point in the history
* Revert "Improvements to build and dev when building for subpaths (#3156)"

This reverts commit 637919c.

* letting Vite handle base paths

* test updates to expect Astro.request.url to no longer include subpaths

* bringing back the fix for including subpaths in injects scripts and styles

* fixing the static-build test to handle subpaths for injected CSS

* fixing asset import URLs when using base subpaths

* chore: fixing typo in the comments

* Astro needs to manage base in dev to maintain Astro.request.url

* fix: reverting dev routing tests to expect existing behavior

* reverting Astro global test to verify existing behavior

* chore: adding changeset

* test: update static-build tests to verify the subpath is used in asset imports
  • Loading branch information
Tony Sullivan authored May 5, 2022
1 parent f67832e commit 19e1686
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/pretty-pumpkins-work.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue that was breaking asset and stylesheet URLs when building for a subpath
2 changes: 1 addition & 1 deletion packages/astro/src/core/build/static-build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
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,
} as ViteConfigWithSSR;
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/src/core/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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]);

Expand Down Expand Up @@ -95,7 +95,7 @@ export const AstroConfigSchema = z.object({
.string()
.optional()
.default('/')
.transform((val) => appendForwardSlash(trimSlashes(val))),
.transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
trailingSlash: z
.union([z.literal('always'), z.literal('never'), z.literal('ignore')])
.optional()
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/test/static-build.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ describe('Static build', () => {
for (const link of links) {
const href = $(link).attr('href');

// The imported .scss file should include the base subpath in the href
expect(href.startsWith('/subpath/')).to.be.true;

/**
* The link should be built with the config's `base` included
* as a subpath.
Expand Down

0 comments on commit 19e1686

Please sign in to comment.