fix: properly import Ripple and its styles

hperrin · Sep 6, 2019 · 9588c8b · 9588c8b
1 parent b9b3e3d
commit 9588c8b
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 8 deletions.
diff --git a/packages/button/Button.svelte b/packages/button/Button.svelte
@@ -46,7 +46,7 @@
   import {forwardEventsBuilder} from '@smui/common/forwardEvents.js';
   import {exclude} from '@smui/common/exclude.js';
   import {useActions} from '@smui/common/useActions.js';
-  import Ripple from '@smui/ripple/index.js';
+  import Ripple from '@smui/ripple/bare.js';
 
   const forwardEvents = forwardEventsBuilder(current_component);
 

diff --git a/packages/button/_style.scss b/packages/button/_style.scss
@@ -1,4 +1,5 @@
 @import "@material/button/mdc-button";
+@import "@smui/ripple/style";
 @import "./mixins";
 @include smui-button-core-styles;
 @include smui-button__group-core-styles;
diff --git a/packages/card/PrimaryAction.svelte b/packages/card/PrimaryAction.svelte
@@ -13,7 +13,7 @@
   import {forwardEventsBuilder} from '@smui/common/forwardEvents.js';
   import {exclude} from '@smui/common/exclude.js';
   import {useActions} from '@smui/common/useActions.js';
-  import Ripple from '@smui/ripple/index.js';
+  import Ripple from '@smui/ripple/bare.js';
 
   const forwardEvents = forwardEventsBuilder(current_component);
 

diff --git a/packages/card/_style.scss b/packages/card/_style.scss
@@ -1,6 +1,7 @@
 @import "@material/card/mdc-card";
 @import "@smui/button/style";
 @import "@smui/icon-button/style";
+@import "@smui/ripple/style";
 
 .smui-card--padded, .smui-card__content, .smui-card__primary-action--padded {
   padding: 16px;

diff --git a/packages/fab/Fab.svelte b/packages/fab/Fab.svelte
@@ -16,7 +16,7 @@
   import {forwardEventsBuilder} from '@smui/common/forwardEvents.js';
   import {exclude} from '@smui/common/exclude.js';
   import {useActions} from '@smui/common/useActions.js';
-  import Ripple from '@smui/ripple/index.js';
+  import Ripple from '@smui/ripple/bare.js';
 
   const forwardEvents = forwardEventsBuilder(current_component);
 

diff --git a/packages/fab/_style.scss b/packages/fab/_style.scss
@@ -1,3 +1,4 @@
 @import "@material/fab/mdc-fab";
+@import "@smui/ripple/style";
 @import "./mixins";
 @include smui-fab-core-styles;
diff --git a/packages/icon-button/IconButton.svelte b/packages/icon-button/IconButton.svelte
@@ -44,7 +44,7 @@
   import {forwardEventsBuilder} from '@smui/common/forwardEvents.js';
   import {exclude} from '@smui/common/exclude.js';
   import {useActions} from '@smui/common/useActions.js';
-  import Ripple from '@smui/ripple/index.js';
+  import Ripple from '@smui/ripple/bare.js';
 
   const forwardEvents = forwardEventsBuilder(current_component, ['MDCIconButtonToggle:change']);
 

diff --git a/packages/icon-button/_style.scss b/packages/icon-button/_style.scss
@@ -1 +1,2 @@
 @import "@material/icon-button/mdc-icon-button";
+@import "@smui/ripple/style";
diff --git a/packages/list/Item.svelte b/packages/list/Item.svelte
@@ -62,7 +62,7 @@
   import {forwardEventsBuilder} from '@smui/common/forwardEvents.js';
   import {exclude} from '@smui/common/exclude.js';
   import {useActions} from '@smui/common/useActions.js';
-  import Ripple from '@smui/ripple/index.js';
+  import Ripple from '@smui/ripple/bare.js';
 
   const dispatch = createEventDispatcher();
   const forwardEvents = forwardEventsBuilder(current_component);

diff --git a/packages/list/_style.scss b/packages/list/_style.scss
@@ -1 +1,2 @@
 @import "@material/list/mdc-list";
+@import "@smui/ripple/style";
diff --git a/packages/ripple/bare.js b/packages/ripple/bare.js
@@ -0,0 +1,3 @@
+import Ripple from './Ripple.js';
+
+export default Ripple;
diff --git a/packages/ripple/index.js b/packages/ripple/index.js
@@ -1,4 +1,3 @@
-import Ripple from './Ripple.js';
 import './_index.scss';
-
-export default Ripple;
+export * from './bare.js';
+export {default} from './bare.js';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		@import "@material/icon-button/mdc-icon-button";
		@import "@smui/ripple/style";
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		@import "@material/list/mdc-list";
		@import "@smui/ripple/style";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Ripple from './Ripple.js';

		export default Ripple;