Skip to content
This repository has been archived by the owner on Apr 26, 2019. It is now read-only.

Commit

Permalink
reverting to polymer 1
Browse files Browse the repository at this point in the history
  • Loading branch information
moebiusmania committed May 26, 2017
1 parent 3adb2a7 commit 5f90c24
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 7,601 deletions.
19 changes: 0 additions & 19 deletions _bump.js

This file was deleted.

3 changes: 3 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';

export const Polymer = window.Polymer;
25 changes: 2 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
{
"name": "polymer-npm-wrapper",
<<<<<<< HEAD
"version": "v2.0.0-rc4",
=======
"version": "v1.0.1",
>>>>>>> polymer-1
"version": "v1.1",
"description": "Unofficial wrapper for getting latest version of Polymer from Git as NPM dependency and exporting it as ES2015 module.",
"main": "polymer-element.js",
"main": "index.js",
"repository": "https://github.com/contactlab/polymer-npm-wrapper.git",
"author": "Contactlab Product Team <developer@contactlab.com>",
"license": "Apache-2.0",
<<<<<<< HEAD
"scripts": {
"extract": "webpack",
"download": "npm install --save https://github.com/Polymer/polymer",
"bump": "node ./actions/bump"
},
=======
>>>>>>> polymer-1
"keywords": [
"polymer",
"npm",
Expand All @@ -32,15 +20,6 @@
"modules"
],
"dependencies": {
<<<<<<< HEAD
"@polymer/polymer": "git+https://github.com/Polymer/polymer.git",
"@webcomponents/shadycss": "https://github.com/webcomponents/shadycss"
},
"devDependencies": {
"wc-loader": "^1.1.3",
"webpack": "^2.4.1"
=======
"@polymer/polymer": "https://github.com/Polymer/polymer#7d460dd3fafa461eaef0a4ce647e4e244a87e65e"
>>>>>>> polymer-1
}
}
Loading

0 comments on commit 5f90c24

Please sign in to comment.