Skip to content

Commit

Permalink
run update, lint
Browse files Browse the repository at this point in the history
  • Loading branch information
jonschlinkert committed Mar 24, 2017
1 parent 908e83a commit 60641db
Show file tree
Hide file tree
Showing 10 changed files with 76 additions and 90 deletions.
13 changes: 2 additions & 11 deletions .editorconfig
@@ -1,4 +1,3 @@
# http://editorconfig.org
root = true

[*]
Expand All @@ -9,14 +8,6 @@ indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
[{**/{actual,fixtures,expected,templates}/**,*.md}]
trim_trailing_whitespace = false
insert_final_newline = false

[test/**]
trim_trailing_whitespace = false
insert_final_newline = false

[templates/**]
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = false
5 changes: 2 additions & 3 deletions .eslintrc.json
Expand Up @@ -33,8 +33,8 @@
"generator-star-spacing": [2, { "before": true, "after": true }],
"handle-callback-err": [2, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"keyword-spacing": [2, {"before": true, "after": true}],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [2, { "before": true, "after": true }],
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-array-constructor": 2,
Expand All @@ -50,7 +50,6 @@
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-labels": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
Expand All @@ -72,7 +71,7 @@
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 2,
"no-native-reassign": 0,
"no-negated-in-lhs": 2,
"no-new": 2,
"no-new-func": 2,
Expand Down
28 changes: 20 additions & 8 deletions .gitignore
@@ -1,15 +1,27 @@
# always ignore files
*.DS_Store
*.sublime-*
_gh_pages
bower_components

# test related, or directories generated by tests
test/actual
actual
coverage
.nyc*

# npm
node_modules
npm-debug.log
actual
test/actual

# yarn
yarn.lock
yarn-error.log

# misc
_gh_pages
_draft
_drafts
bower_components
vendor
temp
tmp
TODO.md
vendor
.idea
benchmark
coverage
18 changes: 11 additions & 7 deletions .travis.yml
@@ -1,12 +1,16 @@
sudo: false
os:
- linux
- osx
language: node_js
node_js:
- "stable"
- "5"
- "4"
- "0.12"
- "0.10"
- node
- '7'
- '6'
- '5'
- '4'
- '0.12'
- '0.10'
matrix:
allow_failures: []
fast_finish: true
allow_failures:
- node_js: "0.10"
10 changes: 9 additions & 1 deletion .verb.md
Expand Up @@ -11,6 +11,14 @@

Base is a framework for rapidly creating high quality node.js applications, using plugins like building blocks.

## Why use Base?

* Create a unit-testable, high-quality node.js application in minutes
* Return on (time) investment: Learn Base, and you will be familiar with the core API of all applications built on Base. This means you will not only benefit as a developer, but as a user as well.
* Use any [base plugin](https://www.npmjs.com/browse/keyword/baseplugin) to add feature-functionality to your application
* Use plugins from [other applications](#in-the-wild) built on Base
* Create your own custom plugins to add features

### Guiding principles

The core team follows these principles to help guide API decisions:
Expand Down Expand Up @@ -139,4 +147,4 @@ The following node.js applications were built with `Base`:
- `app._namespace` was removed (related to `debug`)
- `.plugin`, `.use`, and `.define` no longer emit events
- `.assertPlugin` was removed
- `.lazy` was removed
- `.lazy` was removed
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2016, Jon Schlinkert.
Copyright (c) 2015-2017, Jon Schlinkert

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
30 changes: 0 additions & 30 deletions gulpfile.js

This file was deleted.

56 changes: 30 additions & 26 deletions package.json
@@ -1,24 +1,28 @@
{
"name": "base",
"description": "base is the foundation for creating modular, unit testable and highly pluggable node.js applications, starting with a handful of common methods, like `set`, `get`, `del` and `use`.",
"description": "Framework for rapidly creating high quality node.js applications, using plugins like building blocks",
"version": "0.11.1",
"homepage": "https://github.com/node-base/base",
"author": "Jon Schlinkert (https://github.com/jonschlinkert)",
"contributors": [
"Brian Woodward (https://github.com/doowb)"
],
"maintainers": [
"Brian Woodward (https://github.com/doowb)",
"Jon Schlinkert (https://github.com/jonschlinkert)"
],
"contributors": [
"Brian Woodward <brian.woodward@gmail.com> (https://twitter.com/doowb)",
"Charlike Mike Reagent (https://i.am.charlike.online)",
"John O'Donnell (https://github.com/criticalmash)",
"Jon Schlinkert <jon.schlinkert@sellside.com> (http://twitter.com/jonschlinkert)"
],
"repository": "node-base/base",
"bugs": {
"url": "https://github.com/node-base/base/issues"
},
"license": "MIT",
"files": [
"index.js",
"utils.js"
"utils.js",
"verbfile.js"
],
"main": "index.js",
"engines": {
Expand All @@ -29,28 +33,24 @@
},
"dependencies": {
"arr-union": "^3.1.0",
"cache-base": "^0.8.4",
"class-utils": "^0.3.4",
"cache-base": "^1.0.0",
"class-utils": "^0.3.5",
"component-emitter": "^1.2.1",
"define-property": "^0.2.5",
"isobject": "^3.0.0",
"lazy-cache": "^2.0.1",
"mixin-deep": "^1.1.3",
"pascalcase": "^0.1.1"
"lazy-cache": "^2.0.2",
"mixin-deep": "^1.2.0",
"pascalcase": "^0.1.1",
"through2": "^2.0.3",
"verb-generate-readme": "^0.4.3"

This comment has been minimized.

Copy link
@tunnckoCore

tunnckoCore Apr 3, 2017

Contributor

@jonschlinkert, verb-generate-readme is in the wrong place :)

},
"devDependencies": {
"gulp": "^3.9.1",
"gulp-eslint": "^2.0.0",
"gulp-format-md": "^0.1.9",
"gulp-istanbul": "^0.10.4",
"gulp-mocha": "^2.2.0",
"helper-coverage": "^0.1.3",
"mocha": "^2.5.3",
"should": "^9.0.1",
"through2": "^2.0.1",
"verb-readme-generator": "^0.1.13"
"gulp-format-md": "^0.1.11",
"helper-changelog": "^0.3.0",
"mocha": "^3.2.0"
},
"keywords": [
"base",
"boilerplate",
"cache",
"del",
Expand All @@ -65,15 +65,15 @@
"verb": {
"run": true,
"toc": false,
"layout": "default",
"layout": null,
"tasks": [
"readme"
],
"plugins": [
"gulp-format-md"
],
"helpers": [
"helper-coverage"
"helper-changelog"
],
"related": {
"description": "There are a number of different plugins available for extending base. Let us know if you create your own!",
Expand All @@ -94,14 +94,18 @@
},
"reflinks": [
"assemble",
"boilerplate",
"base",
"base-plugins",
"cache-base",
"class-utils",
"enquirer",
"generate",
"scaffold",
"verb",
"helper-changelog",
"prompt-base",
"static-extend",
"verb-readme-generator"
"templates",
"update",
"verb"
],
"lint": {
"reflinks": true
Expand Down
2 changes: 0 additions & 2 deletions test.js
@@ -1,9 +1,7 @@
'use strict';

require('mocha');
require('should');
var assert = require('assert');
var utils = require('./utils');
var Base = require('./');
var base;

Expand Down
2 changes: 1 addition & 1 deletion verbfile.js
Expand Up @@ -3,7 +3,7 @@
var through = require('through2');

module.exports = function(verb) {
verb.use(require('verb-readme-generator'));
verb.use(require('verb-generate-readme'));
verb.task('default', ['readme'], function(cb) {
return verb.src('README.md')
.pipe(through.obj(function(file, enc, next) {
Expand Down

0 comments on commit 60641db

Please sign in to comment.