Resolve dependency conflict

mozilla · Jan 12, 2021 · 50f69fd · 50f69fd
1 parent cf0a3b1
commit 50f69fd
Show file tree

Hide file tree

Showing 58 changed files with 360 additions and 3,712 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,4 +5,4 @@ public/build/bundle.js
 scripts/build-glean-metadata.js
 src/ga.js
 storybook-static/*
-venv/*
+venv/*
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -17,7 +17,7 @@ module.exports = {
           style: "scss",
         },
         scss: {
-          prependData: `@import 'src/scss/protocol/includes/_lib.scss';`,
+          prependData: `@import 'node_modules/@mozilla-protocol/core/protocol/css/protocol.scss';`,
         },
         postcss: {
           plugins: [autoPrefixer],

diff --git a/.storybook/story.css b/.storybook/story.css
@@ -1 +0,0 @@
-@import "../node_modules/@mozilla-protocol/core/protocol/css/protocol.scss";
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		@import "../node_modules/@mozilla-protocol/core/protocol/css/protocol.scss";