fix(bootstrap4-theme): downgraded css-loader to fix storybook errors

ASU · Sep 10, 2020 · 2531aaa · 2531aaa
1 parent 0c326d2
commit 2531aaa
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 295 deletions.
diff --git a/package.json b/package.json
@@ -76,8 +76,7 @@
     "compression": "^1.7.4",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
-    "css-loader": "^4.2.2",
-    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "css-loader": "^3.6.0",
     "del": "^4.1.0",
     "dotenv": "^8.0.0",
     "emotion-server": "^10.0.27",
@@ -119,9 +118,10 @@
     "jest-puppeteer": "^4.4.0",
     "jquery": "^3.4.1",
     "lerna": "^3.21.0",
-    "mini-css-extract-plugin": "^0.8.0",
+    "mini-css-extract-plugin": "^0.11.1",
     "node-sass": "^4.14.1",
     "nunjucks": "^3.2.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
     "popper.js": "^1.15.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
@@ -136,7 +136,7 @@
     "regenerator-runtime": "^0.13.1",
     "sass-lint": "^1.13.1",
     "sass-lint-auto-fix": "^0.17.0",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^10.0.2",
     "semantic-release": "^17.0.8",
     "semantic-release-monorepo": "^7.0.2",
     "shx": "^0.3.2",

diff --git a/packages/bootstrap4-theme/.storybook/main.js b/packages/bootstrap4-theme/.storybook/main.js
@@ -1,4 +1,4 @@
-const path = require("path");
+const path = require('path');
 
 module.exports = {
   stories: [
@@ -8,6 +8,7 @@ module.exports = {
     '../stories/**/*.stories.[tj]s',
   ],
   addons: [
+
     '@storybook/addon-a11y',
     '@storybook/addon-docs',
     '@storybook/addon-viewport',
@@ -21,4 +22,26 @@ module.exports = {
       },
     },
   ],
+  webpackFinal: async (config, { configType }) => {
+    // `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
+    // You can change the configuration based on that.
+    // 'PRODUCTION' is used when building the static version of storybook.
+
+    // Make whatever fine-grained changes you need
+    config.module.rules.push({
+      test: /\.scss$/,
+      use: ['style-loader', {
+        loader: 'css-loader',
+        options: {
+        },
+      }, {
+        loader: 'sass-loader',
+        options: {
+        },
+      }]
+    });
+
+    // Return the altered config
+    return config;
+  },
 };
diff --git a/packages/bootstrap4-theme/.storybook/preview.js b/packages/bootstrap4-theme/.storybook/preview.js
@@ -8,8 +8,8 @@ addParameters({
   },
 });
 
-import '!style-loader!css-loader!sass-loader!./scss-loader.scss';
-import '!style-loader!css-loader!sass-loader!../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss';
+import './scss-loader.scss';
+import '../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 import jquery from 'jquery';
 global.$ = jquery;

diff --git a/packages/bootstrap4-theme/src/scss/design-tokens/_variables.scss b/packages/bootstrap4-theme/src/scss/design-tokens/_variables.scss
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Wed, 29 Jul 2020 19:18:04 GMT
+// Generated on Thu, 10 Sep 2020 21:41:59 GMT
 
 $uds-asset-font-icon-name: "FontAwesome";
 $uds-asset-font-icon-ttf: "assets/fontawesome/webfonts/fa-regular-400.ttf";

diff --git a/packages/cookie-consent/src/styles.css b/packages/cookie-consent/src/styles.css
@@ -1,4 +1,4 @@
-@import "cookieconsent/build/cookieconsent.min.css";
+@import "~cookieconsent/build/cookieconsent.min.css";
 
 /* ASU Customization */
 .cc-window.cc-theme-classic.cc-type-info {