diff --git a/app/javascript/application.js b/app/javascript/application.js index 1a659a49..5ced5466 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -14,8 +14,8 @@ import * as bootstrap from 'bootstrap/dist/js/bootstrap.bundle'; import 'chosen-js/chosen.jquery'; import 'jstree'; import 'underscore'; -import 'd3'; -import '@sentry/browser'; +import * as d3 from 'd3'; +import * as Sentry from '@sentry/browser'; import 'sorttable'; window.bootstrap = bootstrap; // Publish bootstrap in global namespace window._ = _; // Publish underscore's `_` in global namespace diff --git a/app/javascript/vis.js b/app/javascript/vis.js index 3d22b005..8e81ed90 100644 --- a/app/javascript/vis.js +++ b/app/javascript/vis.js @@ -1,7 +1,7 @@ /* eslint no-console:0 */ // JS -import 'vis' +import * as vis from 'vis'; window.vis = vis; // CSS diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js index 3ea79661..953907e6 100644 --- a/config/webpack/webpack.config.js +++ b/config/webpack/webpack.config.js @@ -19,6 +19,9 @@ const relative_url_root = process.env.RAILS_RELATIVE_URL_ROOT || ''; const public_output_path = webpackConfig.output.publicPath; const envConfig = module.exports = { + node: { + global: false, + }, module: { rules: [ erb @@ -41,20 +44,6 @@ const envConfig = module.exports = { hints: false }, plugins: [ - new webpack.ProvidePlugin({ - $: 'jquery', - JQuery: 'jquery', - jQuery: 'jquery', - jquery: 'jquery', - 'window.Tether': "tether", - Popper: ['popper.js', 'default'], - _: 'underscore', - vis: 'vis', - d3: 'd3', - Sentry: '@sentry/browser', - Sortable: 'sortablejs', - sorttable: 'sorttable', - }), new CompressionPlugin(), new MiniCssExtractPlugin(), new SubresourceIntegrityPlugin(),