[increment patch] Merge pull request #38 from BrightspaceUI/mpharoah/…

…fix-dependencies Fix d2l-alert causing multiple definition errors
BrightspaceUI · Apr 29, 2020 · b4aea15 · b4aea15
2 parents 5da8111 + a9c821a
commit b4aea15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/d2l-alert.js b/d2l-alert.js
@@ -11,8 +11,8 @@ Polymer-based web component for a D2L alert
 */
 import '@polymer/polymer/polymer-legacy.js';
 
-import 'd2l-button/d2l-button-icon.js';
-import 'd2l-button/d2l-button-subtle.js';
+import '@brightspace-ui/core/components/button/button-icon.js';
+import '@brightspace-ui/core/components/button/button-subtle.js';
 import 'd2l-colors/d2l-colors.js';
 import 'd2l-typography/d2l-typography-shared-styles.js';
 import './localize-behavior.js';

diff --git a/demo/alert-toast.html b/demo/alert-toast.html
@@ -8,7 +8,7 @@
 		<script type="module" src="../../@polymer/iron-demo-helpers/demo-pages-shared-styles.js"></script>
 		<script type="module" src="../../@polymer/iron-demo-helpers/demo-snippet.js"></script>
 		<script type="module" src="../../d2l-typography/d2l-typography.js"></script>
-		<script type="module" src="../../d2l-button/d2l-button.js"></script>
+		<script type="module" src="../../@brightspace-ui/core/components/button/button.js"></script>
 		<script type="module" src="../d2l-alert-toast.js"></script>
 		<!-- FIXME(polymer-modulizer):
 		These imperative modules that innerHTML your HTML are
@@ -92,7 +92,7 @@ <h3>Default without close button</h3>
 import '@polymer/iron-demo-helpers/demo-pages-shared-styles.js';
 import '@polymer/iron-demo-helpers/demo-snippet.js';
 import 'd2l-typography/d2l-typography.js';
-import 'd2l-button/d2l-button.js';
+import '@brightspace-ui/core/components/button/button.js';
 import '../d2l-alert-toast.js';
 document.body.classList.add('d2l-typography');
 document.body.addEventListener('d2l-alert-button-pressed', function() {

diff --git a/package.json b/package.json
@@ -39,9 +39,7 @@
   "dependencies": {
     "@brightspace-ui/core": "^1",
     "@polymer/polymer": "^3.0.0",
-    "d2l-button": "BrightspaceUI/button#semver:^5",
     "d2l-colors": "BrightspaceUI/colors#semver:^4",
-    "d2l-icons": "BrightspaceUI/icons#semver:^6",
     "d2l-localize-behavior": "BrightspaceUI/localize-behavior#semver:^2",
     "d2l-typography": "BrightspaceUI/typography#semver:^7"
   }