Compare commits

...

5 Commits

Author SHA1 Message Date
Icedream fb63356f10
Use relative paths.
gitea/icedream/rekt-theme/master This commit looks good Details
2018-07-22 23:39:45 +02:00
Icedream c8a9204103
Use image-webpack-loader for image optimization. 2018-07-22 23:39:39 +02:00
Icedream 493cad28d3
Replace whitefog.png with a smaller variant. 2018-07-22 23:37:47 +02:00
Icedream d365ede8c2
Adjust output file paths. 2018-07-22 23:26:43 +02:00
Icedream 816d77c44b
Fix typo. 2018-07-22 23:00:08 +02:00
6 changed files with 1388 additions and 55 deletions

2
package-lock.json generated

File diff suppressed because one or more lines are too long

View File

@ -48,6 +48,7 @@
"execa": "^0.10.0", "execa": "^0.10.0",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"image-webpack-loader": "^4.3.1",
"jimp": "^0.2.28", "jimp": "^0.2.28",
"mini-css-extract-plugin": "^0.4.1", "mini-css-extract-plugin": "^0.4.1",
"node-sass": "^4.9.2", "node-sass": "^4.9.2",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 KiB

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -48,7 +48,7 @@
opacity: $icedream-fog-base-opacity + ($icedream-fog-base-opacity * .5); opacity: $icedream-fog-base-opacity + ($icedream-fog-base-opacity * .5);
} }
100% { 100% {
opacity: $icedream-fog-base-opacity - ($icedream-fog-base-opacity * .0.5); opacity: $icedream-fog-base-opacity - ($icedream-fog-base-opacity * .05);
} }
} }
@keyframes icedream-bg-slide { @keyframes icedream-bg-slide {

View File

@ -40,6 +40,8 @@ const {
ModuleConcatenationPlugin, ModuleConcatenationPlugin,
} = optimize; } = optimize;
const dj = 'icedream';
export default (options, { mode }) => { export default (options, { mode }) => {
const environment = new Environment({ const environment = new Environment({
// @HACK // @HACK
@ -59,39 +61,62 @@ export default (options, { mode }) => {
docker, docker,
} = environment; } = environment;
const baseOutputFilename = development const baseOutputFilepath = 'static/theme/[type]/[filename]';
? 'assets/dev/[name].dev.[ext]' const filenames = {
css: '[name].[ext]',
default: development
? '[name].dev.[ext]'
// Always use a hash (in production) to prevent files with the same name causing issues // Always use a hash (in production) to prevent files with the same name causing issues
: 'assets/prod/[chunkhash:2]/[name].[chunkhash:8].[ext]'; : '[name].[chunkhash:8].[ext]',
};
const webpackChunkFilename = baseOutputFilename function replaceField(string, name, value) {
.replace(/\[ext(.*?)\]/g, 'js'); const retval = string.replace(new RegExp(`\\[${name}(.*?)\\]`), value);
const webpackOutputFilename = webpackChunkFilename; debug('replaceField:', { args: { string, name, value } }, string, '=>', retval);
return retval;
}
const assetOutputFilename = baseOutputFilename function getOutputFilename(type) {
.replace(/\[chunkhash(.*?)\]/g, '[hash$1]'); let filename = baseOutputFilepath;
switch (type) {
case 'css':
filename = replaceField(filename, 'type', type);
break;
default:
filename = replaceField(filename, 'type', `${type}/${dj}`);
break;
}
filename = replaceField(filename, 'filename', filenames[type] || filenames.default);
return filename;
}
const cssOutputFileName = baseOutputFilename function getAssetOutputFilename(type) {
let filename = getOutputFilename(type);
filename = replaceField(filename, 'chunkhash', '[hash$1]');
return filename;
}
const cssOutputFileName = getOutputFilename('css')
.replace(/\[ext(.*?)\]/g, 'css'); .replace(/\[ext(.*?)\]/g, 'css');
// .replace(/\[chunkhash(.*?)\]/g, '[contenthash$1]'); // .replace(/\[chunkhash(.*?)\]/g, '[contenthash$1]');
const cssChunkOutputFileName = baseOutputFilename const cssChunkOutputFileName = getOutputFilename('css')
.replace(/\[chunkhash(.*?)\]/g, '[id$1]') .replace(/\[chunkhash(.*?)\]/g, '[id$1]')
.replace(/\[ext(.*?)\]/g, 'css'); .replace(/\[ext(.*?)\]/g, 'css');
// const cssOutputRebasePath = `${slash(path.relative(path.dirname(cssOutputFileName), ''))}/`; // const cssOutputRebasePath = `${slash(path.relative(path.dirname(cssOutputFileName), ''))}/`;
const cssOutputRebasePath = '/'; const cssOutputRebasePath = '../../../';
// Default options for file-loader // Default options for file-loader
const fileLoaderOptions = { const getFileLoaderOptions = type => ({
name: assetOutputFilename, name: getAssetOutputFilename(type),
publicPath: cssOutputRebasePath, publicPath: cssOutputRebasePath,
}; });
// Default options for url-loader // Default options for url-loader
const urlLoaderOptions = { const getUrlLoaderOptions = type => ({
...fileLoaderOptions, ...getFileLoaderOptions(type),
// limit: 1, // Don't inline anything (but empty files) by default // limit: 1, // Don't inline anything (but empty files) by default
limit: 4 * 1024, limit: 4 * 1024,
}; });
const config = { const config = {
name: 'frontend', name: 'frontend',
@ -168,22 +193,57 @@ export default (options, { mode }) => {
/\.jpe?g$/i, // jpeg /\.jpe?g$/i, // jpeg
].map(test => ({ ].map(test => ({
test, test,
use: [
{
loader: 'url-loader', loader: 'url-loader',
options: { options: {
...urlLoaderOptions, ...getUrlLoaderOptions('img'),
// fallback: 'responsive-loader', // fallback: 'responsive-loader',
}, },
},
{
loader: 'image-webpack-loader',
options: {
mozjpeg: {
progressive: true,
quality: 80,
},
optipng: {
enabled: true,
optimizationLevel: 7,
},
pngquant: {
enabled: false,
quality: '65-85',
speed: 2,
strip: true,
},
gifsicle: {
interlaced: false,
},
disable: development,
},
},
],
})), })),
...[ ...[
/\.(mp4|ogg|webm)$/i, // video /\.(mp4|ogg|webm)$/i, // video
/\.(eot|otf|ttf|woff|woff2)$/i, // fonts
/\.(wav|mp3|m4a|aac|oga)$/i, // audio /\.(wav|mp3|m4a|aac|oga)$/i, // audio
].map(test => ({ ].map(test => ({
test, test,
loader: 'url-loader', loader: 'url-loader',
options: urlLoaderOptions, options: getUrlLoaderOptions('media'),
})), })),
...[
/\.(eot|otf|ttf|woff|woff2)$/i, // fonts
].map(test => ({
test,
loader: 'url-loader',
options: getUrlLoaderOptions('font'),
})),
{ {
test: /\.css$/, test: /\.css$/,
use: environment.styleLoaders(), use: environment.styleLoaders(),
@ -205,8 +265,8 @@ export default (options, { mode }) => {
}, },
output: { output: {
filename: webpackOutputFilename, filename: replaceField(getOutputFilename('js'), 'ext', 'js'),
chunkFilename: webpackChunkFilename, chunkFilename: replaceField(getOutputFilename('js'), 'ext', 'js'),
path: path.join(__dirname, 'dist'), path: path.join(__dirname, 'dist'),
publicPath: '', publicPath: '',
globalObject: 'this', // https://github.com/webpack-contrib/worker-loader/issues/142#issuecomment-385764803 globalObject: 'this', // https://github.com/webpack-contrib/worker-loader/issues/142#issuecomment-385764803
@ -337,7 +397,7 @@ export default (options, { mode }) => {
}, },
devtool: server ? 'cheap-module-source-map' : 'source-map', devtool: server ? 'cheap-module-source-map' : 'source-map',
entry: { entry: {
app: [ [dj]: [
path.join(__dirname, 'src'), path.join(__dirname, 'src'),
], ],
}, },

1322
yarn.lock

File diff suppressed because it is too large Load Diff