Skip to content

Commit

Permalink
Merge pull request #1077 from form8ion/beta
Browse files Browse the repository at this point in the history
  • Loading branch information
travi authored Sep 25, 2024
2 parents c7d3d6b + 812339c commit d6d57ac
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 25 deletions.
File renamed without changes.
3 changes: 2 additions & 1 deletion .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
strategy:
matrix:
node:
- 18.17.0
- 18.19.0
- 20.6.1
- 22.0.0
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Setup node
Expand Down
8 changes: 8 additions & 0 deletions .lockfile-lintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"path": "package-lock.json",
"type": "npm",
"validate-https": true,
"allowed-hosts": [
"npm"
]
}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
update-notifier=false
registry=https://registry.npmjs.org
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ const {scaffold, extendEslintConfig} = await import('./lib/index.mjs');
},
decisions => ({
...javascriptPlugin,
scaffold: options =>javascriptPlugin.scaffold({...options, decisions, unitTestFrameworks: {}})
scaffold: options => javascriptPlugin.scaffold({
...options,
decisions,
configs: {},
plugins: {unitTestFrameworks: {}}
})
})
);
})();
Expand Down Expand Up @@ -153,7 +158,7 @@ $ npm test

[license-link]: LICENSE

[license-badge]: https://img.shields.io/github/license/form8ion/eslint-config-extender.svg
[license-badge]: https://img.shields.io/github/license/form8ion/eslint-config-extender.svg?logo=opensourceinitiative

[npm-link]: https://www.npmjs.com/package/@form8ion/eslint-config-extender

Expand Down
7 changes: 6 additions & 1 deletion example.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ stubbedFs({node_modules: stubbedNodeModules});
},
decisions => ({
...javascriptPlugin,
scaffold: options => javascriptPlugin.scaffold({...options, decisions, unitTestFrameworks: {}})
scaffold: options => javascriptPlugin.scaffold({
...options,
decisions,
configs: {},
plugins: {unitTestFrameworks: {}}
})
})
);
})();
55 changes: 43 additions & 12 deletions package-lock.json

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

16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "0.0.0-semantically-released",
"type": "module",
"engines": {
"node": "^18.17.0 || >=20.6.1"
"node": "^18.19.0 || ^20.6.1 || >=22"
},
"author": "Matt Travi <[email protected]> (https://matt.travi.org)",
"repository": "form8ion/eslint-config-extender",
Expand All @@ -17,16 +17,16 @@
"sideEffects": false,
"scripts": {
"test": "npm-run-all --print-label build --parallel lint:* --parallel test:*",
"lint:lockfile": "lockfile-lint --path package-lock.json --type npm --validate-https --allowed-hosts npm",
"lint:lockfile": "lockfile-lint",
"lint:js": "eslint . --cache",
"lint:md": "NODE_OPTIONS=--loader=testdouble remark . --frail",
"lint:md": "remark . --frail",
"pregenerate:md": "run-s build",
"generate:md": "NODE_OPTIONS=\"--loader=testdouble --enable-source-maps\" remark . --output",
"generate:md": "NODE_OPTIONS=--enable-source-maps remark . --output",
"lint:sensitive": "ban",
"pretest:integration:base": "run-s build",
"lint:gherkin": "gherkin-lint",
"test:integration": "run-s 'test:integration:base -- --profile noWip'",
"test:integration:base": "NODE_OPTIONS=\"--loader=testdouble --enable-source-maps\" DEBUG=any cucumber-js test/integration",
"test:integration:base": "NODE_OPTIONS=--enable-source-maps DEBUG=any cucumber-js test/integration",
"test:integration:debug": "DEBUG=test run-s test:integration",
"test:integration:wip": "run-s 'test:integration:base -- --profile wip'",
"test:integration:wip:debug": "DEBUG=test run-s 'test:integration:wip'",
Expand All @@ -42,7 +42,8 @@
"lint:peer": "npm ls >/dev/null",
"prepare": "husky install",
"lint:engines": "ls-engines",
"lint:publish": "publint --strict"
"lint:publish": "publint --strict",
"lint:js:fix": "run-s 'lint:js -- --fix'"
},
"files": [
"example.js",
Expand All @@ -52,10 +53,11 @@
"access": "public",
"provenance": true
},
"packageManager": "[email protected]+sha256.b7dc7eb48d7479b93668e913c7ad686ab2aa71c705d4a56b5323d1bffdba2972",
"dependencies": {
"@form8ion/config-file": "^1.1.2",
"@form8ion/core": "^4.7.1",
"@form8ion/javascript": "^12.0.0",
"@form8ion/javascript": "^13.0.0-beta.13",
"@form8ion/javascript-core": "^11.0.0",
"@form8ion/project": "^19.0.1",
"deepmerge": "^4.2.2"
Expand Down
6 changes: 4 additions & 2 deletions test/integration/features/step_definitions/common-steps.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ When('the high-level scaffolder is executed', async function () {
decisions => ({
scaffold: options => scaffoldJs({
...options,
unitTestFrameworks: {},
packageTypes: {[pluginName]: {scaffolder: scaffoldEslintConfig}},
plugins: {
unitTestFrameworks: {},
packageTypes: {[pluginName]: {scaffold: scaffoldEslintConfig}}
},
configs: {eslint: {scope: `@${any.word()}`}},
decisions
})
Expand Down

0 comments on commit d6d57ac

Please sign in to comment.