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.

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

Use node resolve on Babel plugins and presets #4405

Merged
merged 1 commit into from
Nov 23, 2018
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions buildtools/webpack.commons.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const providePlugin = new webpack.ProvidePlugin({
$: 'jquery',
});

const babelPresets = [['@babel/preset-env', {
const babelPresets = [[require.resolve('@babel/preset-env'), {
'targets': {
'browsers': ['last 2 versions', 'Firefox ESR', 'ie 11'],
},
Expand Down Expand Up @@ -87,7 +87,7 @@ const config = function(hardSourceConfig, babelLoaderCacheDirectory) {
comments: false,
cacheDirectory: babelLoaderCacheDirectory,
presets: babelPresets,
plugins: ['@camptocamp/babel-plugin-angularjs-annotate'],
plugins: [require.resolve('@camptocamp/babel-plugin-angularjs-annotate')],
}
}
};
Expand All @@ -101,8 +101,8 @@ const config = function(hardSourceConfig, babelLoaderCacheDirectory) {
cacheDirectory: babelLoaderCacheDirectory,
presets: babelPresets,
plugins: [
'@babel/plugin-syntax-object-rest-spread',
'@babel/plugin-transform-spread',
require.resolve('@babel/plugin-syntax-object-rest-spread'),
require.resolve('@babel/plugin-transform-spread'),
]
}
}
Expand Down