Skip to content

Commit

Permalink
[CHORE] Run a ember init
Browse files Browse the repository at this point in the history
  • Loading branch information
dcyriller authored and runspired committed Mar 30, 2019
1 parent db7babb commit bb64227
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 120 deletions.
30 changes: 23 additions & 7 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
tmp
dist
node-tests/fixtures/
blueprints/*/mocha-files/
blueprints/*/qunit-files/
blueprints/*/files/
blueprints/*/native-files/
# unconventional js
/blueprints/*/*files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# ember-data
/node-tests/fixtures/
93 changes: 35 additions & 58 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,66 @@
module.exports = {
parser: 'babel-eslint',
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module',
},
parser: 'babel-eslint',
extends: ['eslint:recommended', 'prettier'],
plugins: ['prettier'],
extends: ['eslint:recommended', 'prettier'],
rules: {
'prettier/prettier': 'error',

'no-unused-vars': ['error', {
'args': 'none',
}],
'no-unused-vars': [
'error',
{
args: 'none',
},
],

// from JSHint
'no-cond-assign': ['error', 'except-parens'],
'eqeqeq': 'error',
eqeqeq: 'error',
'no-eval': 'error',
'new-cap': ['error', {
'capIsNew': false,
}],
'new-cap': [
'error',
{
capIsNew: false,
},
],
'no-caller': 'error',
'no-irregular-whitespace': 'error',
'no-undef': 'error',
'no-eq-null': 'error',
},
globals: {
heimdall: true,
Map: false,
WeakMap: true,
},
env: {
browser: true,
node: false,
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'lib/**/*.js',
'bin/**',
'blueprints/*/index.js',
'blueprints/*.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
'lib/**/*.js',
'node-tests/**',
'bin/**',
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'tests/dummy/config/**/*.js',
],
excludedFiles: ['addon/**/index.js'],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
ecmaVersion: 2015,
},
env: {
browser: false,
Expand All @@ -59,50 +70,16 @@ module.exports = {
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
},

// browser files
{
files: [
'addon/**',
'app/**',
'tests/**',
],
excludedFiles: [
'tests/dummy/config/**'
],
env: {
browser: true,
node: false,
},
globals: {
heimdall: true,
Map: false,
WeakMap: true,
}
},

// browser tests
{
files: [
'tests/**'
],

rules: {
'no-console': 0
}
}),
},

// node tests
{
files: [
'node-tests/**'
],
files: ['node-tests/**'],

env: {
mocha: true,
}
}
},
},
],
};
47 changes: 28 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
.bundle
bundle
tmp/
tests/source/
dist/
*.iml
yarn-error.log

# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# ember-data specific
benchmarks/results/*.json

.DS_Store
.project

.github-upload-token
*.swp

tests/ember-data-tests.js
*gem

docs/build/
docs/node_modules/

node_modules/
bower_components/
.metadata_never_index
npm-debug.log

/DEBUG

.vscode/
.vscode/
65 changes: 35 additions & 30 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/node-tests
/tests
/tmp
/bin
/docs
/.node_modules.ember-try
/notes
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# Ignore all assets except /dist/docs folder
/dist/assets/
/dist/crossdomain.xml
/dist/index.html
/dist/robots.txt
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

**/.gitkeep
# ember-data
/bin
/docs
/node-tests
!/dist/docs # ignore all assets except /dist/docs folder
.appveyor.yml
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
yarn.lock

*.gem
*.gemspec
**/*.rb
node-tests/
lib/scripts
lib/version-replace.js
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing
# How To Contribute

## Welcome!

Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## ember-data
ember-data
==============================================================================

[![Build Status](https://secure.travis-ci.org/emberjs/data.svg?branch=master)](http://travis-ci.org/emberjs/data)
[![Code Climate](https://codeclimate.com/github/emberjs/data/badges/gpa.svg)](https://codeclimate.com/github/emberjs/data)
Expand All @@ -23,7 +24,9 @@ It provides many of the facilities you'd find in server-side `ORM`s like
- [Team](https://emberjs.com/team)
- [Blog](https://emberjs.com/blog)

### Installation

Installation
------------------------------------------------------------------------------

`ember-data` is installed by default for new applications generated with `ember-cli`.

Expand All @@ -36,3 +39,15 @@ ember install ember-data

Similarly, if you have generated a new `Ember` application using `ember-cli` but do
not wish to use `ember-data`, remove `ember-data` from your `package.json`.


Contributing
------------------------------------------------------------------------------

See the [Contributing](CONTRIBUTING.md) guide for details.


License
------------------------------------------------------------------------------

This project is licensed under the [MIT License](LICENSE.md).
4 changes: 1 addition & 3 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
module.exports = {
framework: 'qunit',
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
reporter: 'dot',
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_args: {
Chrome: {
mode: 'ci',
args: [
ci: [
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
Expand Down

0 comments on commit bb64227

Please sign in to comment.