Merge pull request #15 from Brightspace/dbatiste/hybrid-cleanup

Dbatiste/hybrid cleanup

.editorconfig

@@ -8,6 +8,6 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[{package.json,.travis.yml}]
+[{*.json,*.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 2

.travis.yml

@@ -1,2 +1,2 @@
 language: node_js
-node_js: stable
+node_js: node

CODEOWNERS

@@ -0,0 +1 @@
+*       @dbatiste @dlockhart

bower.json

@@ -3,28 +3,34 @@
   "description": "Shared Polymer behaviors for use in web components",
   "license": "Apache-2.0",
   "ignore": [
+    "demo",
     "test",
     ".editorconfig",
+    ".eslintrc.json",
     ".gitignore",
     ".travis.yml",
-    "package.json"
+    "package.json",
+    "polymer.json",
+    "wct.conf.json"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#1.9 - 2"
+    "polymer": "1.9 - 2"
   },
   "devDependencies": {
-    "iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2",
+    "iron-test-helpers": "^2.0.0",
     "web-component-tester": "^6.0.0"
   },
   "variants": {
-	"1.x": {
-	  "dependencies": {
-		"polymer": "Polymer/polymer#^1.9.1"
-	  },
-	  "devDependencies": {
-		"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.4.1",
-		"web-component-tester": "^5.0.0"
-	  }
-	}
+    "1.x": {
+      "dependencies": {
+        "polymer": "^1.9.1"
+      },
+      "resolutions": {
+        "webcomponentsjs": "^0.7"
+      }
+    }
+  },
+  "resolutions": {
+    "webcomponentsjs": "^v1.0.0"
   }
 }

package.json

@@ -16,9 +16,9 @@
   "author": "D2L Corporation",
   "license": "Apache-2.0",
   "devDependencies": {
-    "eslint": "^3.19.0",
-    "eslint-config-brightspace": "^0.2.4",
-    "eslint-plugin-html": "^3.0.0",
-    "polymer-cli": "^1.2.0"
+    "eslint": "^4.15.0",
+    "eslint-config-brightspace": "^0.4.0",
+    "eslint-plugin-html": "^4.0.1",
+    "polymer-cli": "^1.5.7"
   }
 }

wct.conf.json

@@ -7,7 +7,7 @@
 			"browsers": [
 				{
 					"browserName": "chrome",
-					"platform": "OS X 10.11",
+					"platform": "OS X 10.12",
 					"version": ""
 				},
 				{
@@ -17,7 +17,7 @@
 				},
 				{
 					"browserName": "firefox",
-					"platform": "OS X 10.11",
+					"platform": "OS X 10.12",
 					"version": ""
 				},
 				{
@@ -27,8 +27,8 @@
 				},
 				{
 					"browserName": "safari",
-					"platform": "OS X 10.11",
-					"version": "9.0"
+					"platform": "OS X 10.12",
+					"version": ""
 				},
 				{
 					"browserName": "microsoftedge",
@@ -39,11 +39,6 @@
 					"browserName": "internet explorer",
 					"platform": "Windows 10",
 					"version": "11"
-				},
-				{
-					"browserName": "internet explorer",
-					"platform": "Windows 8",
-					"version": "10"
 				}
 			]
 		}