michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allowing Vite to handle base config for deploying to subpaths (#3178)

Browse source 
* Revert "Improvements to build and dev when building for subpaths (#3156)"

This reverts commit 637919c8b6.

* 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
This commit is contained in:
Tony Sullivan 2022-05-05 22:39:16 +00:00 committed by GitHub
parent f67832ebf7
commit 19e1686b87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/pretty-pumpkins-work.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes an issue that was breaking asset and stylesheet URLs when building for a subpath

2
packages/astro/src/core/build/static-build.ts
View file

@ -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;

4
packages/astro/src/core/config.ts
View file

@ -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]);
@ -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()

3
packages/astro/test/static-build.test.js
View file

@ -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.