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

Switching to non-transpiled es6/node6 code #20

Merged
merged 2 commits into from
Aug 25, 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
6 changes: 0 additions & 6 deletions .babelrc

This file was deleted.

33 changes: 32 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,37 @@
{
"extends": "opentable",
"env": {
"es6": true,
"node": true
},
"plugins": ["node"],
"parserOptions": {
"ecmaVersion": 6
},
"rules": {
"node/no-unsupported-features": [2, {
"version": 6
}
],
"arrow-parens": ["error", "always"],
"no-shadow": 0,
"radix": 0,
"keyword-spacing": 0,
"consistent-return": 0,
"arrow-body-style": 0,
"no-use-before-define": 0,
"quotes": [
"error",
"single",
{
"avoidEscape": true
}
],
"semi": ["error", "always"],
"one-var": [
"error",
{
"uninitialized": "always"
}
]
}
}
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- '4'
- '6'
script: npm run build-and-test
- '8'
script: npm run test
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,9 @@ To run the test suite, first install the dependancies, then run `npm test`

```bash
$ npm install
$ npm run build
$ npm test
```

> Requires Node 4+ for dev tools, but we recommend using Node 6.

# License

[MIT](LICENSE)
33 changes: 11 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"name": "spur-errors",
"description": "Common error builder utility for Node.js. Contains common error types, and stack trace tracking to support more detailed error messages.",
"version": "0.2.6",
"main": "lib/SpurErrors.js",
"jsnext:main": "./src/SpurErrors",
"main": "./src/SpurErrors",
"author": {
"name": "Agustin Colchado",
"email": "agustin@colchado.com"
Expand All @@ -19,15 +18,9 @@
],
"license": "MIT",
"scripts": {
"clean": "rm -rf lib/",
"build": "npm run clean && babel src -d lib --source-maps",
"dev": "npm run clean && babel --watch src -d lib",
"lint": "eslint .",
"lint": "eslint ./{src,test}/**/*.js index.js",
"pretest": "npm run lint",
"test-unit": "babel-node --debug node_modules/mocha/bin/_mocha ./test/unit/",
"test-integration": "babel-node --debug node_modules/mocha/bin/_mocha ./test/integration/",
"test": "npm run test-unit && npm run test-integration",
"build-and-test": "npm run build && npm test"
"test": "mocha test/"
},
"bugs": {
"url": "https://github.com/opentable/spur-errors/issues"
Expand All @@ -39,17 +32,13 @@
},
"dependencies": {},
"devDependencies": {
"babel-cli": "^6.18.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-transform-object-assign": "^6.8.0",
"babel-plugin-transform-regenerator": "6.16.1",
"babel-preset-es2015": "^6.18.0",
"babel-preset-es2015-loose": "^8.0.0",
"chai": "^3.5.0",
"eslint": "^3.13.1",
"eslint-config-opentable": "^6.0.0",
"eslint-plugin-import": "^2.2.0",
"mocha": "^3.2.0",
"sinon": "^1.17.3"
"chai": "^4.1.1",
"eslint": "^4.5.0",
"eslint-plugin-node": "^5.1.1",
"mocha": "^3.5.0",
"sinon": "^3.2.1"
},
"engines": {
"node": ">=6.0.0"
}
}
2 changes: 1 addition & 1 deletion src/BaseError.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ const BaseError = {
}
};

export default BaseError;
module.exports = BaseError;
4 changes: 2 additions & 2 deletions src/SpurErrors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BaseError from './BaseError';
const BaseError = require('./BaseError');

const SpurErrors = {
BaseError,
Expand Down Expand Up @@ -27,4 +27,4 @@ const SpurErrors = {
}
};

export default SpurErrors;
module.exports = SpurErrors;
3 changes: 2 additions & 1 deletion test/fixtures/Callee.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import SpurErrors from '../../src/SpurErrors';
const SpurErrors = require('../../src/SpurErrors');

module.exports = {

run() {
return SpurErrors.NotFoundError.create();
}
Expand Down
7 changes: 0 additions & 7 deletions test/integration/DependenciesSpec.js

This file was deleted.

12 changes: 12 additions & 0 deletions test/unit/ModuleSpec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const SpurErrorsModule = require('../../');
const SpurErrorsSource = require('../../src/SpurErrors');

describe('Module Integration', () => {
it('the module should be referenced from the root using what\'s defined in the package', () => {
expect(SpurErrorsModule).to.exist;
});

it('the module should be the same as the expected source', () => {
expect(SpurErrorsModule).to.equal(SpurErrorsSource);
});
});
4 changes: 2 additions & 2 deletions test/unit/SpurErrorsSpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SpurErrors from '../../src/SpurErrors';
import Callee from '../fixtures/Callee';
const SpurErrors = require('../../src/SpurErrors');
const Callee = require('../fixtures/Callee');

describe('SpurErrors;', () => {
it('test error', () => {
Expand Down