Skip to content
This repository has been archived by the owner on May 19, 2021. It is now read-only.

Fix addon 🙌🏻 #60

Merged
merged 9 commits into from
Jun 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
38 changes: 0 additions & 38 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "4"
- "6"

sudo: false

Expand Down
8 changes: 3 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{
"name": "ember-polymer",
"dependencies": {
"ember": "^2.10.2",
"ember-cli-shims": "0.1.3",
"ember-qunit-notifications": "0.1.0",
"polymer": "Polymer/polymer#~1.7.1",
"polymer": "Polymer/polymer#~1.9.1",
"paper-elements": "PolymerElements/paper-elements#^1.0.7",
"iron-icons": "PolymerElements/iron-icons#^1.2.0"
"iron-icons": "PolymerElements/iron-icons#^1.2.0",
"webcomponentsjs": "0.7.24"
}
}
48 changes: 42 additions & 6 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
/*jshint node:true*/
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'default',
name: 'ember-lts-2.4',
bower: {
dependencies: { }
dependencies: {
'ember': 'components/ember#lts-2-4'
},
resolutions: {
'ember': 'lts-2-4'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-1.13',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': '~1.13.0'
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': '~1.13.0'
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
Expand All @@ -27,6 +42,11 @@ module.exports = {
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -38,6 +58,11 @@ module.exports = {
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -49,6 +74,17 @@ module.exports = {
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
7 changes: 3 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*jshint node:true*/
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
var path = require('path');
/* eslint-env node */
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const path = require('path');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
Expand Down
10 changes: 6 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';
let fs = require('fs');
let fileExists = fs.existsSync;
Expand Down Expand Up @@ -32,17 +32,19 @@ module.exports = {
}

// import webcomponentsjs polyfill library
app.import(`${app.bowerDirectory}/webcomponentsjs/webcomponents.min.js`);
app.import(`${app.bowerDirectory}/webcomponentsjs/webcomponents.js`);
},

// insert polymer and vulcanized elements
contentFor(type) {
contentFor(type, config) {
if (type === 'head') {
let href = config.rootURL + this.options.vulcanizeOutput;

return `<script>
window.Polymer = window.Polymer || {};
window.Polymer.dom = "shadow";
</script>
<link rel="import" href="${this.options.vulcanizeOutput}">`;
<link rel="import" href="${href}">`;
}
},

Expand Down
24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,29 @@
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
"codeclimate-test-reporter": "^0.4.0",
"console-ui": "^1.0.3",
"coveralls": "^2.11.15",
"ember-ajax": "^2.5.2",
"ember-cli": "2.10.1",
"ember-cli": "^2.13.2",
"ember-cli-app-version": "^2.0.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-github-pages": "0.1.2",
"ember-cli-htmlbars-inline-precompile": "^0.3.5",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.2",
"ember-cli-qunit": "^3.1.0",
"ember-cli-release": "^0.2.9",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.10.0",
"ember-data": "^2.12.1",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-resolver": "^3.0.0",
"ember-source": "^2.13.3",
"istanbul": "^0.4.5",
"loader.js": "^4.0.10",
"loader.js": "^4.2.3",
"mocha": "^3.1.2",
"mocha-lcov-reporter": "^1.2.0"
},
Expand All @@ -62,11 +64,11 @@
],
"dependencies": {
"assign-deep": "^0.4.5",
"broccoli-merge-trees": "^1.1.3",
"broccoli-vulcanize": "^3.0.0",
"broccoli-merge-trees": "^1.2.2",
"broccoli-vulcanize": "^4.0.0",
"clone": "^2.0.0",
"ember-cli-babel": "^5.1.7",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars": "^1.2.0",
"quick-temp": "^0.1.6"
},
"ember-addon": {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/ui-fixture.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* jshint node: true */
'use strict';

let UI = require('ember-cli/lib/ui/index');
let UI = require('console-ui');

module.exports = new UI({
inputStream: process.stdin,
Expand Down
3 changes: 1 addition & 2 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*jshint node:true*/
/* eslint-env node */
module.exports = {
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
Expand Down
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
52 changes: 0 additions & 52 deletions tests/.jshintrc

This file was deleted.

9 changes: 7 additions & 2 deletions tests/acceptance/about-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import Ember from 'ember';
import { test } from 'qunit';
import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';

moduleForAcceptance('Acceptance | about');

test('renders custom elements -> vulcanized.html is loaded correctly', function(assert) {
visit('/about');
assert.expect(3);

andThen(function() {
assert.equal(currentURL(), '/about');
Expand All @@ -14,9 +16,12 @@ test('renders custom elements -> vulcanized.html is loaded correctly', function(
let done = assert.async();

let testElement = () => {
assert.ok(document.querySelector('paper-button').shadowRoot,
let button = document.querySelector('paper-button');

assert.ok(button.shadowRoot || button.shadyRoot,
'paper-button has shadowRoot');
assert.equal($('paper-button').attr('role'), 'button',

assert.equal(Ember.$('paper-button').attr('role'), 'button',
'paper-button rendered successfully');

done();
Expand Down
Loading