Merge pull request #24 from BrightspaceUI/dbatiste/hybrid-cleanup

Dbatiste/hybrid cleanup
BrightspaceUI · Jan 17, 2018 · e056303 · e056303
2 parents a25a6bc + bb3280b
commit e056303
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -24,13 +24,22 @@ Include the [webcomponents.js](http://webcomponents.org/polyfills/) "lite" polyf
 
 ```html
 <head>
-	<script src="bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
-	<link rel="import" href="bower_components/d2l-loading-spinner/d2l-loading-spinner.html">
+  <script src="../webcomponentsjs/webcomponents-lite.js"></script>
+  <link rel="import" href="../d2l-loading-spinner/d2l-loading-spinner.html">
 </head>
 ```
 
-The component can now be used as shown below:
-
+<!---
+```
+<custom-element-demo>
+  <template>
+    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
+    <link rel="import" href="d2l-loading-spinner.html">
+    <next-code-block></next-code-block>
+  </template>
+</custom-element-demo>
+```
+-->
 ```html
 <d2l-loading-spinner></d2l-loading-spinner>
 ```
@@ -48,7 +57,7 @@ Or by setting the `--d2l-loading-spinner-size` [CSS property](https://www.polyme
 ```html
 <custom-style>
 .huge-spinner {
-	--d2l-loading-spinner-size: 400px;
+  --d2l-loading-spinner-size: 400px;
 }
 </custom-style>
 <d2l-loading-spinner class="huge-spinner"></d2l-loading-spinner>
@@ -67,7 +76,7 @@ Or by setting the `--d2l-loading-spinner-color` [CSS property](https://www.polym
 ```html
 <custom-style>
 .red-spinner {
-	--d2l-loading-spinner-color: red;
+  --d2l-loading-spinner-color: red;
 }
 </custom-style>
 <d2l-loading-spinner class="red-spinner"></d2l-loading-spinner>

diff --git a/bower.json b/bower.json
@@ -10,38 +10,31 @@
   ],
   "license": "Apache-2.0",
   "ignore": [
+    "demo",
     ".editorconfig",
+    ".eslintrc.json",
     ".gitattributes",
     ".gitignore",
     ".travis.yml",
-    "CODEOWNERS",
-    "package.json"
+    "loading-spinner.gif",
+    "package.json",
+    "polymer.json"
   ],
   "dependencies": {
-    "d2l-colors": "^2.4.0 || ^3.1.0",
-    "polymer": "Polymer/polymer#1 - 2"
+    "d2l-colors": "^3.1.2",
+    "polymer": "1.9.3 - 2"
   },
   "devDependencies": {
-    "d2l-typography": "^6.0.0 || ^5.4.0",
-    "iron-component-page": "PolymerElements/iron-component-page#1 - 2",
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#1 - 2",
+    "d2l-typography": "^6.0.0",
+    "iron-component-page": "^2.0.0",
+    "iron-demo-helpers": "^2.0.0",
     "iron-test-helpers": "^2.0.0",
-    "web-component-tester": "^6.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
+    "web-component-tester": "^6.0.0"
   },
   "variants": {
     "1.x": {
       "dependencies": {
-        "d2l-colors": "^2.4.0",
-        "polymer": "Polymer/polymer#^1.9.3"
-      },
-      "devDependencies": {
-        "d2l-typography": "^5.4.0",
-        "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
-        "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
-        "iron-test-helpers": "^2.0.0",
-        "web-component-tester": "^4.0.0",
-        "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+        "polymer": "^1.9.3"
       },
       "resolutions": {
         "webcomponentsjs": "^0.7"

diff --git a/package.json b/package.json
@@ -4,10 +4,9 @@
   "private": true,
   "scripts": {
     "postinstall": "polymer install --variants",
-    "test": "npm run lint",
-    "lint": "npm run lint:html && npm run lint:wc",
-    "lint:html": "eslint *.html demo/*.html",
-    "lint:wc": "polymer lint -i *.html"
+    "test": "npm run test:lint:js && npm run test:lint:wc",
+    "test:lint:js": "eslint *.html",
+    "test:lint:wc": "polymer lint -i *.html"
   },
   "repository": {
     "type": "git",
@@ -21,9 +20,9 @@
   "author": "D2L Corporation",
   "license": "Apache-2.0",
   "devDependencies": {
-    "eslint": "^4.3.0",
-    "eslint-config-brightspace": "^0.3.1",
-    "eslint-plugin-html": "^3.1.1",
-    "polymer-cli": "^1.3.1"
+    "eslint": "^4.15.0",
+    "eslint-config-brightspace": "^0.4.0",
+    "eslint-plugin-html": "^4.0.1",
+    "polymer-cli": "^1.5.7"
   }
 }