diff --git a/bin/commands/generator/BasePhoveaGenerator.js b/bin/commands/generator/BasePhoveaGenerator.js index 9656036..4e66645 100644 --- a/bin/commands/generator/BasePhoveaGenerator.js +++ b/bin/commands/generator/BasePhoveaGenerator.js @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ +const path = require('path'); const Generator = require('yeoman-generator'); const { merge, template } = require('lodash'); -const path = require('path'); const glob = require('glob').sync; const fs = require('fs-extra'); const GeneratorUtils = require('./utils/GeneratorUtils'); diff --git a/bin/commands/generator/setup-workspace/index.js b/bin/commands/generator/setup-workspace/index.js index 8109db7..15fee31 100644 --- a/bin/commands/generator/setup-workspace/index.js +++ b/bin/commands/generator/setup-workspace/index.js @@ -7,10 +7,10 @@ /* eslint-disable no-param-reassign */ /* eslint-disable prefer-destructuring */ /* eslint-disable no-underscore-dangle */ +const path = require('path'); const Base = require('yeoman-generator'); const chalk = require('chalk'); const fs = require('fs-extra'); -const path = require('path'); const RepoUtils = require('../utils/RepoUtils'); const SpawnUtils = require('../utils/SpawnUtils'); const WorkspaceUtils = require('../utils/WorkspaceUtils'); diff --git a/bin/commands/generator/update/index.js b/bin/commands/generator/update/index.js index 67a9950..72ca9e6 100644 --- a/bin/commands/generator/update/index.js +++ b/bin/commands/generator/update/index.js @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ +const fs = require('fs'); const chalk = require('chalk'); const Base = require('yeoman-generator'); -const fs = require('fs'); function extractFromReadme(content) { const safe = (p) => (p ? p[1] : ''); diff --git a/bin/commands/generator/utils/GeneratorUtils.js b/bin/commands/generator/utils/GeneratorUtils.js index e0b8aee..4739e00 100644 --- a/bin/commands/generator/utils/GeneratorUtils.js +++ b/bin/commands/generator/utils/GeneratorUtils.js @@ -1,9 +1,9 @@ /* eslint-disable global-require */ /* eslint-disable no-underscore-dangle */ /* eslint-disable no-promise-executor-return */ +const path = require('path'); const fs = require('fs-extra'); const yeoman = require('yeoman-environment'); -const path = require('path'); const { isError } = require('lodash'); module.exports = class GeneratorUtils { diff --git a/bin/commands/generator/workspace/index.js b/bin/commands/generator/workspace/index.js index bcec746..024ae95 100644 --- a/bin/commands/generator/workspace/index.js +++ b/bin/commands/generator/workspace/index.js @@ -5,11 +5,11 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable no-underscore-dangle */ const path = require('path'); +const fs = require('fs'); const glob = require('glob').sync; const chalk = require('chalk'); const { extend } = require('lodash'); const _ = require('lodash'); -const fs = require('fs'); const yaml = require('yamljs'); const NpmUtils = require('../utils/NpmUtils'); const PipUtils = require('../utils/PipUtils'); diff --git a/bin/commands/product-build.js b/bin/commands/product-build.js index 0054750..a618b20 100644 --- a/bin/commands/product-build.js +++ b/bin/commands/product-build.js @@ -8,8 +8,8 @@ /* eslint-disable no-plusplus */ /* eslint-disable no-continue */ /* eslint-disable no-restricted-syntax */ -const Promise = require('bluebird'); const path = require('path'); +const Promise = require('bluebird'); const fs = Promise.promisifyAll(require('fs-extra')); const chalk = require('chalk'); const GeneratorUtils = require('./generator/utils/GeneratorUtils'); diff --git a/config/eslintrc.template.js b/config/eslintrc.template.js index 1cc4979..6718593 100755 --- a/config/eslintrc.template.js +++ b/config/eslintrc.template.js @@ -70,6 +70,7 @@ module.exports = ({ tsconfigRootDir }) => ({ 'prefer-spread': 'warn', '@typescript-eslint/ban-ts-comment': 'warn', 'react/destructuring-assignment': 'off', + 'react/jsx-curly-brace-presence': 'warn', 'react/jsx-props-no-spreading': 'off', 'react/no-unused-class-component-methods': 'warn', 'react/prop-types': 'off', diff --git a/package.json b/package.json index cbe4c1a..f12b34b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "visyn_scripts", "description": "", - "version": "4.0.1", + "version": "4.1.0", "author": { "name": "datavisyn GmbH", "email": "contact@datavisyn.io", diff --git a/tests/standalone.test.js b/tests/standalone.test.js index b0cd2a5..3aedc2f 100644 --- a/tests/standalone.test.js +++ b/tests/standalone.test.js @@ -1,7 +1,7 @@ -const fse = require('fs-extra'); const fs = require('fs'); const { resolve } = require('path'); const { execSync } = require('child_process'); +const fse = require('fs-extra'); const { setup: setupDevServer, teardown: teardownDevServer } = require('jest-dev-server'); // Mock setup of yargs inspired by https://www.kgajera.com/blog/how-to-test-yargs-cli-with-jest/