Merge pull request #1038 from mjschock/resolveUpdate

Move *.min import resolution to webpack config
bigcommerce · Jul 6, 2017 · 5168a65 · 5168a65
2 parents 55b2985 + bdfc765
commit 5168a65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/assets/js/theme/common/carousel.js b/assets/js/theme/common/carousel.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import 'slick-carousel/slick/slick.min';
+import 'slick-carousel';
 
 export default function () {
     const $carousel = $('[data-slick]');

diff --git a/assets/js/theme/global.js b/assets/js/theme/global.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import './common/select-option-plugin';
-import 'html5-history-api/history.min';
+import 'html5-history-api';
 import PageManager from './page-manager';
 import quickSearch from './global/quick-search';
 import currencySelector from './global/currency-selector';

diff --git a/webpack.conf.js b/webpack.conf.js
@@ -65,8 +65,10 @@ module.exports = {
     ],
     resolve: {
         alias: {
+            'html5-history-api': path.resolve(__dirname, 'node_modules/html5-history-api/history.min.js'),
             jquery: path.resolve(__dirname, 'node_modules/jquery/dist/jquery.min.js'),
             jstree: path.resolve(__dirname, 'node_modules/jstree/dist/jstree.min.js'),
+            'slick-carousel': path.resolve(__dirname, 'node_modules/slick-carousel/slick/slick.min.js'),
         },
     },
     watch: false,