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

Webpack comment, configuration #5357

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Webpack comment, configuration #5357

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7dfa2
Add some comments
sbrunner Dec 13, 2019
4b88356
Add some configuration
sbrunner Dec 13, 2019
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
73 changes: 40 additions & 33 deletions buildtools/webpack.commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,45 @@ module.exports = function(config) {
}
}
};
const plugins = [
providePlugin,
new SassPlugin({
filename: devMode ? '[name].css' : '[name].[hash:6].css',
assetname: '[name].[hash:6].[ext]',
//tempfile: '/tmp/t.scss',
blacklistedChunks: ['commons'],
filesOrder: (chunk, chunksFiles) => {
const files = chunksFiles.commons
? chunksFiles[chunk.name].concat(chunksFiles.commons)
: chunksFiles[chunk.name];
files.sort(get_comp(config.fist_scss || [
// ngeo default apps
'/apps/desktop/sass/vars_desktop.scss',
'/apps/desktop_alt/sass/vars_desktop_alt.scss',
'/apps/iframe_api/sass/vars_iframe_api.scss',
'/apps/mobile/sass/vars_mobile.scss',
'/apps/mobile_alt/sass/vars_mobile_alt.scss',
'/apps/oeedit/sass/vars_oeedit.scss',
// project sass vars files
'/apps/sass/var',
'/controllers/',
'/vars.scss',
'/vars_only.scss',
'/common_dependencies.scss',
], config.last_scss || [
// project and ngeo default apps other sass files
'/apps/',
]));
//console.log(files);
return files;
}
}),
new webpack.IgnorePlugin(/^\.\/locale$/, /node_modules\/moment\/src\/lib\/locale$/),
];
if (config.nodll != true) {
Copy link
Member

Choose a reason for hiding this comment

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

Is it a boolean?

Copy link
Member Author

Choose a reason for hiding this comment

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

Boolean or undefined ...

plugins.push(dllPlugin);
}


return {
context: path.resolve(__dirname, '../'),
Expand All @@ -150,39 +189,7 @@ module.exports = function(config) {
otherRule,
]
},
plugins: [
dllPlugin,
providePlugin,
new SassPlugin({
filename: devMode ? '[name].css' : '[name].[hash:6].css',
assetname: '[name].[hash:6].[ext]',
//tempfile: '/tmp/t.scss',
blacklistedChunks: ['commons'],
filesOrder: (chunk, chunksFiles) => {
const files = chunksFiles.commons
? chunksFiles[chunk.name].concat(chunksFiles.commons)
: chunksFiles[chunk.name];
files.sort(get_comp([
'/apps/desktop/sass/vars_desktop.scss',
'/apps/desktop_alt/sass/vars_desktop_alt.scss',
'/apps/iframe_api/sass/vars_iframe_api.scss',
'/apps/mobile/sass/vars_mobile.scss',
'/apps/mobile_alt/sass/vars_mobile_alt.scss',
'/apps/oeedit/sass/vars_oeedit.scss',
'/apps/sass/var',
'/controllers/',
'/vars.scss',
'/vars_only.scss',
'/common_dependencies.scss',
], [
'/apps/',
]));
//console.log(files);
return files;
}
}),
new webpack.IgnorePlugin(/^\.\/locale$/, /node_modules\/moment\/src\/lib\/locale$/),
],
plugins: plugins,
resolve: {
modules: [
'../node_modules',
Expand Down