yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 05:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ESLint instead of xo

Browse Source
This commit is contained in:
Aurélien Georget 2017-01-04 18:28:47 +01:00
parent b7378d029a
commit 5c24f33c28
22 changed files with 75 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintignore Normal file
View File

@ -0,0 +1,4 @@
packages/strapi-generate-new/files/public/**
packages/strapi-generate-admin/files/admin/public/**
website/
**/node_modules/**

31
.eslintrc Normal file
View File

@ -0,0 +1,31 @@
{
"parser": "babel-eslint",
"extends": "eslint:recommended",
"plugins": [
"react",
"jsx-a11y"
],
"env": {
"commonjs": true,
"es6": true,
"node": true,
"mocha": true
},
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"globals": {
"strapi": true
},
"rules": {
"indent": ["error", 2, { "SwitchCase": 1 }],
"linebreak-style": ["error", "unix"],
"no-console": 0,
"quotes": ["error", "single"],
"semi": ["error", "always"]
}
}

2
Makefile
View File

@ -5,7 +5,7 @@ export NODE_ENV = test
.PHONY: test
lint:
./node_modules/.bin/xo
./node_modules/.bin/eslint **/*.js
test: lint
./scripts/test.sh

52
package.json
View File

@ -3,50 +3,18 @@
"version": "3.0.0-alpha.1",
"devDependencies": {
"assert": "~1.3.0",
"babel-eslint": "^6.1.2",
"coveralls": "~2.11.9",
"eslint": "^3.12.2",
"eslint-config-airbnb": "^13.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-react": "^6.8.0",
"istanbul": "~0.4.2",
"lerna": "2.0.0-beta.30",
"mocha": "~2.4.5",
"mocha-lcov-reporter": "~1.2.0",
"pre-commit": "~1.1.2",
"xo": "~0.13.0",
"lerna": "2.0.0-beta.30"
},
"xo": {
"space": true,
"esnext": true,
"envs": [
"mocha",
"node"
],
"globals": [
"strapi"
],
"ignore": [
"packages/strapi-generate-new/files/public/**",
"packages/strapi-generate-admin/files/admin/public/**",
"website/**"
],
"rules": {
"array-callback-return": 0,
"brace-style": 0,
"camelcase": 0,
"default-case": 0,
"dot-notation": 0,
"no-case-declarations": 0,
"no-else-return": 0,
"no-eval": 0,
"no-implicit-coercion": 0,
"no-lonely-if": 0,
"no-negated-condition": 0,
"no-throw-literal": 0,
"no-unused-expressions": 0,
"no-unused-vars": 0,
"padded-blocks": 0,
"prefer-template": 0,
"quote-props": 0,
"space-infix-ops": 0,
"strict": 0
}
"pre-commit": "~1.1.2"
},
"scripts": {
"test": "make test",
@ -54,12 +22,12 @@
},
"author": {
"email": "hi@strapi.io",
"name": "Strapi team",
"name": "Strapi Solutions",
"url": "http://strapi.io"
},
"maintainers": [
{
"name": "Strapi team",
"name": "Strapi Solutions",
"email": "hi@strapi.io",
"url": "http://strapi.io"
}

19
packages/strapi-bookshelf/lib/index.js
View File

@ -158,7 +158,7 @@ module.exports = function (strapi) {
}
switch (verbose) {
case 'hasOne':
case 'hasOne': {
const FK = _.findKey(strapi.models[details.model].attributes, details => {
if (details.hasOwnProperty('model') && details.model === model && details.hasOwnProperty('via') && details.via === name) {
return details;
@ -169,20 +169,20 @@ module.exports = function (strapi) {
return this.hasOne(global[_.capitalize(details.model)], FK);
};
break;
case 'hasMany':
}
case 'hasMany': {
loadedModel[name] = () => {
return this.hasMany(global[_.capitalize(details.collection)], details.via);
};
break;
case 'belongsTo':
}
case 'belongsTo': {
loadedModel[name] = () => {
return this.belongsTo(global[_.capitalize(details.model)], name);
};
break;
case 'belongsToMany':
}
case 'belongsToMany': {
const tableName = _.map(_.sortBy([strapi.models[details.collection].attributes[details.via], details], 'collection'), table => {
return _.snakeCase(pluralize.plural(table.collection) + ' ' + pluralize.plural(table.via));
}).join('__');
@ -207,9 +207,10 @@ module.exports = function (strapi) {
return this.belongsToMany(global[_.capitalize(details.collection)], tableName, relationship.attribute + '_' + relationship.column, details.attribute + '_' + details.column);
};
break;
default:
}
default: {
break;
}
}
done();

2
packages/strapi-bookshelf/lib/utils/graphql.js
View File

@ -108,7 +108,7 @@ module.exports = {
* @return {Object}
*/
create: (collectionIdentity, rootValue, args) => {
create: (collectionIdentity, rootValue) => {
return strapi.services[collectionIdentity.toLowerCase()]
.add(rootValue.context.request.body)
.then(data => _.isFunction(_.get(data, 'toJSON')) ? data.toJSON() : data);

8
packages/strapi-generate-admin/files/admin/controllers/Admin.js
View File

@ -10,8 +10,12 @@ const path = require('path');
module.exports = {
index: async ctx => {
// Send the HTML file with injected scripts
ctx.body = strapi.admin.services.admin.generateAdminIndexFile();
try {
// Send the HTML file with injected scripts
ctx.body = strapi.admin.services.admin.generateAdminIndexFile();
} catch (err) {
ctx.body = err;
}
},
file: async ctx => {

1
packages/strapi-generate-api/json/routes.json.js
View File

@ -6,7 +6,6 @@
// Node.js core.
const fs = require('fs');
const path = require('path');
// Public node modules.
const _ = require('lodash');

8
packages/strapi-generate-new/json/package.json.js
View File

@ -4,10 +4,6 @@
* Module dependencies
*/
// Node.js core.
const fs = require('fs');
const path = require('path');
// Public node modules.
const _ = require('lodash');
@ -19,10 +15,6 @@ const _ = require('lodash');
module.exports = scope => {
const cliPkg = scope.strapiPackageJSON || {};
// To determine the Strapi dependency to inject
// in the newly created `package.json`.
const frameworkPkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'strapi', 'package.json'))) || {};
// Finally, return the JSON.
return _.merge(scope.appPackageJSON || {}, {
'name': scope.name,

3
packages/strapi-generate/lib/index.js
View File

@ -36,7 +36,6 @@ module.exports = (scope, cb) => {
// Use configured module name for this `generatorType` if applicable.
const module = 'strapi-generate-' + scope.generatorType;
let generator;
let requireError;
function throwIfModuleNotFoundError(error, module) {
const isModuleNotFoundError = error && error.code === 'MODULE_NOT_FOUND' && error.message.match(new RegExp(module));
@ -52,7 +51,7 @@ module.exports = (scope, cb) => {
try {
generator = require('../../' + module);
} catch (error) {
requireError = throwIfModuleNotFoundError(error, module);
throwIfModuleNotFoundError(error, module);
}
if (!generator) {

1
packages/strapi-mongoose/lib/index.js
View File

@ -8,7 +8,6 @@
const _ = require('lodash');
const mongoose = require('mongoose');
const mongooseUtils = require('mongoose/lib/utils');
const pluralize = require('pluralize');
// Local helpers.
const utils = require('./utils/');

3
packages/strapi-mongoose/lib/utils/index.js
View File

@ -4,9 +4,6 @@
* Module dependencies
*/
// Public node modules.
const _ = require('lodash');
module.exports = mongoose => {
require('mongoose-double')(mongoose);
require('mongoose-float').loadType(mongoose);

2
packages/strapi-utils/lib/models.js
View File

@ -55,7 +55,6 @@ module.exports = {
const ORM = this.getORM(collectionIdentity);
try {
const GraphQLFunctions = require(path.resolve(strapi.config.appPath, 'node_modules', 'strapi-' + ORM, 'lib', 'utils'));
const ORMFunctions = require(path.resolve(strapi.config.appPath, 'node_modules', 'strapi-' + ORM, 'lib', 'utils'));
if (!_.isUndefined(ORMFunctions)) {
@ -74,7 +73,6 @@ module.exports = {
*/
getNature: (association, key, models) => {
const strapi = _.isUndefined(global['strapi']) && !_.isUndefined(models) ? _.set({}, 'models', models) : global['strapi'];
const types = {
current: '',
other: ''

3
packages/strapi/bin/strapi-console.js
View File

@ -9,9 +9,6 @@
// Node.js core.
const REPL = require('repl');
// Public node modules.
const _ = require('lodash');
// Local Strapi dependencies.
const strapi = require('../lib/');

4
packages/strapi/bin/strapi.js
View File

@ -122,7 +122,9 @@ try {
cmd.description(info.description);
cmd.action(require('./strapi-generate'));
});
} catch (err) {}
} catch (err) {
logger.error(err);
}
// `$ strapi migrate:make`
cmd = program.command('migrate:make');

1
packages/strapi/lib/Strapi.js
View File

@ -10,7 +10,6 @@ const http = require('http');
const EventEmitter = require('events').EventEmitter;
// Local dependencies.
const _ = require('lodash');
const Koa = require('koa');
const mixinAfter = require('./private/after');

2
packages/strapi/lib/configuration/hooks/core/responses/policy.js
View File

@ -16,7 +16,7 @@ const responses = require('./responses/index');
const createResponses = ctx => {
return _.merge(
responses,
_.mapValues(_.omit(Boom, ['wrap', 'create']), (fn, name) => (...rest) => {
_.mapValues(_.omit(Boom, ['wrap', 'create']), (fn) => (...rest) => {
ctx.body = fn(...rest);
})
);

8
packages/strapi/lib/configuration/hooks/core/router/index.js
View File

@ -59,7 +59,7 @@ module.exports = strapi => {
const endpoint = `${value.method} ${value.path}`;
try {
const {route, policies, action, validate} = routerChecker(value, endpoint);
const {policies, action, validate} = routerChecker(value, endpoint);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
@ -88,7 +88,7 @@ module.exports = strapi => {
const endpoint = `${value.method} ${value.path}`;
try {
const {route, policies, action, validate} = routerChecker(value, endpoint);
const {policies, action, validate} = routerChecker(value, endpoint);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
@ -131,7 +131,7 @@ module.exports = strapi => {
const endpoint = `${value.method} ${value.path}`;
try {
const {route, policies, action, validate} = routerChecker(value, endpoint, plugin);
const {policies, action, validate} = routerChecker(value, endpoint, plugin);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
@ -160,7 +160,7 @@ module.exports = strapi => {
const endpoint = `${value.method} ${value.path}`;
try {
const {route, policies, action, validate} = routerChecker(value, endpoint, plugin);
const {policies, action, validate} = routerChecker(value, endpoint, plugin);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');

2
packages/strapi/lib/configuration/hooks/dictionary/_config/index.js
View File

@ -187,7 +187,7 @@ module.exports = strapi => {
// an ES6 literal string without parenthesis inside (aka function call).
const regex = /^\$\{[^()]*\}$/g;
return _.mapValues(object, (value, key) => {
return _.mapValues(object, (value) => {
if (_.isPlainObject(value)) {
return templateConfigurations(value);
} else if (_.isString(value) && regex.test(value)) {

1
packages/strapi/lib/configuration/hooks/index.js
View File

@ -6,7 +6,6 @@
// Public node modules.
const _ = require('lodash');
const async = require('async');
/**
* Expose the strategy to load

4
packages/strapi/lib/load.js
View File

@ -53,7 +53,7 @@ module.exports = function (configOverride, cb) {
initializeHooks: ['loadDictionary', (result, cb) => initializeHooks.apply(this, [cb])],
// Load hooks into memory.
loadHooks: ['initializeHooks', (result, cb) => loadHooks.apply(this, [cb])]
}, (err, results) => {
}, (err) => {
if (err) {
console.log(err);
}
@ -116,7 +116,7 @@ module.exports = function (configOverride, cb) {
const mapper = _.clone(this.config.hooks);
// Map (warning: we could have some order issues).
_.assignWith(mapper, this.tree, (objValue, srcValue) => {
_.assignWith(mapper, this.tree, (objValue) => {
if (_.isPlainObject(objValue)) {
return true;
}

3
packages/strapi/lib/private/initialize.js
View File

@ -4,9 +4,6 @@
* Module dependencies
*/
// Public node modules.
const _ = require('lodash');
/**
* `strapi.prototype.initialize()`
*