Skip to content

Commit

Permalink
Merge pull request #2 from dollarshaveclub/001-ERS-creation
Browse files Browse the repository at this point in the history
increment version and add eslint
  • Loading branch information
jacefarm authored Jul 21, 2016
2 parents dfc4906 + 9e64f4b commit 939c2c3
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 5 deletions.
15 changes: 15 additions & 0 deletions ,eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"extends": [
"airbnb/base",
"plugin:dollarshaveclub/ember"
],
"plugins": [
"dollarshaveclub"
],
"globals": {
"Fingerprint": true,
"Flickity": true,
"Modernizr": false,
"Raven": true
}
}
19 changes: 19 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# /node_modules and /bower_components ignored by default

# build files
ember-cli-build.js
config/**/*
dist/**/*
lib/**/*
mirage/**/*
server/**/*
scripts/**/*
tests/fixtures/**/*
tmp/**/*
vendor/**/*

app/router.js
public/assets/js/skrimps.js

# runs in Phantom, which lacks support for required ES2016 features
tests/blanket-options.js
3 changes: 2 additions & 1 deletion app/mixins/ember-router-scroll.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { default } from 'ember-router-scroll/mixins/router-scroll';
import RouterScrollMixin from 'ember-router-scroll/mixins/router-scroll';
export default RouterScrollMixin;
22 changes: 18 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
{
"name": "ember-router-scroll",
"version": "0.0.0",
"description": "The default blueprint for ember-cli addons.",
"version": "0.0.1",
"description": "Scroll to top with preserved browser history scroll position",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"eslint": "eslint . --ignore-path .eslintignore",
"start": "ember server",
"test": "ember try:each"
},
"config": {
"pre-git": {
"pre-push": [
"npm run eslint"
]
}
},
"repository": "",
"engines": {
"node": ">= 0.10.0"
},
"author": "",
"author": "Jason Farmer <[email protected]> and Benny C. Wong <[email protected]>",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
Expand All @@ -37,10 +45,16 @@
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
"ember-welcome-page": "^1.0.1",
"eslint": "^2.4.0",
"eslint-config-airbnb": "^6.1.0",
"eslint-plugin-dollarshaveclub": "^1.0.0",
"loader.js": "^4.0.1"
},
"keywords": [
"ember-addon"
"ember-addon",
"ember-router-scroll",
"popstateEvent",
"browser scroll"
],
"dependencies": {
"ember-cli-babel": "^5.1.6"
Expand Down

0 comments on commit 939c2c3

Please sign in to comment.