Skip to content

Commit

Permalink
fix: use cjs and specify commonjs type package
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Sep 30, 2023
1 parent b900ceb commit e0bd7bb
Show file tree
Hide file tree
Showing 24 changed files with 60 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./strict",
"extends": "eslint-config-atomic/strict",
"ignorePatterns": ["dist/", "node_modules/"]
}
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("./dist/index.js").default
module.exports = require("./dist/index.cjs").default
24 changes: 14 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@
"repository": "https://github.com/atom-ide-community/eslint-config-atomic",
"license": "MIT",
"author": "Amin Yahyaabadi",
"main": "index.js",
"type": "commonjs",
"main": "index.cjs",
"files": [
"src",
"dist",
"*.js"
"*.cjs"
],
"scripts": {
"build": "tsc",
"bump": "ncu -u -x coffeescript,execa,read-pkg-up",
"clean": "shx rm -rf ./spec/fixtures/atom-community ./spec/fixtures/atom-minimap ./spec/fixtures/steelbrain ./strict.js ./strict-react.js",
"clean": "shx rm -rf ./spec/fixtures/ ./dist",
"format": "prettier --write .",
"lint": "eslint . --ignore-pattern ./spec/fixtures/ --fix",
"prepare": "npm run build",
"test": "node ./spec/test.js",
"prepare": "pnpm run build",
"prepublishOnly": "pnpm run clean && pnpm run build",
"test": "node ./spec/test.cjs",
"test.format": "prettier . --check",
"test.lint": "eslint . --ignore-pattern spec/fixtures/**"
},
Expand Down Expand Up @@ -58,11 +60,13 @@
"@types/read-pkg-up": "^6.0.0",
"@types/semver": "^7.5.3",
"@types/shelljs": "^0.8.13",
"eslint-config-atomic": "link:",
"execa": "^5.1.1",
"gitly": "^2.4.5",
"npm-check-updates": "16.14.4",
"prettier-config-atomic": "^3.1.0",
"shelljs": "^0.8.5"
"shelljs": "^0.8.5",
"shx": "^0.3.4"
},
"peerDependencies": {
"eslint": "^8 || ^7 || ^6"
Expand All @@ -80,7 +84,7 @@
"lint",
"prettier"
],
"react": "react.js",
"strict": "strict.js",
"strict-react": "strict-react.js"
}
"react": "react.cjs",
"strict": "strict.cjs",
"strict-react": "strict-react.cjs"
}
15 changes: 15 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion react.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("./dist/index-react.js").default
module.exports = require("./dist/index-react.cjs").default
File renamed without changes.
4 changes: 2 additions & 2 deletions src/coffeescript.ts → src/coffeescript.cts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { pluginNodeRules } from "./plugin-node-rules.js"
import { pluginImportRulesExtra } from "./plugin-import-rules.js"
import { pluginNodeRules } from "./plugin-node-rules.cjs"
import { pluginImportRulesExtra } from "./plugin-import-rules.cjs"

export const coffeeConfig = {
// CoffeeScript files
Expand Down
2 changes: 1 addition & 1 deletion src/cson.ts → src/cson.cts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { coffeeConfig } from "./coffeescript.js"
import { coffeeConfig } from "./coffeescript.cjs"

export const csonConfig = {
...coffeeConfig,
Expand Down
2 changes: 1 addition & 1 deletion src/eslint-version.ts → src/eslint-version.cts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import child_process from "child_process"
import eslintPackageJson from "eslint/package.json"

export function getEslintVersion() {
if (process.argv[1].includes("eslint.js")) {
if (process.argv[1].includes("eslint.cjs")) {
const eslintVersion = child_process.execFileSync(process.argv[0], [process.argv[1], "--version"], {
encoding: "utf8",
stdio: "pipe",
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/index-react.ts → src/index-react.cts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import base from "./index.js"
import { tsConfig } from "./typescript"
import base from "./index.cjs"
import { tsConfig } from "./typescript.cjs"

const nonStrictConfig = {
...base,
Expand Down
2 changes: 1 addition & 1 deletion src/index-strict-react.ts → src/index-strict-react.cts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nonStrictConfig from "./index-react.js"
import nonStrictConfig from "./index-react.cjs"

// remove only-warn from javascript
if (nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn") {
Expand Down
2 changes: 1 addition & 1 deletion src/index-strict.ts → src/index-strict.cts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nonStrictConfig from "./index"
import nonStrictConfig from "./index.cjs"

// remove only-warn from javascript
if (nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn") {
Expand Down
18 changes: 9 additions & 9 deletions src/index.ts → src/index.cts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { jsConfig } from "./javascript"
import { tsConfig } from "./typescript"
import { coffeeConfig } from "./coffeescript"
import { jsonConfig } from "./json"
import { csonConfig } from "./cson"
import { yamlConfig } from "./yaml"
import { htmlConfig } from "./html"
import { pluginImportSettings } from "./plugin-import-rules"
import { jsConfig } from "./javascript.cjs"
import { tsConfig } from "./typescript.cjs"
import { coffeeConfig } from "./coffeescript.cjs"
import { jsonConfig } from "./json.cjs"
import { csonConfig } from "./cson.cjs"
import { yamlConfig } from "./yaml.cjs"
import { htmlConfig } from "./html.cjs"
import { pluginImportSettings } from "./plugin-import-rules.cjs"
import semverLt from "semver/functions/lt"
import { getEslintVersion } from "./eslint-version"
import { getEslintVersion } from "./eslint-version.cjs"

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

Expand Down
6 changes: 3 additions & 3 deletions src/javascript.ts → src/javascript.cts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { eslintRulesExtra } from "./official-eslint-rules"
import { pluginNodeRules } from "./plugin-node-rules"
import { pluginImportRulesExtra } from "./plugin-import-rules"
import { eslintRulesExtra } from "./official-eslint-rules.cjs"
import { pluginNodeRules } from "./plugin-node-rules.cjs"
import { pluginImportRulesExtra } from "./plugin-import-rules.cjs"

export const jsConfig = {
parser: "@babel/eslint-parser",
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/plugin-import-rules.ts → src/plugin-import-rules.cts
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export const pluginImportTypeScriptRulesExtra = {
export const pluginImportSettings = {
"import/core-modules": ["atom", "electron"],
// support TypeScript and Coffee importing
"import/extensions": [".ts", ".tsx", ".d.ts", ".js", ".jsx", ".coffee"],
"import/extensions": [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee"],
"import/external-module-folders": ["node_modules", "node_modules/@types"],
"import/parsers": {
"@typescript-eslint/parser": [".ts", ".tsx", ".d.ts"],
},
"import/resolver": {
node: {
extensions: [".ts", ".tsx", ".d.ts", ".js", ".jsx", ".coffee"],
extensions: [".ts", ".tsx", ".cts", ".mts", ".d.ts", ".js", ".cjs", ".mjs", ".jsx", ".coffee"],
},
},
}
File renamed without changes.
8 changes: 4 additions & 4 deletions src/typescript.ts → src/typescript.cts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { eslintRulesExtra } from "./official-eslint-rules"
import { pluginImportRulesExtra, pluginImportTypeScriptRulesExtra } from "./plugin-import-rules"
import { pluginNodeRules } from "./plugin-node-rules"
import { eslintRulesExtra } from "./official-eslint-rules.cjs"
import { pluginImportRulesExtra, pluginImportTypeScriptRulesExtra } from "./plugin-import-rules.cjs"
import { pluginNodeRules } from "./plugin-node-rules.cjs"
import makeSynchronous from "make-synchronous"
import { findOneFile } from "./utils"
import { findOneFile } from "./utils.cjs"
import type { GlobifiedEntry } from "globify-gitignore"

const tsFiles = ["**/*.tsx", "**/*.ts"]
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion strict-react.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("./dist/index-strict-react.js").default
module.exports = require("./dist/index-strict-react.cjs").default
2 changes: 1 addition & 1 deletion strict.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("./dist/index-strict.js").default
module.exports = require("./dist/index-strict.cjs").default

0 comments on commit e0bd7bb

Please sign in to comment.