Permalink
Browse files

updated ember cli

  • Loading branch information...
1 parent c025b8c commit 6c5f4c51bee79676e823e522d92d63bb7e7ab25c @marcoow marcoow committed May 20, 2015
Showing with 191 additions and 57 deletions.
  1. +4 −0 .bowerrc
  2. +34 −0 .editorconfig
  3. +9 −0 .ember-cli
  4. +17 −7 .gitignore
  5. +29 −2 .jshintrc
  6. +14 −0 .npmignore
  7. +24 −23 .travis.yml
  8. +3 −6 bower.json
  9. +35 −0 config/ember-try.js
  10. +8 −8 package.json
  11. +1 −0 testem.json
  12. +0 −1 tests/dummy/app/app.js
  13. +3 −1 tests/dummy/app/router.js
  14. +9 −9 tests/dummy/public/crossdomain.xml
  15. +1 −0 tests/dummy/public/robots.txt
View
@@ -0,0 +1,4 @@
+{
+ "directory": "bower_components",
+ "analytics": false
+}
View
@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
View
@@ -0,0 +1,9 @@
+{
+ /**
+ Ember CLI sends analytics information by default. The data is completely
+ anonymous, but there are times when you might want to disable this behavior.
+
+ Setting `disableAnalytics` to true will prevent any data from being sent.
+ */
+ "disableAnalytics": false
+}
View
@@ -1,7 +1,17 @@
-.DS_Store
-dist
-tmp
-docs/build
-.ruby-version
-node_modules
-bower_components
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+/bower_components
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
View
@@ -1,5 +1,32 @@
{
- "esnext": true,
+ "predef": [
+ "document",
+ "window",
+ "-Promise"
+ ],
+ "browser": true,
"boss": true,
- "debug": true
+ "curly": true,
+ "debug": false,
+ "devel": true,
+ "eqeqeq": true,
+ "evil": true,
+ "forin": false,
+ "immed": false,
+ "laxbreak": false,
+ "newcap": true,
+ "noarg": true,
+ "noempty": false,
+ "nonew": false,
+ "nomen": false,
+ "onevar": false,
+ "plusplus": false,
+ "regexp": false,
+ "undef": true,
+ "sub": true,
+ "strict": false,
+ "white": false,
+ "eqnull": true,
+ "esnext": true,
+ "unused": true
}
View
@@ -0,0 +1,14 @@
+bower_components/
+tests/
+tmp/
+dist/
+
+.bowerrc
+.editorconfig
+.ember-cli
+.travis.yml
+.npmignore
+**/.gitkeep
+bower.json
+Brocfile.js
+testem.json
View
@@ -1,7 +1,7 @@
+---
language: node_js
-
node_js:
- - '0.10'
+ - "0.12"
sudo: false
@@ -10,27 +10,28 @@ cache:
- node_modules
env:
- global:
- - REPORTER=Dot
- matrix:
- - BUNDLE="ember=1.2.2&jQuery=1.10.2&handlebars=1.3.0"
- - BUNDLE="ember=1.2.2&jQuery=2.0.3&handlebars=1.3.0"
- - BUNDLE="ember=1.3.2&jQuery=1.10.2&handlebars=1.3.0"
- - BUNDLE="ember=1.3.2&jQuery=2.0.3&handlebars=1.3.0"
- - BUNDLE="ember=1.4.0&jQuery=1.11.2&handlebars=1.3.0"
- - BUNDLE="ember=1.4.0&jQuery=2.1.3&handlebars=1.3.0"
- - BUNDLE="ember=1.5.1&jQuery=1.11.2&handlebars=1.3.0"
- - BUNDLE="ember=1.5.1&jQuery=2.1.3&handlebars=1.3.0"
- - BUNDLE="ember=1.6.1&jQuery=1.11.2&handlebars=1.3.0"
- - BUNDLE="ember=1.6.1&jQuery=2.1.3&handlebars=1.3.0"
- - BUNDLE="ember=1.7.1&jQuery=1.11.2&handlebars=1.3.0"
- - BUNDLE="ember=1.7.1&jQuery=2.1.3&handlebars=1.3.0"
- - BUNDLE="ember=1.8.1&jQuery=1.11.2&handlebars=1.3.0"
- - BUNDLE="ember=1.8.1&jQuery=2.1.3&handlebars=1.3.0"
- - BUNDLE="ember=1.9.1&jQuery=1.11.2&handlebars=2.0.0"
- - BUNDLE="ember=1.9.1&jQuery=2.1.3&handlebars=2.0.0"
- - BUNDLE="ember=1.10.0&jQuery=1.11.2&handlebars=2.0.0"
- - BUNDLE="ember=1.10.0&jQuery=2.1.3&handlebars=2.0.0"
+ - 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"
+
+install:
+ - npm install -g bower
+ - npm install
+ - bower install
+
+script:
+ - ember try $EMBER_TRY_SCENARIO test
notifications:
email:
View
@@ -1,18 +1,15 @@
{
"name": "ember-simple-auth",
"dependencies": {
- "ember": "1.11.1",
+ "ember": "1.12.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.16.1",
+ "ember-data": "1.0.0-beta.17",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
- "ember-qunit": "0.3.1",
- "ember-qunit-notifications": "0.0.7",
+ "ember-mocha": "~0.6.2",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
- "qunit": "~1.17.1",
- "ember-mocha": "~0.6.2",
"sinonjs": "~1.14.1"
}
}
View
@@ -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'
+ }
+ }
+ ]
+};
View
@@ -19,19 +19,19 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
- "ember-cli": "0.2.3",
+ "ember-cli": "0.2.5",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
- "ember-cli-dependency-checker": "0.0.8",
- "ember-cli-htmlbars": "0.7.4",
+ "ember-cli-dependency-checker": "^1.0.0",
+ "ember-cli-htmlbars": "0.7.6",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-mocha": "0.6.0",
- "ember-cli-qunit": "0.3.10",
- "ember-cli-uglify": "1.0.1",
- "ember-data": "1.0.0-beta.16.1",
- "ember-disable-prototype-extensions": "^1.0.0",
+ "ember-cli-uglify": "^1.0.1",
+ "ember-data": "1.0.0-beta.17",
+ "ember-disable-proxy-controllers": "^0.7.0",
"ember-export-application-global": "^1.0.2",
+ "ember-disable-prototype-extensions": "^1.0.0",
"ember-sinon": "0.0.3",
"ember-try": "0.0.4"
},
@@ -44,4 +44,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
-}
+}
View
@@ -1,6 +1,7 @@
{
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
+ "disable_watching": true,
"launch_in_ci": [
"PhantomJS"
],
@@ -9,7 +9,6 @@ Ember.MODEL_FACTORY_INJECTIONS = true;
App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
- podModulePrefix: config.podModulePrefix,
Resolver: Resolver
});
@@ -5,5 +5,7 @@ var Router = Ember.Router.extend({
location: config.locationType
});
-export default Router.map(function() {
+Router.map(function() {
});
+
+export default Router;
@@ -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,2 +1,3 @@
# http://www.robotstxt.org
User-agent: *
+Disallow:

0 comments on commit 6c5f4c5

Please sign in to comment.