Merge pull request #9 from bkawk/#6_data_components_join

#6 data components join

.babelrc

@@ -0,0 +1,3 @@
+{
+    "presets": [["es2015", {"modules": false}]]
+}

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1,10 @@
+*.min.js
+*.config.js
+environment*.js
+socket.io.js 
+build
+abi.js
+import-ecc.js
+import-socketio.js
+main.min.js
+*.ecc.js

.eslintrc.js

@@ -0,0 +1,18 @@
+module.exports = {
+    "extends": ["eslint:recommended", "google"],
+    "parser": "babel-eslint",
+    "env": {
+        "browser": true
+    },
+    "rules": {
+        "brace-style": "off",
+        "new-cap": ["error", { "capIsNewExceptions": ["Polymer"] }],
+        "require-jsdoc": "off",
+        "max-len": ["error", 100]
+    },
+    "globals": {
+        "Polymer": true,
+        "Promise": true,
+        "webpack": true,
+    }
+};

.gitignore

@@ -43,6 +43,9 @@ build/Release
 node_modules/
 jspm_packages/
 
+# build directories
+build/
+
 # Typescript v1 declaration files
 typings/
 

.travis.yml

@@ -0,0 +1,24 @@
+language: node_js
+sudo: required
+dist: trusty
+addons:
+  firefox: latest
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
+node_js:
+  - '6'
+cache:
+  directories:
+    - $HOME/.cache/bower
+    - node_modules
+install:
+  - npm install yarn -g
+  - npm install -g polymer-cli@next
+  - yarn install --flat
+before_script:
+  - npm run lint
+script:
+  - node --max-old-space-size=3072 ./node_modules/.bin/polymer build

README.md

@@ -24,6 +24,12 @@ First, install [Polymer CLI](https://github.com/Polymer/polymer-cli) using
 
 ### Setup
 
+Remove any old polymer cli if you have one installed
+
+    npm uninstall -g polymer-cli
+
+Make a clean install
+
     npm install -g polymer-cli@next
 
 Second, install [yarn](https://yarnpkg.com/en/docs/install) 

build/polymer.json

@@ -0,0 +1,57 @@
+{
+  "entrypoint": "index.html",
+  "shell": "src/swarm-city.js",
+  "fragments": [
+    "src/pages/terminal/page-welcome.js",
+    "src/pages/terminal/page-view2.js",
+    "src/pages/terminal/page-view3.js",
+    "src/pages/page-view404.js"
+  ],
+  "sources": [
+    "src/swarm-city.js",
+    "images/**/*",
+    "package.json",
+    "index.html",
+    "src/swarm-city.js",
+    "src/pages/terminal/page-welcome.js",
+    "src/pages/terminal/page-view2.js",
+    "src/pages/terminal/page-view3.js",
+    "src/pages/page-view404.js"
+  ],
+  "extraDependencies": [
+    "bower_components/webcomponentsjs/*.js",
+    "manifest.json",
+    "node_modules/@webcomponents/webcomponentsjs/**"
+  ],
+  "builds": [
+    {
+      "name": "es6-unbundled",
+      "browserCapabilities": [
+        "es2015",
+        "push"
+      ],
+      "js": {
+        "minify": true,
+        "compile": false
+      },
+      "css": {
+        "minify": true
+      },
+      "html": {
+        "minify": true
+      },
+      "bundle": false,
+      "addServiceWorker": true,
+      "addPushManifest": true,
+      "preset": "es6-unbundled"
+    }
+  ],
+  "lint": {
+    "rules": [
+      "polymer-3"
+    ]
+  },
+  "npm": true,
+  "componentDir": "node_modules/",
+  "moduleResolution": "node"
+}

package.json

@@ -2,16 +2,28 @@
   "name": "swarm-city",
   "license": "MIT",
   "devDependencies": {
-    "eslint": "^3.19.0",
-    "eslint-config-google": "^0.7.0",
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.2.2",
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.6.1",
+    "buffer": "^5.1.0",
+    "crypto": "^1.0.1",
+    "eslint": "^4.19.1",
+    "eslint-config-google": "^0.9.1",
     "eslint-plugin-html": "^2.0.0",
-    "wct-browser-legacy": "0.0.1-pre.11"
+    "ethereumjs-util": "^5.1.5",
+    "scryptsy": "^2.0.0",
+    "uuid": "^3.2.1",
+    "wct-browser-legacy": "0.0.1-pre.11",
+    "webpack": "^4.5.0",
+    "webpack-cli": "^2.0.14"
   },
   "scripts": {
     "lint": "npm run lint:javascript && polymer lint",
     "lint:javascript": "eslint . --ext js,html --ignore-path .gitignore",
     "test": "polymer test",
-    "test:integration": "polymer build # test that psk builds without error with the CLI"
+    "test:integration": "polymer build # test that psk builds without error with the CLI",
+    "webpack": "webpack"
   },
   "version": "1.0.0",
   "author": "@bkawk",
@@ -40,6 +52,83 @@
     "is-fullwidth-code-point": "2.0.0",
     "domelementtype": "1.3.0",
     "type-detect": "1.0.0",
-    "samsam": "1.1.2"
+    "samsam": "1.1.2",
+    "webpack/uglifyjs-webpack-plugin": "^1.1.8",
+    "buffer": "5.1.0",
+    "babylon": "7.0.0-beta.44",
+    "source-map": "0.6.1",
+    "chalk": "2.3.2",
+    "ansi-styles": "3.2.1",
+    "jsesc": "1.3.0",
+    "minimist": "1.2.0",
+    "pify": "3.0.0",
+    "inquirer": "5.2.0",
+    "shelljs": "0.8.1",
+    "strip-bom": "3.0.0",
+    "readable-stream": "2.3.5",
+    "string_decoder": "1.1.1",
+    "globby": "6.1.0",
+    "rimraf": "2.6.2",
+    "ansi-escapes": "3.1.0",
+    "cli-cursor": "2.1.0",
+    "figures": "2.0.0",
+    "run-async": "2.3.0",
+    "rx-lite": "4.0.8",
+    "restore-cursor": "2.0.0",
+    "onetime": "2.0.1",
+    "mute-stream": "0.0.7",
+    "resolve-from": "3.0.0",
+    "ajv": "6.4.0",
+    "ajv-keywords": "3.1.0",
+    "hash-base": "3.0.4",
+    "async": "2.6.0",
+    "commander": "2.9.0",
+    "diff": "3.5.0",
+    "has-flag": "3.0.0",
+    "micromatch": "3.1.10",
+    "punycode": "2.1.0",
+    "arr-diff": "4.0.0",
+    "array-unique": "0.3.2",
+    "braces": "2.3.2",
+    "define-property": "2.0.2",
+    "extend-shallow": "3.0.2",
+    "extglob": "2.0.4",
+    "kind-of": "6.0.2",
+    "fill-range": "4.0.0",
+    "isobject": "3.0.1",
+    "is-extendable": "1.0.1",
+    "is-number": "3.0.0",
+    "is-descriptor": "1.0.2",
+    "is-accessor-descriptor": "1.0.0",
+    "is-data-descriptor": "1.0.0",
+    "expand-brackets": "2.1.4",
+    "has-value": "1.0.0",
+    "set-value": "2.0.0",
+    "has-values": "1.0.0",
+    "y18n": "4.0.0",
+    "glob-parent": "3.1.0",
+    "is-glob": "4.0.0",
+    "is-extglob": "2.1.1",
+    "assert-plus": "0.2.0",
+    "extsprintf": "1.3.0",
+    "cross-spawn": "6.0.5",
+    "got": "8.3.0",
+    "jscodeshift": "0.5.0",
+    "log-symbols": "2.2.0",
+    "yargs": "11.1.0",
+    "lowercase-keys": "1.0.1",
+    "p-cancelable": "0.4.1",
+    "p-timeout": "2.0.1",
+    "url-parse-lax": "3.0.0",
+    "prepend-http": "2.0.0",
+    "symbol-observable": "1.0.1",
+    "colors": "1.2.1",
+    "recast": "0.14.7",
+    "ast-types": "0.11.3",
+    "indent-string": "2.1.0",
+    "vinyl": "1.2.0",
+    "clone": "1.0.4",
+    "clone-stats": "0.0.1",
+    "replace-ext": "0.0.1"
   }
 }

polymer.json

@@ -1,11 +1,11 @@
 {
   "entrypoint": "index.html",
-  "shell": "src/pages/swarm-city.html",
+  "shell": "src/swarm-city.js",
   "fragments": [
-    "src/pages/terminal/my-view1.js",
-    "src/pages/terminal/my-view2.js",
-    "src/pages/terminal/my-view3.js",
-    "src/pages/my-view404.js"
+    "src/pages/terminal/page-welcome.js",
+    "src/pages/terminal/page-view2.js",
+    "src/pages/terminal/page-view3.js",
+    "src/pages/page-view404.js"
   ],
   "sources": [
     "src/swarm-city.js",
@@ -22,6 +22,11 @@
       "addServiceWorker": true
     }
   ],
+  "lint": {
+    "rules": [
+      "polymer-3"
+    ]
+  },
   "moduleResolution": "node",
   "npm": true
 }