From e24e2571e48639cfce88cdf960ef9c6a4e6607e8 Mon Sep 17 00:00:00 2001 From: Petter Kjelkenes Date: Wed, 17 Jun 2015 19:05:46 +0200 Subject: [PATCH] Commit integrated polymer 1.0, known problems see index.html vs application.hbs --- Brocfile.js | 30 +++++++++++++++++++++++++++++- app/elements.html | 14 ++++++++++++++ app/index.html | 14 +++++++++++++- app/router.js | 2 ++ app/templates/application.hbs | 11 ++++++++++- bower.json | 9 +++++++-- config/environment.js | 10 ++++++++++ package.json | 5 ++++- 8 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 app/elements.html diff --git a/Brocfile.js b/Brocfile.js index a69fc99..9a53f10 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -1,6 +1,9 @@ /* global require, module */ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); +var pickFiles = require('broccoli-static-compiler'); +var mergeTrees = require('broccoli-merge-trees'); +var vulcanize = require('broccoli-vulcanize'); var app = new EmberApp(); @@ -17,4 +20,29 @@ var app = new EmberApp(); // please specify an object with the list of modules as keys // along with the exports of each module as its value. -module.exports = app.toTree(); + +var inputTree = 'app'; +var options = { + input: 'elements.html', + output: 'assets/vulcanized.html', + excludes: [/^data:/, /^http[s]?:/, /^\//], + abspath: '', + stripExcludes: false, + stripComments: false, + inlineScripts: true, + inlineCss: true, + implicitStrip: false +}; + +var polymer = pickFiles('bower_components/', { + srcDir: '', + files: [ + 'webcomponentsjs/webcomponents.js', + // 'polymer/polymer.html' +// 'polymer/polymer.js' + ], + destDir: '/assets' +}); + +var polymerVulcanize = vulcanize(inputTree, options); +module.exports = mergeTrees([polymerVulcanize, polymer, app.toTree()]); diff --git a/app/elements.html b/app/elements.html new file mode 100644 index 0000000..42d36b2 --- /dev/null +++ b/app/elements.html @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/index.html b/app/index.html index f5b4d57..9b961ca 100644 --- a/app/index.html +++ b/app/index.html @@ -8,13 +8,25 @@ {{content-for 'head'}} + + {{content-for 'head-footer'}} - + + + + + + +
Polymer
+ + + + {{content-for 'body'}} diff --git a/app/router.js b/app/router.js index cef554b..b795dd2 100644 --- a/app/router.js +++ b/app/router.js @@ -6,6 +6,8 @@ var Router = Ember.Router.extend({ }); Router.map(function() { + this.route('test'); + }); export default Router; diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 05eb936..b69ee5c 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,12 @@ -

Welcome to Ember.js

+ + + + + +
Polymer
+ + + + {{outlet}} diff --git a/bower.json b/bower.json index 1950414..3d1556f 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-cli-polymer", "dependencies": { - "ember": "1.12.0", + "ember": "1.13.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": "1.0.0-beta.18", @@ -11,6 +11,11 @@ "ember-resolver": "~0.1.15", "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", - "qunit": "~1.17.1" + "qunit": "~1.17.1", + "polymer": "Polymer/polymer#^1.0.0", + "iron-elements": "PolymerElements/iron-elements#~1.0.0", + "paper-elements": "PolymerElements/paper-elements#~1.0.1", + "platinum-elements": "PolymerElements/platinum-elements#1.0.0", + "neon-elements": "PolymerElements/neon-elements#1.0.0" } } diff --git a/config/environment.js b/config/environment.js index 624c0a7..230d997 100644 --- a/config/environment.js +++ b/config/environment.js @@ -16,6 +16,16 @@ module.exports = function(environment) { APP: { // Here you can pass flags/options to your application instance // when it is created + }, + contentSecurityPolicy: { + 'default-src': "'none'", + 'script-src': "'self' 'unsafe-inline' 'unsafe-eval'", + 'font-src': "'self' http://fonts.gstatic.com", + 'connect-src': "'self' 127.0.0.1", + 'img-src': "'self' https://avatars.githubusercontent.com", + 'report-uri':"'localhost'", + 'style-src': "'self' 'unsafe-inline' http://fonts.googleapis.com", + 'frame-src': "'none'" } }; diff --git a/package.json b/package.json index 26d2a4e..0932eea 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,9 @@ "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.2" + "ember-export-application-global": "^1.0.2", + "broccoli-merge-trees": "^0.2.1", + "broccoli-static-compiler": "^0.2.1", + "broccoli-vulcanize": "^2.0.2" } }