Merge pull request #316 from hoverinc/beta

Author: jrolfs

.babelrc.json

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "10"
+        }
+      }
+    ]
+  ]
+}

README.md

@@ -95,6 +95,26 @@ module.exports = {
 }
 ```
 
+##### Strict Preset
+
+> ✨ The strict preset is recommended for new projects!
+
+A strict preset is also available that includes more agressive linting rules
+that enforce the order and grouping of imports.
+
+```js
+module.exports = {
+  extends: [
+    require.resolve('@hover/javascript/eslint'),
+    require.resolve('@hover/javascript/eslint/strict'),
+  ],
+  // Include this when using TypeScript
+  parserOptions: {
+    project: ['./tsconfig.json'],
+  },
+}
+```
+
 #### Prettier
 
 Or, for Prettier, a `.prettierrc.js` with:

api.d.ts

@@ -0,0 +1 @@
+export * from '../dist/api/commit'

api.js

@@ -0,0 +1 @@
+module.exports = require('../dist/api/commit')

api/commit.d.ts

@@ -0,0 +1 @@
+export * from '../dist/api'

api/commit.js

@@ -0,0 +1 @@
+module.exports = require('../dist/api')

api/index.d.ts

@@ -0,0 +1 @@
+module.exports = require('../dist/config/eslintrc')

api/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/config/eslintrc-strict')

babel.js

@@ -14,7 +14,7 @@
     "test": "node src test",
     "test:update": "node src test --updateSnapshot",
     "build": "run-p build:*",
-    "build:source": "node src build",
+    "build:source": "babel --source-maps --out-dir dist --ignore '**/__tests__/**','**/__mocks__/**' --copy-files --no-copy-ignored src",
     "build:types": "tsc -p src/",
     "lint": "node src lint",
     "format": "node src format",
@@ -34,13 +34,12 @@
   "files": [
     "api",
     "api.d.ts",
-    "api.js",
-    "babel.js",
+    "dist",
     "commitlint.js",
     "config.js",
     "dist",
     "eslint-react.js",
-    "eslint.js",
+    "eslint",
     "jest.js",
     "lint-staged.js",
     "prettier.js",
@@ -51,33 +50,13 @@
   "author": "Jamie Rolfs <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@babel/cli": "^7.11.6",
-    "@babel/core": "^7.11.6",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-flow": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "@babel/runtime": "^7.11.2",
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
     "@commitlint/prompt": "^11.0.0",
-    "@rollup/plugin-commonjs": "^15.0.0",
-    "@rollup/plugin-json": "^4.0.2",
-    "@rollup/plugin-node-resolve": "^7.1.1",
-    "@rollup/plugin-replace": "^2.3.1",
     "@types/jest": "^26.0.14",
     "@typescript-eslint/eslint-plugin": "^4.4.0",
     "@typescript-eslint/parser": "^4.4.0",
     "arrify": "^2.0.1",
-    "babel-jest": "^26.3.0",
-    "babel-plugin-macros": "^2.8.0",
-    "babel-plugin-minify-dead-code-elimination": "^0.5.1",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.3",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "browserslist": "^4.14.5",
     "chalk": "^4.1.0",
     "commitizen": "^4.2.1",
     "concurrently": "^5.1.0",
@@ -109,12 +88,6 @@
     "read-pkg-up": "^7.0.1",
     "resolve": "^1.15.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.26.4",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.4.0",
-    "rollup-plugin-size-snapshot": "^0.12.0",
-    "rollup-plugin-terser": "^7.0.2",
     "semver": "^7.1.3",
     "typescript": "^4.0.3",
     "which": "^2.0.2",
@@ -148,6 +121,10 @@
   },
   "homepage": "https://github.com/hoverinc/hover-javascript#readme",
   "devDependencies": {
+    "@babel/cli": "^7.11.6",
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.11.5",
+    "babel-jest": "^26.5.2",
     "jest-in-case": "^1.0.2",
     "npm-run-all": "^4.1.5",
     "slash": "^3.0.0"

eslint.js

@@ -14,22 +14,13 @@ Array [
 ]
 `;
 
-exports[`format logs for SIGTERM signal 1`] = `
-Array [
-  Array [
-    The script "build" failed because the process exited too early. Someone might have called \`kill\` or \`killall\`, or the system could be shutting down.,
-  ],
-]
-`;
-
 exports[`format logs help with no args 1`] = `
 Array [
   Array [
     
 Usage: ../ [script] [--flags]
 
 Available Scripts:
-  build
   ci-after-success
   commit-msg
   commit

eslint/index.js

@@ -73,10 +73,6 @@ cases(
       args: ['lint'],
       signal: 'SIGKILL',
     },
-    'logs for SIGTERM signal': {
-      args: ['build'],
-      signal: 'SIGTERM',
-    },
     'does not log for other signals': {
       args: ['test'],
       signal: 'SIGBREAK',

eslint/strict.js

@@ -1,11 +1,7 @@
 test('requiring some files does not blow up', () => {
-  require('../babel-transform')
-  require('../babelrc')
   require('../eslintrc')
   require('../eslintrc-react')
   require('../jest.config')
   require('../lintstagedrc')
   require('../prettierrc')
-  require('../rollup.config')
-  require('../').getRollupConfig()
 })

package.json

@@ -1,3 +1,3 @@
-const {buildConfig} = require('./helpers/eslint')
+const {buildConfig} = require('./helpers/build-eslint')
 
 module.exports = buildConfig({withReact: true})

src/__tests__/__snapshots__/index.js.snap

@@ -0,0 +1,17 @@
+module.exports = {
+  rules: {
+    'import/order': [
+      'error',
+      {
+        alphabetize: {order: 'asc'},
+        'newlines-between': 'always',
+        pathGroups: [
+          {pattern: 'src/**/*', group: 'parent', position: 'before'},
+          {pattern: 'assets/**/*', group: 'parent', position: 'before'},
+        ],
+        pathGroupsExcludedImportTypes: ['builtin'],
+      },
+    ],
+    'sort-imports': ['error', {ignoreDeclarationSort: true}],
+  },
+}

src/__tests__/index.js

@@ -1,3 +1,3 @@
-const {buildConfig} = require('./helpers/eslint')
+const {buildConfig} = require('./helpers/build-eslint')
 
 module.exports = buildConfig()

src/config/__tests__/umbrella.js

@@ -1,4 +1,6 @@
-const {rules} = require('eslint-config-airbnb-typescript/lib/shared')
+const {
+  rules: airbnbRules,
+} = require('eslint-config-airbnb-typescript/lib/shared')
 
 const {hasAnyDep} = require('../../utils')
 const {testMatch} = require('../jest.config')
@@ -11,6 +13,13 @@ const prettier = withBaseConfig('eslint-config-prettier')
 
 const hasReact = hasAnyDep('react')
 
+/**
+ * Helper that applies some rules conditionally based on whether the TypeScript
+ * parser and type-aware linting rules are enabled
+ *
+ * @param {boolean} [typescript] - whether specific TypeScript parsing is applied
+ * @param {boolean} [react] - whether in React support is enabled
+ */
 const parserRules = (typescript = false, react = false) => {
   const isOff = off => (off ? 'off' : 'error')
 
@@ -44,7 +53,7 @@ const buildConfig = ({withReact = false} = {}) => {
       'import/no-extraneous-dependencies': [
         'error',
         {
-          devDependencies: rules[
+          devDependencies: airbnbRules[
             'import/no-extraneous-dependencies'
           ][1].devDependencies.concat([
             'jest/**',
@@ -54,21 +63,8 @@ const buildConfig = ({withReact = false} = {}) => {
           optionalDependencies: false,
         },
       ],
-      'import/order': [
-        'error',
-        {
-          alphabetize: {order: 'asc'},
-          'newlines-between': 'always',
-          pathGroups: [
-            {pattern: 'src/**/*', group: 'parent', position: 'before'},
-            {pattern: 'assets/**/*', group: 'parent', position: 'before'},
-          ],
-          pathGroupsExcludedImportTypes: ['builtin'],
-        },
-      ],
       'no-void': ['error', {allowAsStatement: true}],
       'prettier/prettier': 'error',
-      'sort-imports': ['error', {ignoreDeclarationSort: true}],
       ...parserRules(false, isReact),
     },
     overrides: [