refactor: use es6 modules consistently

This commit is contained in:
Dominik Ferber
2016-03-09 17:36:58 +01:00
parent 1bf7bd4973
commit 9ebb7a0ce7
17 changed files with 60 additions and 52 deletions

View File

@@ -1,12 +1,20 @@
module.exports = {
import auditArgumentChecks from './rules/audit-argument-checks'
import noSession from './rules/no-session'
import noBlazeLifecycleAssignment from './rules/no-blaze-lifecycle-assignment'
import noZeroTimeout from './rules/no-zero-timeout'
import blazeConsistentEventMapParams from './rules/blaze-consistent-eventmap-params'
import preferSessionEquals from './rules/prefer-session-equals'
import templateNamingConvention from './rules/template-naming-convention'
export default {
rules: {
'audit-argument-checks': require('./rules/audit-argument-checks'),
'no-session': require('./rules/no-session'),
'no-blaze-lifecycle-assignment': require('./rules/no-blaze-lifecycle-assignment'),
'no-zero-timeout': require('./rules/no-zero-timeout'),
'blaze-consistent-eventmap-params': require('./rules/blaze-consistent-eventmap-params'),
'prefer-session-equals': require('./rules/prefer-session-equals'),
'template-naming-convention': require('./rules/template-naming-convention'),
'audit-argument-checks': auditArgumentChecks,
'no-session': noSession,
'no-blaze-lifecycle-assignment': noBlazeLifecycleAssignment,
'no-zero-timeout': noZeroTimeout,
'blaze-consistent-eventmap-params': blazeConsistentEventMapParams,
'prefer-session-equals': preferSessionEquals,
'template-naming-convention': templateNamingConvention,
},
configs: {
parserOptions: {

View File

@@ -10,7 +10,7 @@ import { isMeteorCall, isFunction } from '../util/ast'
// -----------------------------------------------------------------------------
module.exports = context => {
export default context => {
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
@@ -78,4 +78,4 @@ module.exports = context => {
}
}
module.exports.schema = []
export const schema = []

View File

@@ -11,7 +11,7 @@ import { isFunction, isTemplateProp } from '../util/ast'
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => {
export default context => {
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
@@ -58,7 +58,7 @@ module.exports = context => {
}
}
module.exports.schema = [
export const schema = [
{
type: 'object',
properties: {

View File

@@ -7,7 +7,7 @@
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => {
export default context => {
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
@@ -53,4 +53,4 @@ module.exports = context => {
}
}
module.exports.schema = []
export const schema = []

View File

@@ -7,7 +7,7 @@
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => ({
export default context => ({
MemberExpression: (node) => {
if (node.object.name === 'Session') {
context.report(node, 'Unexpected Session statement')
@@ -15,4 +15,4 @@ module.exports = context => ({
},
})
module.exports.schema = []
export const schema = []

View File

@@ -9,7 +9,7 @@ import { isMeteorCall } from '../util/ast'
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => ({
export default context => ({
CallExpression: (node) => {
if (isMeteorCall(node, 'setTimeout')) {
if (node.arguments.length === 1) {
@@ -25,4 +25,4 @@ module.exports = context => ({
},
})
module.exports.schema = []
export const schema = []

View File

@@ -30,7 +30,7 @@ const isSessionGetCallExpression = node => (
// -----------------------------------------------------------------------------
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => {
export default context => {
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
@@ -64,4 +64,4 @@ module.exports = context => {
}
}
module.exports.schema = []
export const schema = []

View File

@@ -36,7 +36,7 @@ const isTemplateMemberExpression = node => (
const getErrorMessage = expected => `Invalid template naming convention, expected "${expected}"`
module.exports = context => ({
export default context => ({
MemberExpression: node => {
if (!isTemplateMemberExpression(node)) return
@@ -63,6 +63,6 @@ module.exports = context => ({
},
})
module.exports.schema = [
export const schema = [
{ enum: Object.values(NAMING_CONVENTIONS) },
]

View File

@@ -62,7 +62,7 @@ const rule = `/**
// Rule Definition
// -----------------------------------------------------------------------------
module.exports = context => {
export default context => {
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
@@ -79,7 +79,7 @@ module.exports = context => {
}
module.exports.schema = [
export const schema = [
// fill in your schema
]
@@ -96,8 +96,8 @@ const test = `/**
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/${ruleId}')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/${ruleId}')
import { RuleTester } from 'eslint'
const ruleTester = new RuleTester()
ruleTester.run('${ruleId}', rule, {

View File

@@ -1,26 +1,24 @@
const plugin = require('../lib/index.js')
const assert = require('assert')
const fs = require('fs')
const path = require('path')
import plugin from '../lib/index'
import assert from 'assert'
import fs from 'fs'
import path from 'path'
const rules = fs.readdirSync(path.resolve(__dirname, '../lib/rules/'))
.filter(f => path.extname(f) === '.js')
.map(f => path.basename(f, '.js'))
describe('all rule files should be exported by the plugin', () => {
rules.forEach((ruleName) => {
rules.forEach(ruleName => {
it(`should export ${ruleName}`, () => {
assert.deepEqual(
plugin.rules[ruleName],
require(path.join('../lib/rules', ruleName))
)
assert(plugin.rules.hasOwnProperty(ruleName))
})
})
})
describe('configurations', () => {
it('should export a \'recommended\' configuration', () => {
assert(plugin.configs.recommended)
rules.forEach(ruleName => {
it(`should have a recommended configuration for ${ruleName}`, () => {
assert(plugin.configs.recommended.rules.hasOwnProperty(`meteor/${ruleName}`))
})
})
})

View File

@@ -7,8 +7,10 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/audit-argument-checks')
const RuleTester = require('eslint').RuleTester
// import rule from '../../../lib/rules/audit-argument-checks')
// import { RuleTester } from 'eslint'
import rule from '../../../lib/rules/audit-argument-checks'
import { RuleTester } from 'eslint'
// -----------------------------------------------------------------------------
// Tests

View File

@@ -9,8 +9,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/blaze-consistent-eventmap-params')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/blaze-consistent-eventmap-params'
import { RuleTester } from 'eslint'
// -----------------------------------------------------------------------------
// Tests

View File

@@ -9,8 +9,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/no-blaze-lifecycle-assignment')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/no-blaze-lifecycle-assignment'
import { RuleTester } from 'eslint'
// -----------------------------------------------------------------------------
// Tests

View File

@@ -9,8 +9,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/no-session')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/no-session'
import { RuleTester } from 'eslint'
// -----------------------------------------------------------------------------
// Tests

View File

@@ -7,8 +7,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/no-zero-timeout')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/no-zero-timeout'
import { RuleTester } from 'eslint'
// -----------------------------------------------------------------------------
// Tests

View File

@@ -9,8 +9,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/prefer-session-equals')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/prefer-session-equals'
import { RuleTester } from 'eslint'
const ruleTester = new RuleTester()
ruleTester.run('prefer-session-equals', rule, {

View File

@@ -9,8 +9,8 @@
// Requirements
// -----------------------------------------------------------------------------
const rule = require('../../../lib/rules/template-naming-convention')
const RuleTester = require('eslint').RuleTester
import rule from '../../../lib/rules/template-naming-convention'
import { RuleTester } from 'eslint'
const ruleTester = new RuleTester()
ruleTester.run('template-naming-convention', rule, {