Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: atom-community/eslint-config-atomic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.16.6
Choose a base ref
...
head repository: atom-community/eslint-config-atomic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.17.0
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 17, 2022

  1. feat: make coffee plugin optional

    @aminya
    aminya committed Feb 17, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2915bc4 View commit details

  2. fix: update dependencies

    @aminya
    aminya committed Feb 17, 2022
    Copy the full SHA
    0e6b15b View commit details

  3. Merge pull request #59 from atom-community/optional-coffee

    @aminya
    aminya authored Feb 17, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd20dd9 View commit details
Showing with 283 additions and 200 deletions.
  1. +10 −8 package.json
  2. +258 −189 pnpm-lock.yaml
  3. +0 −2 pnpm-workspace.yaml
  4. +15 −1 src/index.js
18 changes: 10 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -22,23 +22,20 @@
"prettier": "prettier-config-atomic",
"dependencies": {
"@babel/core": "^7",
"@babel/eslint-parser": "^7.16.5",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-syntax-jsx": "^7.16.7",
"@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1",
"coffeescript": "^1",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
"eslint": "^7",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-coffee": "^0.1.15",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-only-warn": "npm:@aminya/eslint-plugin-only-warn@^1.2.2",
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-yaml": "^0.5.0",
"prettier": "^2",
"read-pkg-up": "^7",
@@ -48,13 +45,18 @@
"eslint": "^7",
"execa": "^5.1.1",
"gitly": "^2.1.5",
"npm-check-updates": "12.2.1",
"prettier-config-atomic": "^3.0.1",
"npm-check-updates": "12.3.0",
"prettier-config-atomic": "^3.0.3",
"shelljs": "^0.8.5"
},
"peerDependencies": {
"eslint": "^7"
},
"optionalDependencies": {
"coffeescript": "^1",
"eslint-plugin-coffee": "^0.1.15",
"eslint-plugin-react-hooks": "^4.3.0"
},
"keywords": [
"eslint",
"config",
447 changes: 258 additions & 189 deletions pnpm-lock.yaml
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions pnpm-workspace.yaml
View file

This file was deleted.

16 changes: 15 additions & 1 deletion src/index.js
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,20 @@ const { yamlConfig } = require("./yaml")
const { htmlConfig } = require("./html")
const { pluginImportSettings } = require("./plugin-import-rules")

const overrides = [tsConfig, jsonConfig, yamlConfig, htmlConfig]

// add coffee if installed
if (coffeeConfig !== {}) {
try {
const found = require.resolve("eslint-plugin-coffee")
if (found) {
overrides.push(coffeeConfig, csonConfig)
}
} catch (_err) {
// optional plugin
}
}

module.exports = {
root: true,
env: {
@@ -21,7 +35,7 @@ module.exports = {
measure: "readonly",
},
...jsConfig,
overrides: [tsConfig, coffeeConfig, jsonConfig, csonConfig, yamlConfig, htmlConfig],
overrides,
settings: {
...pluginImportSettings,
},