Skip to content

Commit

Permalink
Merge pull request #306 from iambumblehead/pin-node-22-version-increm…
Browse files Browse the repository at this point in the history
…ent-dependencies

pin node 22 version
  • Loading branch information
iambumblehead authored Jun 15, 2024
2 parents ad0d538 + 5eb1403 commit 40b049e
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 145 deletions.
124 changes: 0 additions & 124 deletions .eslintrc.json

This file was deleted.

5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18.x, 20.x, 22.x]
node-version: [18.x, 20.x, 22.1.x]
os: [ubuntu-latest, windows-latest]
exclude:
- os: windows-latest
node-version: 22.x
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# changelog

* 2.6.6 _Jun.15.2024_
* [add tsx tests and remove tsx caution from README](https://github.com/iambumblehead/esmock/pull/305) thanks @galexite
* [pin node 22.1 at test CI](https://github.com/iambumblehead/esmock/pull/306) and ignore regressions in new node 22
* [migrate to eslint 9](https://github.com/iambumblehead/esmock/pull/306)
* 2.6.5 _Apr.25.2024_
* [add node 22 to ci test pipeline](https://github.com/iambumblehead/esmock/pull/297) thanks @aladdin-add
* [use json import syntax `with { type: 'json' }`](https://github.com/iambumblehead/esmock/pull/298) for node 22
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

_**Note: For versions of node prior to v20.6.0,** "--loader" command line arguments must be used with `esmock` as demonstrated [in the wiki.][4] Current versions of node do not require "--loader"._

_**Note: TypeScript loaders** `ts-node` 👍, `tsm` 👍 and `tsx` 👍 are compatible with other loaders, [including esmock.][3] `swc-node` has, at time of writing, been demonstrated as **incompatible** with other loaders, including esmock._
_**Note: TypeScript loader** `swc-node` is, at time of writing, **incompatible** with other loaders, including esmock._

`esmock` has the below signature
```js
Expand Down
107 changes: 107 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import js from '@eslint/js'
import markdown from 'eslint-plugin-markdown'
import tseslint from 'typescript-eslint'

export default [
{
ignores: [
"tests/**/dist",
"tests/local/importsJSONfile.with.js",
"tests/local/importsJSONfile.assert.legacy.js"
]
},
js.configs.recommended,
...tseslint.configs.recommended,
{
files: ["**/*.ts", "**/*.js"],
rules: {
"@typescript-eslint/no-unused-expressions": 0,
"@typescript-eslint/no-explicit-any": 0,
"comma-dangle": "off"
}
},
...markdown.configs.recommended,
{
ignores: [
"src/esmock.d.ts"
],
languageOptions: {
ecmaVersion: 2022,
sourceType: "module",
globals: {
Set: true,
console: true,
setTimeout: true,
fetch: true,
process: true,
URL: true,
global: true,
describe: true,
it: true,
test: true,
expect: true
}
},
rules: {
"no-trailing-spaces": [2],
"no-unused-vars": ["error", {
"vars": "all",
"args": "after-used",
"ignoreRestSiblings": false
}],
"global-require": 0,
"no-sequences": 0,
"strict": [2, "never"],
"one-var": [2, {
"let": "always",
"const": "never"
}],
"space-in-parens": [2, "never"],
"import/newline-after-import": 0,
"indent": [2, 2, {
"flatTernaryExpressions": true,
"VariableDeclarator": {
"let": 2,
"const": 3
}
}],
"camelcase": [2, {"properties": "never"}],
"no-underscore-dangle": 0,
"func-names": [2, "never"],
"newline-per-chained-call": 0,
"max-len": [2, 80],
"comma-dangle": [2, "never"],
"no-mixed-operators": 0,
"no-plusplus": 0,
"no-console": 0,
"semi": [2, "never"],
"nonblock-statement-body-position": 0,
"arrow-parens": [2, "as-needed"],
"space-before-function-paren": [2, "always"],
"function-paren-newline": 0,
"consistent-return": 0,
"array-callback-return": 0,
"prefer-const": 0,
"prefer-object-spread": 0,
"curly": 0,
"operator-linebreak": 0,
"no-param-reassign": 0,
"key-spacing": [2],
"implicit-arrow-linebreak": 0,
"no-shadow": [0, "warn", {
"allow": ["err"]
}
],
"prefer-arrow-callback": [2, {
"allowNamedFunctions": true
}],
"no-return-assign": 0,
"no-use-before-define": [2, "nofunc"],
"no-nested-ternary": 0,
"array-bracket-spacing": [2, "never"],
"prefer-destructuring": 0,
"class-methods-use-this": 0,
"no-confusing-arrow": 0
}
}
]
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@
"resolvewithplus": "^2.1.5"
},
"devDependencies": {
"c8": "^9.1.0",
"eslint": "^8.57.0",
"eslint-plugin-markdown": "^3.0.1",
"@typescript-eslint/parser": "^7.1.0",
"@typescript-eslint/eslint-plugin": "^7.1.0"
"c8": "^10.1.2",
"eslint": "^9.5.0",
"eslint-plugin-markdown": "^5.0.0",
"typescript-eslint": "^8.0.0-alpha.30",
"@typescript-eslint/parser": "^8.0.0-alpha.30",
"@typescript-eslint/eslint-plugin": "^8.0.0-alpha.30"
},
"scripts": {
"test:install": "cd tests && npm run install:all",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-ava/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, ava",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"ava": "^5.3.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-jest-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, jest with jest-light-runner",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"ts-node": "^10.9.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, jest with jest-light-runner",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"jest": "^29.6.2",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-mocha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, mocha",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"mocha": "^10.2.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-no-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, no loader should error",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"esmock": "file:..",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, node native runner",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"esmock": "file:..",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-nodets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, ts-node/esm with node native runner",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"ts-node": "^10.9.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-source-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, ava with sourcemap",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"esmock": "file:..",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-tsm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, tsm with node native runner",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"tsm": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-tsx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, tsx with node",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"esmock": "file:..",
Expand Down
2 changes: 1 addition & 1 deletion tests/tests-uvu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "esmock unit tests, uvu",
"repository": {
"type": "git",
"url": "https://github.com/iambumblehead/esmock.git"
"url": "git+https://github.com/iambumblehead/esmock.git"
},
"dependencies": {
"uvu": "^0.5.6",
Expand Down

0 comments on commit 40b049e

Please sign in to comment.