Merge pull request #23 from BrightspaceUI/hybrid-dependencies

Hybridize dependencies
BrightspaceUI · Jun 12, 2017 · acc104f · acc104f
2 parents f438763 + 28228b9
commit acc104f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 7 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,6 +8,6 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[{package.json,.travis.yml}]
+[{bower.json,package.json,.travis.yml}]
 indent_style = space
 indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 bower_components/
+bower_components-1.x/
+bower-1.x.json
 node_modules/
 offscreen.css
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
 language: node_js
 node_js: stable
 sudo: false
+install:
+  - npm install
+  - polymer install --variants
diff --git a/bower.json b/bower.json
@@ -17,10 +17,23 @@
     "web component"
   ],
   "dependencies": {
-    "polymer": "^1.7.0"
+    "polymer": "Polymer/polymer#1.9 - 2"
   },
   "devDependencies": {
-    "d2l-demo-template": "~0.0.5"
+    "d2l-demo-template": "0.0.12 - 1.0.1"
+  },
+  "variants": {
+    "1.x": {
+      "dependencies": {
+        "polymer": "Polymer/polymer#1.9"
+      },
+      "devDependencies": {
+        "d2l-demo-template": "^0.0.12"
+      },
+      "resolutions": {
+        "webcomponentsjs": "^0.7"
+      }
+    }
   },
   "ignore": [
     ".editorconfig",

diff --git a/demo/index.html b/demo/index.html
@@ -2,15 +2,15 @@
 <head>
 	<title>d2l-offscreen</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<script src="https://s.brightspace.com/lib/webcomponentsjs/0.7.21/webcomponents.min.js"></script>
+	<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 	<link rel="import" href="../../d2l-demo-template/d2l-demo-template.html">
 	<link rel="import" href="../d2l-offscreen.html">
 </head>
 <body unresolved>
 
 	<d2l-demo-template title="d2l-offscreen">
 
-		<div class="d2l-demo-fixture">
+		<div slot="d2l-demo-fixture">
 			Some offscreen content: <d2l-offscreen>this should be offscreen</d2l-offscreen>
 		</div>
 

diff --git a/package.json b/package.json
@@ -30,10 +30,9 @@
   },
   "homepage": "https://github.com/BrightspaceUI/offscreen",
   "devDependencies": {
-    "bower": "^1.7.9",
     "eslint": "^2.5.3",
     "eslint-config-brightspace": "^0.2.1",
     "eslint-plugin-html": "^1.4.0",
-    "polymer-cli": "^0.16.0"
+    "polymer-cli": "^1.1.0"
   }
 }
diff --git a/polymer.json b/polymer.json
@@ -0,0 +1,7 @@
+{
+  "lint": {
+    "rules": [
+      "polymer-2-hybrid"
+    ]
+  }
+}