Merge pull request #62 from Neovici/gh61-1

[WIP] refs #61 - Update to 2.x native - part 1
Neovici · Dec 12, 2018 · de4b084 · de4b084
2 parents eae0db2 + fb1c5a6
commit de4b084
Show file tree

Hide file tree

Showing 8 changed files with 2,209 additions and 2,365 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+lts/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: node_js
-node_js: "lts/*"
-dist: trusty
-sudo: required
 env:
   global:
     - CC_TEST_REPORTER_ID=9798015be3ef64095a2bacb1046d8c981f8bd35e40fda757c431366e786ef566
+    - SAUCE_USERNAME=nomego
+    - secure: KI7zf2naQz37iqYPDaAKfEM4UCzTHJEE1O2FEFEXktkv0b4DDR8cqqgHLoLscfmyYrsszl9vbyelFU4osspmx5YmOIKeBXzCeKNHvGyWFpr5TViKYC5kIhW2NN8chqrtM243OPey/71VdvAYL8WXs8Hutpe39s0nLuD8NDJ0I0kao1Xsatjd0j4sj1JOkw1Yq+uaqJqEGREnVG0zg5I0TeitDyAh/SCsXLm0k6e1ZasHUSkNMVBNgXNDk2g9INoZCV741h8KL9Rr93jDbJrEusofl0NW3aUGtcxEVaK06Vu2WkUtaFYRYPu8unvqxkCEef/9X6IL7LOc+AM5KxbEEGL8TDlDMasGLD2xNkfAVBYGao2KPLbpGYSWRFfNnWjwBsRzTYspUxTPskwc2A95FuDJcfoVele906+oxjc7k/mUmCBU+gRspVKWyWGZD3IhD0rXdWN8BQu81wLwvP1YUpSV0eQel8Wlij14JlMuE9nDcvl5ABsAn5uLpMwsaiFYpk2rRdYEk6auG5xfrvR3lftloHHoHb69FkzjNBCo4gQGDXyz86EQcFEf8L7KB/r46brBz5Jaio1hQ4p/47eVlNo099a72E6gfF5XNTywPMm4+r4zE7caOEw24B1xzCZbuO8El+OdbTm82aAqkMlsq6/z068VXYNVYsE4u9SyNo8=
 addons:
   firefox: latest
   apt:
@@ -17,7 +16,6 @@ cache:
   directories:
     - node_modules
     - bower_components
-    - bower_components-1.x
     - ".eslintcache"
     - "$HOME/.cache/bower"
 before_script:
@@ -26,7 +24,7 @@ before_script:
   - ./cc-test-reporter before-build
   - yarn run lint
 script:
-- xvfb-run yarn test
+- yarn test
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 notifications:

diff --git a/bower.json b/bower.json
@@ -28,41 +28,5 @@
 		"iron-list": "PolymerElements/iron-list#1 - 2",
 		"web-animations-js": "web-animations/web-animations-js#^2.2",
 		"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
-	},
-	"variants": {
-		"1.x": {
-			"dependencies": {
-				"polymer": "Polymer/polymer#^1.9",
-				"cosmoz-templatize": "Neovici/cosmoz-templatize#^1.0.0",
-				"cosmoz-page-router": "Neovici/cosmoz-page-router#^1.0.0",
-				"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.6",
-				"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.7",
-				"paper-tabs": "PolymerElements/paper-tabs#^1.8.0",
-				"iron-selector": "PolymerElements/iron-selector#^1.5.3",
-				"paper-material": "PolymerElements/paper-material#^1.0.7",
-				"iron-icon": "PolymerElements/iron-icon#^1.0.13",
-				"iron-icons": "PolymerElements/iron-icons#^1.2.1"
-			},
-			"devDependencies": {
-				"paper-input":"PolymerElements/paper-input#^1.1.24",
-				"paper-toggle-button":"PolymerElements/paper-toggle-button#^1.3.0",
-				"paper-dropdown-menu":"PolymerElements/paper-dropdown-menu#^1.5.1",
-				"paper-listbox":"PolymerElements/paper-listbox#^1.1.3",
-				"paper-item":"PolymerElements/paper-item#^1.2.2",
-				"iron-component-page": "PolymerElements/iron-component-page#^1.1.9",
-				"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.2.5",
-				"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-				"web-component-tester": "^4.0.0",
-				"iron-list": "PolymerElements/iron-list#^1.4.6",
-				"web-animations-js": "web-animations/web-animations-js#^2.2",
-				"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
-			},
-			"resolutions": {
-				"webcomponentsjs": "^0.7"
-			}
-		}
-	},
-	"resolutions": {
-		"webcomponentsjs": "^1.0.0"
 	}
 }