Skip to content
This repository was archived by the owner on Jun 23, 2025. It is now read-only.

Add Makefile.js and eslint #15

Merged
merged 2 commits into from
Feb 16, 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
7 changes: 7 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
env:
node: true
es6: true
parserOptions:
ecmaVersion: 6

extends: eslint
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ node_modules/
npm-debug.log

# Cover
.coverage_data/
cover_html/
/coverage/

npm-debug.log
.vimrc.local
Expand Down
20 changes: 0 additions & 20 deletions .jshintrc

This file was deleted.

148 changes: 148 additions & 0 deletions Makefile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
/**
* @fileoverview Build file
* @author nzakas
* @copyright jQuery Foundation and other contributors, https://jquery.org/
* MIT License
*/
/* global echo, exec, exit, set, target */

"use strict";

/* eslint no-console: 0*/
//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------

require("shelljs/make");
set("+e");

const checker = require("npm-license");

//------------------------------------------------------------------------------
// Settings
//------------------------------------------------------------------------------

const OPEN_SOURCE_LICENSES = [
/MIT/, /BSD/, /Apache/, /ISC/, /WTF/, /Public Domain/
];

//------------------------------------------------------------------------------
// Data
//------------------------------------------------------------------------------

const NODE = "node",
NODE_MODULES = "./node_modules/",

// Utilities - intentional extra space at the end of each string
MOCHA = NODE_MODULES + "mocha/bin/_mocha ",
ESLINT = `${NODE} ${NODE_MODULES}/eslint/bin/eslint `,
ISTANBUL = `${NODE} ${NODE_MODULES}/istanbul/lib/cli.js `,

// Files
MAKEFILE = "./Makefile.js",
JS_FILES = "src/**/*.js",
TEST_FILES = "test/**/*.js";

//------------------------------------------------------------------------------
// Tasks
//------------------------------------------------------------------------------

target.all = function() {
target.test();
};

target.lint = function() {
var errors = 0,
lastReturn;

echo("Validating Makefile.js");
lastReturn = exec(ESLINT + MAKEFILE);
if (lastReturn.code !== 0) {
errors++;
}

echo("Validating JavaScript files");
lastReturn = exec(ESLINT + JS_FILES);
if (lastReturn.code !== 0) {
errors++;
}

echo("Validating JavaScript test files");
lastReturn = exec(ESLINT + TEST_FILES);
if (lastReturn.code !== 0) {
errors++;
}

if (errors) {
exit(1);
}
};

target.test = function() {
target.lint();

var errors = 0,
lastReturn;

lastReturn = exec(`${ISTANBUL} cover ${MOCHA} -- -R progress -c ${TEST_FILES}`);

if (lastReturn.code !== 0) {
errors++;
}

if (errors) {
exit(1);
}

target.checkLicenses();
};

target.checkLicenses = function() {

/**
* Returns true if the given dependency's licenses are all permissable for use in OSS
* @param {object} dependency object containing the name and licenses of the given dependency
* @returns {boolean} is permissable dependency
*/
function isPermissible(dependency) {
var licenses = dependency.licenses;

if (Array.isArray(licenses)) {
return licenses.some(function(license) {
return isPermissible({
name: dependency.name,
licenses: license
});
});
}

return OPEN_SOURCE_LICENSES.some(function(license) {
return license.test(licenses);
});
}

echo("Validating licenses");

checker.init({
start: __dirname
}, function(deps) {
var impermissible = Object.keys(deps).map(function(dependency) {
return {
name: dependency,
licenses: deps[dependency].licenses
};
}).filter(function(dependency) {
return !isPermissible(dependency);
});

if (impermissible.length) {
impermissible.forEach(function(dependency) {
console.error("%s license for %s is impermissible.",
dependency.licenses,
dependency.name
);
});
exit(1);
}
});
};
118 changes: 0 additions & 118 deletions gulpfile.js

This file was deleted.

27 changes: 10 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
"main": "src/index.js",
"version": "3.6.0",
"engines": {
"node": ">=0.4.0"
"node": ">=4.0.0"
},
"repository": "eslint/eslint-scope",
"bugs": {
"url": "https://github.com/eslint/eslint-scope/issues"
},
"license": "BSD-2-Clause",
"scripts": {
"test": "gulp travis",
"unit-test": "gulp test",
"lint": "gulp lint",
"test": "node Makefile.js test",
"lint": "node Makefile.js lint",
"release": "eslint-release",
"ci-release": "eslint-ci-release",
"gh-release": "eslint-gh-release",
Expand All @@ -28,22 +27,16 @@
},
"devDependencies": {
"chai": "^3.4.1",
"eslint": "^3.15.0",
"eslint-config-eslint": "^3.0.0",
"eslint-release": "^0.10.1",
"espree": "^3.1.1",
"esprima": "^2.7.1",
"gulp": "^3.9.0",
"gulp-bump": "^1.0.0",
"gulp-eslint": "^1.1.1",
"gulp-espower": "^1.0.2",
"gulp-filter": "^3.0.1",
"gulp-git": "^1.6.1",
"gulp-mocha": "^2.2.0",
"gulp-plumber": "^1.0.1",
"gulp-sourcemaps": "^1.6.0",
"gulp-tag-version": "^1.3.0",
"lazypipe": "^1.0.1",
"vinyl-source-stream": "^1.1.0",
"istanbul": "^0.4.5",
"mocha": "^3.2.0",
"npm-license": "^0.3.3",
"shelljs": "^0.7.6",
"typescript": "~2.0.10",
"typescript-eslint-parser": "^1.0.0"
}
}
}
2 changes: 1 addition & 1 deletion src/definition.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
"use strict";

const Variable = require('./variable');
const Variable = require("./variable");

/**
* @class Definition
Expand Down
Loading