Merge pull request #1133 from creative-commoners/pulls/1.6/webpack-co…

…nfig-170 MNT Upgrade webpack-config
silverstripe · Oct 5, 2020 · 3643b40 · 3643b40
2 parents 6610cdf + 8f8dad6
commit 3643b40
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/bundles/bundle.js b/client/src/bundles/bundle.js
@@ -43,6 +43,7 @@ require('expose-loader?Loading!components/Loading/Loading');
 require('expose-loader?TextField!components/TextField/TextField');
 require('expose-loader?LiteralField!components/LiteralField/LiteralField');
 require('expose-loader?Toolbar!components/Toolbar/Toolbar');
+require('expose-loader?FileStatusIcon!components/FileStatusIcon/FileStatusIcon');
 require('expose-loader?Breadcrumb!components/Breadcrumb/Breadcrumb');
 require('expose-loader?ResizeAware!components/ResizeAware/ResizeAware');
 require('expose-loader?TabsActions!state/tabs/TabsActions');
@@ -76,7 +77,6 @@ require('expose-loader?TinyMCEActionRegistrar!lib/TinyMCEActionRegistrar');
 require('expose-loader?ShortcodeSerialiser!lib/ShortcodeSerialiser');
 require('expose-loader?formatWrittenNumber!lib/formatWrittenNumber');
 require('expose-loader?withDragDropContext!lib/withDragDropContext');
-require('expose-loader?FileStatusIcon!components/FileStatusIcon/FileStatusIcon');
 
 // Legacy CMS
 require('../legacy/sspath');

diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
   },
   "devDependencies": {
     "@silverstripe/eslint-config": "^0.0.5",
-    "@silverstripe/webpack-config": "^1.5.0",
+    "@silverstripe/webpack-config": "^1.7.0",
     "@storybook/addon-actions": "^3.4.10",
     "@storybook/addon-knobs": "^3.4.10",
     "@storybook/addon-notes": "^3.4.10",

diff --git a/yarn.lock b/yarn.lock
@@ -74,10 +74,10 @@
     eslint-plugin-jsx-a11y "^5.1.1"
     eslint-plugin-react "^7.3.0"
 
-"@silverstripe/webpack-config@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-1.5.0.tgz#638f2c39d710acebfcdf7c6c50adc72e0e51af19"
-  integrity sha512-Cbh7uQ0A83Xazh3T0IF94Hk+v/ecx8Huf0YzVQMi0TI+bgY/zYc1EeCVeujrNW5eQMFnAGEt6EqQFSBZCIHpCw==
+"@silverstripe/webpack-config@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-1.7.0.tgz#1fed0775d95c9120e4fc2031a611c50dc6c4b3f0"
+  integrity sha512-lwtiEW+4oRQzNL24fKRnTffIPE5FCKJCCL2IuOIDdrIDoxxm381fzkcwWuWfhK7Oxbjz9A49UIDfzkUQ1/oW5g==
   dependencies:
     autoprefixer "^6.4.0"
     babel-core "^6.24.1"