Skip to content

fix(gatsby): don't output file-loader assets to .cache #37284

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 19, 2022
Merged

fix(gatsby): don't output file-loader assets to .cache #37284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9889385
fix(gatsby): don't output file-loader assets to .cache
pieh Dec 16, 2022
1086115
use adjusted settings also for develop-html stage, as that one uses R…
pieh Dec 16, 2022
7a4bbfd
update comment
pieh Dec 16, 2022
360c9bc
some types for file-loader common options
pieh Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions packages/gatsby/src/utils/webpack-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { IProgram, Stage } from "../commands/types"
import { eslintConfig, eslintRequiredConfig } from "./eslint-config"
import { store } from "../redux"
import type { RuleSetUseItem } from "webpack"
import { ROUTES_DIRECTORY } from "../constants"

type Loader = string | { loader: string; options?: { [name: string]: any } }
type LoaderResolver<T = Record<string, unknown>> = (options?: T) => Loader
Expand Down Expand Up @@ -203,6 +204,25 @@ export const createWebpackUtils = (
return rule
}

const fileLoaderCommonOptions: {
name: string
publicPath?: string
outputPath?: string
} = {
name: `${assetRelativeRoot}[name]-[hash].[ext]`,
}

if (stage === `build-html` || stage === `develop-html`) {
// build-html and develop-html outputs to `.cache/page-ssr/routes/` (ROUTES_DIRECTORY)
// so this config is setting it to output assets to `public` (outputPath)
// while preserving "url" (publicPath)
fileLoaderCommonOptions.outputPath = path.relative(
ROUTES_DIRECTORY,
`public`
)
fileLoaderCommonOptions.publicPath = `/`
}

const loaders: ILoaderUtils = {
json: (options = {}) => {
return {
Expand Down Expand Up @@ -349,7 +369,7 @@ export const createWebpackUtils = (
return {
loader: require.resolve(`file-loader`),
options: {
name: `${assetRelativeRoot}[name]-[hash].[ext]`,
...fileLoaderCommonOptions,
...options,
},
}
Expand All @@ -360,7 +380,7 @@ export const createWebpackUtils = (
loader: require.resolve(`url-loader`),
options: {
limit: 10000,
name: `${assetRelativeRoot}[name]-[hash].[ext]`,
...fileLoaderCommonOptions,
fallback: require.resolve(`file-loader`),
...options,
},
Expand Down