Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Addon via ember init #22

Merged
merged 1 commit into from Dec 22, 2015
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .editorconfig
Expand Up @@ -18,6 +18,7 @@ indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

Expand Down
2 changes: 1 addition & 1 deletion .npmignore
@@ -1,6 +1,7 @@
bower_components/
tests/
tmp/
dist/

.bowerrc
.editorconfig
Expand All @@ -11,4 +12,3 @@ tmp/
bower.json
Brocfile.js
testem.json
.jshintrc
16 changes: 15 additions & 1 deletion .travis.yml
@@ -1,13 +1,27 @@
---
language: node_js
node_js:
- "0.12"

sudo: false

cache:
directories:
- node_modules

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"

Expand All @@ -17,4 +31,4 @@ install:
- bower install

script:
- npm test
- ember try $EMBER_TRY_SCENARIO test
3 changes: 3 additions & 0 deletions .watchmanconfig
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
}
27 changes: 0 additions & 27 deletions Brocfile.js

This file was deleted.

18 changes: 8 additions & 10 deletions bower.json
@@ -1,16 +1,14 @@
{
"name": "ember-cli-autoprefixer",
"dependencies": {
"jquery": "^1.11.1",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.15",
"ember-resolver": "~0.1.12",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.2.8",
"ember": "2.0.2",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.5",
"ember-cli-test-loader": "ember-cli-test-loader#0.2.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
"ember-qunit": "0.4.10",
"ember-qunit-notifications": "0.0.7",
"qunit": "~1.17.1"
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.3.0",
"qunit": "~1.19.0"
}
}
35 changes: 35 additions & 0 deletions config/ember-try.js
@@ -0,0 +1,35 @@
module.exports = {
scenarios: [
{
name: 'default',
dependencies: { }
},
{
name: 'ember-release',
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
},
{
name: 'ember-beta',
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
},
{
name: 'ember-canary',
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
}
}
]
};
21 changes: 21 additions & 0 deletions ember-cli-build.js
@@ -0,0 +1,21 @@
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
autoprefixer: {
enabled: true,
browsers: ['Chrome 43'],
cascade: true
}
});

/*
This build file specifes the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
};
1 change: 1 addition & 0 deletions index.js
Expand Up @@ -8,6 +8,7 @@ module.exports = {
name: 'ember-cli-autoprefixer',
included: function(app, parentAddon) {
this.app = app;
this._super.included.apply(this, arguments);
this.options = defaults(this.app.options.autoprefixer || {}, {
enabled: true
});
Expand Down
44 changes: 22 additions & 22 deletions package.json
@@ -1,15 +1,15 @@
{
"name": "ember-cli-autoprefixer",
"version": "0.5.0",
"version": "0.6.0",
"description": "Process styles in an ember-cli application using Autoprefixer",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test"
"start": "ember server",
"test": "ember try:testall"
},
"repository": {
"type": "git",
Expand All @@ -25,25 +25,21 @@
"author": "Kim Røen",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "^0.2.0",
"ember-cli-app-version": "0.3.1",
"ember-cli-babel": "^4.0.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-htmlbars": "^0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.8",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2",
"express": "^4.8.5",
"glob": "^4.0.5"
},
"dependencies": {
"broccoli-autoprefixer": "^4.0.0",
"lodash": "^3.1.0"
"broccoli-asset-rev": "^2.1.2",
"ember-cli": "1.13.8",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-htmlbars": "^1.0.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.1",
"ember-cli-release": "0.2.3",
"ember-cli-uglify": "^1.2.0",
"ember-export-application-global": "^1.0.4",
"ember-resolver": "^2.0.2",
"ember-try": "~0.0.8"
},
"keywords": [
"ember-addon",
Expand All @@ -52,6 +48,10 @@
"prefix",
"preprocess"
],
"dependencies": {
"broccoli-autoprefixer": "^4.0.0",
"lodash": "^3.1.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
Expand Down
1 change: 1 addition & 0 deletions testem.json
@@ -1,6 +1,7 @@
{
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
],
Expand Down
28 changes: 3 additions & 25 deletions tests/.jshintrc
Expand Up @@ -6,29 +6,8 @@
"setTimeout",
"$",
"-Promise",
"QUnit",
"define",
"console",
"equal",
"notEqual",
"notStrictEqual",
"test",
"asyncTest",
"testBoth",
"testWithDefault",
"raises",
"throws",
"deepEqual",
"start",
"stop",
"ok",
"strictEqual",
"module",
"moduleFor",
"moduleForComponent",
"moduleForModel",
"process",
"expect",
"visit",
"exists",
"fillIn",
Expand All @@ -39,8 +18,6 @@
"findWithAssert",
"wait",
"DS",
"isolatedContainer",
"startApp",
"andThen",
"currentURL",
"currentPath",
Expand All @@ -49,7 +26,7 @@
"node": false,
"browser": false,
"boss": true,
"curly": false,
"curly": true,
"debug": false,
"devel": false,
"eqeqeq": true,
Expand All @@ -70,5 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
6 changes: 4 additions & 2 deletions tests/dummy/app/app.js
@@ -1,11 +1,13 @@
import Ember from 'ember';
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;

Ember.MODEL_FACTORY_INJECTIONS = true;

var App = Ember.Application.extend({
App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
@@ -1,3 +1,3 @@
<h2 id="title">Welcome to Ember.js</h2>
<h2 id="title">Ember-CLI-Autoprefixer Demo</h2>

{{outlet}}
18 changes: 9 additions & 9 deletions tests/dummy/public/crossdomain.xml
@@ -1,15 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->

<!-- Most restrictive policy: -->
<site-control permitted-cross-domain-policies="none"/>
<!-- Most restrictive policy: -->
<site-control permitted-cross-domain-policies="none"/>

<!-- Least restrictive policy: -->
<!--
<site-control permitted-cross-domain-policies="all"/>
<allow-access-from domain="*" to-ports="*" secure="false"/>
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-->
<!-- Least restrictive policy: -->
<!--
<site-control permitted-cross-domain-policies="all"/>
<allow-access-from domain="*" to-ports="*" secure="false"/>
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-->
</cross-domain-policy>
1 change: 1 addition & 0 deletions tests/dummy/public/robots.txt
@@ -1,2 +1,3 @@
# http://www.robotstxt.org
User-agent: *
Disallow:
5 changes: 5 additions & 0 deletions tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
import Ember from 'ember';

export default function destroyApp(application) {
Ember.run(application, 'destroy');
}
2 changes: 1 addition & 1 deletion tests/helpers/resolver.js
@@ -1,4 +1,4 @@
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import config from '../../config/environment';

var resolver = Resolver.create();
Expand Down
1 change: 0 additions & 1 deletion tests/helpers/start-app.js
@@ -1,6 +1,5 @@
import Ember from 'ember';
import Application from '../../app';
import Router from '../../router';
import config from '../../config/environment';

export default function startApp(attrs) {
Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Expand Up @@ -24,7 +24,7 @@
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/dummy.js"></script>
<script src="testem.js"></script>
<script src="testem.js" integrity=""></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
Expand Down