use angular-material-styles npm package. closes #1069

miguelcobain · Mar 2, 2019 · 6a1fff3 · 6a1fff3
1 parent c1f8ae1
commit 6a1fff3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/app/styles/ember-paper.scss b/app/styles/ember-paper.scss
@@ -68,6 +68,4 @@
 
 // some overrides that are needed for ember-paper (avoid if possible)
 @import './overrides/paper-autocomplete';
-@import './overrides/paper-menu';
-
 
diff --git a/app/styles/overrides/paper-menu.scss b/app/styles/overrides/paper-menu.scss
diff --git a/index.js b/index.js
@@ -517,7 +517,7 @@ module.exports = {
 
     let filteredScssFiles = this.addStyles(coreScssFiles) || coreScssFiles;
 
-    let angularScssFiles = new Funnel(this.pathBase('angular-material-source'), {
+    let angularScssFiles = new Funnel(this.pathBase('angular-material-styles'), {
       files: filteredScssFiles,
       srcDir: '/src',
       destDir: 'angular-material',

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "qunit-dom": "^0.8.0"
   },
   "dependencies": {
-    "angular-material-source": "github:angular/material#v1.1.10",
+    "angular-material-styles": "^1.1.13",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-filter": "^1.3.0",
     "broccoli-funnel": "^2.0.1",

diff --git a/tests/dummy/app/components/submenu-item.js b/tests/dummy/app/components/submenu-item.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ''
+});
diff --git a/tests/dummy/app/controllers/demo/autocomplete.js b/tests/dummy/app/controllers/demo/autocomplete.js
@@ -46,7 +46,7 @@ export default Controller.extend({
     }
   },
 
-  arrayOfItems: Object.freeze(['Ember1.0', 'Ember2.0', 'Paper', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten', 'Eleven', 'Twelve']),
+  arrayOfItems: A(['Ember1.0', 'Ember2.0', 'Paper', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten', 'Eleven', 'Twelve']),
 
   /*
    * Array of static Objects.

diff --git a/yarn.lock b/yarn.lock
@@ -1032,9 +1032,10 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-"angular-material-source@github:angular/material#v1.1.10":
-  version "1.1.10"
-  resolved "https://codeload.github.com/angular/material/tar.gz/40c7853f738102ec1c68a8ce787fa90c04e9e2d8"
+angular-material-styles@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/angular-material-styles/-/angular-material-styles-1.1.13.tgz#0005e58ee74ffb3039ae4e0bab2aeab8904565f4"
+  integrity sha512-pdpl5OOSMuCZRS9bE1XgpmNTxtuiKZ5syLQ+LguU8B/gDNWUSDWuUBNQMA+/5yq07Oc5/BVFMIPvHtYbY0dbxA==
 
 ansi-escapes@^1.1.0:
   version "1.4.0"