Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] broken assets path #6962

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/kit/src/core/config/index.spec.js
Expand Up @@ -121,6 +121,7 @@ const get_defaults = (prefix = '') => ({
pages: undefined
},
protocol: undefined,
relativeAssets: false,
router: undefined,
routes: undefined,
ssr: undefined,
Expand Down
2 changes: 2 additions & 0 deletions packages/kit/src/core/config/options.js
Expand Up @@ -304,6 +304,8 @@ const options = object(
`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
),

relativeAssets: boolean(false),

// TODO remove for 1.0
router: error((keypath) => `${keypath} has been moved to config.kit.browser.router`),

Expand Down
4 changes: 2 additions & 2 deletions packages/kit/src/exports/vite/build/utils.js
Expand Up @@ -110,7 +110,7 @@ export function get_default_build_config({ config, input, ssr, outDir }) {

return {
appType: 'custom',
base: ssr ? assets_base(config.kit) : './',
base: ssr ? assets_base(config.kit) : config.kit.relativeAssets === false ? '/' : './',
build: {
cssCodeSplit: true,
// don't use the default name to avoid collisions with 'static/manifest.json'
Expand Down Expand Up @@ -165,7 +165,7 @@ export function get_default_build_config({ config, input, ssr, outDir }) {
* @returns {string}
*/
export function assets_base(config) {
return (config.paths.assets || config.paths.base || '.') + '/';
return (config.paths.assets || config.paths.base) + (config.relativeAssets === false ? '/' : '.');
}

const method_names = new Set(['GET', 'HEAD', 'PUT', 'POST', 'DELETE', 'PATCH']);
Expand Down
1 change: 1 addition & 0 deletions packages/kit/types/index.d.ts
Expand Up @@ -217,6 +217,7 @@ export interface KitConfig {
onError?: PrerenderOnErrorValue;
origin?: string;
};
relativeAssets?: boolean;
serviceWorker?: {
register?: boolean;
files?: (filepath: string) => boolean;
Expand Down