Skip to content
This repository has been archived by the owner on Apr 6, 2019. It is now read-only.

Commit

Permalink
Merge pull request #3 from homer0/homer0_updateDependencies
Browse files Browse the repository at this point in the history
Update the project
  • Loading branch information
Leonardo Apiwan committed Mar 5, 2018
2 parents 2236a03 + 638e388 commit 88b5615
Show file tree
Hide file tree
Showing 25 changed files with 3,697 additions and 2,070 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ end_of_line = LF
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
indent_size = 2
55 changes: 20 additions & 35 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,37 +1,22 @@
{
"extends": ["airbnb"],
"rules": {
"comma-dangle": ["error", "always-multiline"],
"indent": ["error", 4],
"no-extra-bind": 0,
"no-underscore-dangle": ["error", { "allowAfterThis": true }],
"no-param-reassign": 0,
"no-new": 0,
"import/newline-after-import": 0,
"import/no-dynamic-require": 0,
"import/no-extraneous-dependencies": 0,
"strict": 0,
"no-plusplus": 0
},
"globals": {
"window": true,
"Promise": true,
"process": true,
"console": true,
"jest": true,
"it": true,
"describe": true,
"expect": true,
"pit": true,
"spyOn": true,
"afterEach": true,
"beforeEach": true,
"browser": true,
"angular": true,
"by": true,
"isAngularSite": true,
"protractor": true,
"element": true,
"jasmine": true
}
"extends": "airbnb-base",
"rules": {
indent: ['error', 2, {
MemberExpression: 0,
}],
"no-underscore-dangle": ["error", { "allowAfterThis": true }],
"comma-dangle": ["error", {
arrays: "always-multiline",
objects: "always-multiline",
imports: "always-multiline",
exports: "always-multiline",
functions: "never",
}],
"class-methods-use-this": "off",
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": "off",
"function-paren-newline": "off",
"arrow-parens": ["error", "always"],
"no-plusplus": "off"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules
coverage
.DS_Store
npm-debug.log
yarn-error.log
dist
.idea
docs
15 changes: 0 additions & 15 deletions .jestrc

This file was deleted.

12 changes: 12 additions & 0 deletions .jestrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"automock": true,
"unmockedModulePathPatterns": ["/node_modules/", "/mocks/", "colors"],
"coveragePathIgnorePatterns": ["/node_modules/", "/mocks/"],
"moduleNameMapper": {
"package\\.json$": "<rootDir>/tests/mocks/package.js"
},
"collectCoverage": true,
"timers": "fake",
"clearMocks": true,
"testEnvironment": "node"
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.0
6
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "4.3"
- "6.10"
after_success:
- 'cat ./coverage/lcov.info | ./node_modules/.bin/coveralls'
- 'npm run docs:deploy'
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ So we built workarounds, but those workarounds were attached to the project wher
|--------------|--------------------------------------------------------------------|
| Package | webpack-node-utils |
| Description | A set of utility methods to help you build Node apps with Webpack. |
| Node Version | >= v4.3.0 |
| Node Version | >= v6.0.0 |

## Usage

Expand Down Expand Up @@ -90,7 +90,7 @@ const defaultSetup = module.exports = () => ({
extends: 'base',
entry: {...},
output: {...},
plugins: {...},
plugins: {...},
});

module.exports.library = (params) => {
Expand Down Expand Up @@ -347,4 +347,4 @@ We use [ESlint](http://eslint.org) to validate all our JS code. The configuratio

### Documentation

We use [ESDoc](http://esdoc.org) to generate HTML documentation for the project. The configuration file ion `./.esdocrc` and the script that runs it is on `./utils/scripts/docs`.
We use [ESDoc](http://esdoc.org) to generate HTML documentation for the project. The configuration file ion `./.esdocrc` and the script that runs it is on `./utils/scripts/docs`.
4 changes: 2 additions & 2 deletions esdoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"source": "./src",
"destination": "./docs",
"plugins": [
{"name": "./utils/esdoc-fix.js"},
{"name": "esdoc-es7-plugin"}
{"name": "esdoc-standard-plugin"},
{"name": "esdoc-node"}
]
}
88 changes: 45 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
{
"name": "webpack-node-utils",
"description": "A set of utility methods that for a better experience building Node applications using Webpack",
"version": "2.1.0",
"repository": "homer0/webpack-node-utils",
"author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
"license": "MIT",
"keywords": [
"webpack",
"node",
"isomorphic",
"universal"
],
"dependencies": {
"webpack-merge": "0.14.0",
"colors": "1.1.2"
},
"devDependencies": {
"eslint": "3.7.1",
"eslint-config-airbnb": "12.0.0",
"name": "webpack-node-utils",
"description": "A set of utility methods that for a better experience building Node applications using Webpack",
"version": "2.1.0",
"repository": "homer0/webpack-node-utils",
"author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
"license": "MIT",
"keywords": [
"webpack",
"node",
"isomorphic",
"universal"
],
"dependencies": {
"webpack-merge": "4.1.2",
"colors": "1.1.2"
},
"devDependencies": {
"eslint": "4.18.2",
"eslint-config-airbnb-base": "12.1.0",
"eslint-plugin-import": "2.9.0",
"eslint-plugin-node": "6.0.1",

"eslint-plugin-jsx-a11y": "2.2.2",
"eslint-plugin-import": "1.16.0",
"eslint-plugin-react": "6.3.0",
"eslint-plugin-import": "1.16.0",
"wootils": "1.1.1",
"jest-ex": "4.0.0",
"jest-cli": "22.4.2",
"jasmine-expect": "3.8.3",
"babel-preset-env": "1.6.1",

"jest-cli": "16.0.2",
"jasmine-expect": "3.7.0",
"esdoc": "0.4.8",
"esdoc-es7-plugin": "0.0.3",
"esdoc-uploader": "1.0.1",
"esdoc": "1.0.4",
"esdoc-standard-plugin": "1.0.0",
"esdoc-node": "1.0.3",
"esdoc-uploader": "1.0.1",

"coveralls": "2.11.14"
},
"engine-strict": true,
"engines": {
"node": ">=4.3.0",
"npm": ">=2.14.0 <3.0.0"
},
"main": "src/index.js",
"scripts": {
"install-hooks": "./utils/hooks/install",
"test": "./utils/scripts/test",
"lint": "./utils/scripts/lint",
"docs": "./utils/scripts/docs",
"docs:deploy": "./utils/scripts/deploy-docs"
}
"coveralls": "3.0.0"
},
"engine-strict": true,
"engines": {
"node": ">=6.0.0",
"npm": ">=3.0.0"
},
"main": "src/index.js",
"scripts": {
"install-hooks": "./utils/hooks/install",
"test": "./utils/scripts/test",
"lint": "./utils/scripts/lint",
"docs": "./utils/scripts/docs",
"docs:deploy": "./utils/scripts/deploy-docs"
}
}

0 comments on commit 88b5615

Please sign in to comment.