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

Allow people to include/exclude folders in webpack #161

Closed
wants to merge 1 commit into from
Closed

Allow people to include/exclude folders in webpack #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Allow people to include/exclude folders in webpack
  • Loading branch information
@bjonamu
bjonamu committed Jun 1, 2020
commit a64f54a23576c2a7e28ba8d7b94e8fda58206318
14 changes: 8 additions & 6 deletions lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* @param {object} nextConfig - next.js configuration object
* @returns {object} enriched config
*/
const getConfig = nextConfig => ({
const getConfig = (nextConfig) => ({
optimizeImages: true,
optimizeImagesInDev: false,
handleImages: ['jpeg', 'png', 'svg', 'webp', 'gif'],
imagesFolder: 'images',
imagesName: '[name]-[hash].[ext]',
handleImages: ["jpeg", "png", "svg", "webp", "gif"],
imagesFolder: "images",
imagesName: "[name]-[hash].[ext]",
removeOriginalExtension: false,
inlineImageLimit: 8192,
defaultImageLoader: 'img-loader',
defaultImageLoader: "img-loader",
mozjpeg: {},
optipng: {},
pngquant: {},
Expand All @@ -23,7 +23,9 @@ const getConfig = nextConfig => ({
},
svgo: {},
svgSpriteLoader: {
symbolId: '[name]-[hash:8]',
options: {
symbolId: "[name]-[hash:8]",
},
},
webp: {},
...nextConfig,
Expand Down
46 changes: 28 additions & 18 deletions lib/loaders/svg-sprite-loader/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const path = require('path');
const path = require("path");

/**
* Returns the resource query definition for an svg sprite image
Expand All @@ -13,24 +13,34 @@ const getSvgSpriteLoaderResourceQuery = (
nextConfig,
detectedLoaders,
imgLoaderOptions,
optimize,
) => ({
resourceQuery: /sprite/,
use: [
{
loader: 'svg-sprite-loader',
options: {
runtimeGenerator: require.resolve(path.resolve(__dirname, 'svg-runtime-generator.js')),
...(nextConfig.svgSpriteLoader || {}),
optimize
) => {
const svgSpriteLoader = nextConfig.svgSpriteLoader || {};
return {
resourceQuery: /sprite/,
use: [
{
...svgSpriteLoader,
loader: "svg-sprite-loader",
options: {
runtimeGenerator: require.resolve(
path.resolve(__dirname, "svg-runtime-generator.js")
),
...(svgSpriteLoader.options || {}),
},
},
},
].concat(detectedLoaders.svg && optimize ? [
{
loader: 'img-loader',
options: imgLoaderOptions,
},
] : []),
});
].concat(
detectedLoaders.svg && optimize
? [
{
loader: "img-loader",
options: imgLoaderOptions,
},
]
: []
),
};
};

module.exports = {
getSvgSpriteLoaderResourceQuery,
Expand Down