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.

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

Jump to bottom

Make configuration of dynamic asset prefix easier #64

Closed
wants to merge 4 commits into from
Closed

Make configuration of dynamic asset prefix easier #64

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
941a48b
Make configuration of dynamic asset prefix feature easier and more cl…
peter-jozsa Jan 18, 2021
8b4d429
Bump package version to 1.6.3
peter-jozsa Jan 18, 2021
4f77f2b
Only include `basePath` in `publicPath` if both static and dynamic as…
peter-jozsa Jan 18, 2021
1dcde3d
Add warning to README about limitations of dynamic asset prefixing an…
peter-jozsa Jan 18, 2021
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
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ module.exports = ({ dynamicAssetPrefix = false, ...nextConfig } = {}) => {
options: {
limit: nextConfig.inlineImageLimit,
fallback: require.resolve("file-loader"),
publicPath: `${nextConfig.assetPrefix || nextConfig.basePath}/_next/static/images/`,
publicPath: `${(dynamicAssetPrefix ? '' : nextConfig.assetPrefix) || nextConfig.basePath}/_next/static/images/`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this nextConfig.basePath from this line. Because I think basePath is for links, not for assets which we're trying to solve with this package. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If no static asset prefix is provided and dynamic asset prefix is disabled we should still fallback to basePath becuase assets will be served under the basePath if it is specified. But if assetPrefix is set or dynamicAssetPrefix is truish then we don't have to take basePath into consideration: in this case static/dynamic assetPrefix should contain the basePath part too. I fix the condition here to represent this.

outputPath: `${isServer ? "../" : ""}static/images/`,
postTransformPublicPath: (p) => {
if (dynamicAssetPrefix && !nextConfig.assetPrefix) {
if (dynamicAssetPrefix) {
return `(require("next/config").default().publicRuntimeConfig.nextImagesAssetPrefix || '') + ${p}`
}
return p
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-images",
"version": "1.6.2",
"version": "1.6.3",
"main": "index.js",
"types": "index.d.ts",
"license": "MIT",
Expand Down