Merge pull request #500 from form8ion/renovate/master-form8ion-eslint-config-7.x

travi · web-flow · commit 89876a59288e · 2024-08-25T20:40:11.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "@cucumber/cucumber": "10.9.0",
     "@form8ion/babel-preset": "1.6.135",
     "@form8ion/commitlint-config": "1.0.76",
-    "@form8ion/eslint-config": "6.0.5",
+    "@form8ion/eslint-config": "7.0.9",
     "@form8ion/eslint-config-cucumber": "1.4.1",
     "@form8ion/eslint-config-mocha": "3.0.6",
     "@form8ion/remark-lint-preset": "6.0.4",
diff --git a/src/commitizen-test.js b/src/commitizen-test.js
@@ -1,8 +1,10 @@
-import {promises as fsPromises} from 'fs';
+import {promises as fsPromises} from 'node:fs';
+
 import sinon from 'sinon';
 import {assert} from 'chai';
 import any from '@travi/any';
-import scaffold from './commitizen';
+
+import scaffold from './commitizen.js';
 
 suite('commitizen', () => {
   let sandbox;
diff --git a/src/commitlint/index.js b/src/commitlint/index.js
@@ -1,2 +1,2 @@
-export {default as scaffold} from './scaffolder';
-export {default as test} from './tester';
+export {default as scaffold} from './scaffolder.js';
+export {default as test} from './tester.js';
diff --git a/src/commitlint/scaffolder-test.js b/src/commitlint/scaffolder-test.js
@@ -5,7 +5,7 @@ import any from '@travi/any';
 import {assert} from 'chai';
 import sinon from 'sinon';
 
-import scaffoldCommitlint from './scaffolder';
+import scaffoldCommitlint from './scaffolder.js';
 
 suite('commitlint scaffolder', () => {
   let sandbox;
diff --git a/src/commitlint/tester.test.js b/src/commitlint/tester.test.js
@@ -4,7 +4,7 @@ import {afterEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'jest-when';
 
-import testForCommitlint from './tester';
+import testForCommitlint from './tester.js';
 
 vi.mock('@form8ion/core');
 
diff --git a/src/index.js b/src/index.js
@@ -1,3 +1,3 @@
-export {default as scaffold} from './scaffolder';
-export {default as lift} from './lifter';
-export {default as test} from './tester';
+export {default as scaffold} from './scaffolder.js';
+export {default as lift} from './lifter.js';
+export {default as test} from './tester.js';
diff --git a/src/lifter-test.js b/src/lifter-test.js
@@ -2,9 +2,9 @@ import {assert} from 'chai';
 import sinon from 'sinon';
 import any from '@travi/any';
 
-import * as semanticReleaseTester from './semantic-release/tester';
-import * as semanticReleaseLifter from './semantic-release/lifter';
-import lift from './lifter';
+import * as semanticReleaseTester from './semantic-release/tester.js';
+import * as semanticReleaseLifter from './semantic-release/lifter.js';
+import lift from './lifter.js';
 
 suite('lifter', () => {
   let sandbox;
diff --git a/src/lifter.js b/src/lifter.js
@@ -1,4 +1,4 @@
-import {test as semanticReleaseIsInUse, lift as liftSemanticRelease} from './semantic-release';
+import {test as semanticReleaseIsInUse, lift as liftSemanticRelease} from './semantic-release/index.js';
 
 export default async function ({projectRoot}) {
   if (await semanticReleaseIsInUse({projectRoot})) {
diff --git a/src/scaffolder-test.js b/src/scaffolder-test.js
@@ -5,10 +5,10 @@ import sinon from 'sinon';
 import any from '@travi/any';
 import {assert} from 'chai';
 
-import * as semanticReleaseScaffolder from './semantic-release/scaffolder';
-import * as commitizenScaffolder from './commitizen';
-import * as commitlintScaffolder from './commitlint/scaffolder';
-import scaffoldCommitConvention from './scaffolder';
+import * as semanticReleaseScaffolder from './semantic-release/scaffolder.js';
+import * as commitizenScaffolder from './commitizen.js';
+import * as commitlintScaffolder from './commitlint/scaffolder.js';
+import scaffoldCommitConvention from './scaffolder.js';
 
 suite('commit-convention scaffolder', () => {
   let sandbox;
diff --git a/src/scaffolder.js b/src/scaffolder.js
@@ -1,9 +1,9 @@
 import deepmerge from 'deepmerge';
 import {projectTypes} from '@form8ion/javascript-core';
 
-import {scaffold as scaffoldSemanticRelease} from './semantic-release';
-import scaffoldCommitizen from './commitizen';
-import {scaffold as scaffoldCommitlint} from './commitlint';
+import {scaffold as scaffoldSemanticRelease} from './semantic-release/index.js';
+import scaffoldCommitizen from './commitizen.js';
+import {scaffold as scaffoldCommitlint} from './commitlint/index.js';
 
 export default async function ({projectRoot, projectType, configs, pathWithinParent}) {
   const detailsForProjectsPublishedToARegistry = [projectTypes.PACKAGE, projectTypes.CLI].includes(projectType)
diff --git a/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/index.js b/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/index.js
@@ -1,2 +1,2 @@
-export {default as scaffold} from './scaffolder';
-export {default as lift} from './lifter';
+export {default as scaffold} from './scaffolder.js';
+export {default as lift} from './lifter.js';
diff --git a/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/lifter-test.js b/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/lifter-test.js
@@ -6,8 +6,8 @@ import any from '@travi/any';
 import sinon from 'sinon';
 import {assert} from 'chai';
 
-import * as scaffolder from './scaffolder';
-import lift from './lifter';
+import * as scaffolder from './scaffolder.js';
+import lift from './lifter.js';
 
 suite('release workflow lifter', () => {
   let sandbox;
diff --git a/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/lifter.js b/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/lifter.js
@@ -2,7 +2,7 @@ import {promises as fs} from 'fs';
 import {load} from 'js-yaml';
 import {fileExists} from '@form8ion/core';
 
-import scaffolder from './scaffolder';
+import scaffolder from './scaffolder.js';
 
 function workflowPermissionsAreMinimal(existingContents) {
   return existingContents.permissions
diff --git a/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/scaffolder-test.js b/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/scaffolder-test.js
@@ -5,8 +5,8 @@ import {assert} from 'chai';
 import sinon from 'sinon';
 import any from '@travi/any';
 
-import * as reusableWorkflow from '../reusable-release-workflow';
-import scaffoldReleaseWorkflow from './scaffolder';
+import * as reusableWorkflow from '../reusable-release-workflow.js';
+import scaffoldReleaseWorkflow from './scaffolder.js';
 
 suite('github release workflow scaffolder', () => {
   let sandbox;
diff --git a/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/scaffolder.js b/src/semantic-release/ci-providers/github-workflows/experimental-release-workflow/scaffolder.js
@@ -1,6 +1,6 @@
 import {writeWorkflowFile} from '@form8ion/github-workflows-core';
 
-import {determineAppropriateWorkflow} from '../reusable-release-workflow';
+import {determineAppropriateWorkflow} from '../reusable-release-workflow.js';
 
 export default async function ({projectRoot, nodeVersion}) {
   await writeWorkflowFile({
diff --git a/src/semantic-release/ci-providers/github-workflows/index.js b/src/semantic-release/ci-providers/github-workflows/index.js
@@ -1,3 +1,3 @@
-export {default as scaffold} from './experimental-release-workflow/scaffolder';
-export {default as test} from './tester';
-export {default as lift} from './lifter';
+export {default as scaffold} from './experimental-release-workflow/scaffolder.js';
+export {default as test} from './tester.js';
+export {default as lift} from './lifter.js';
diff --git a/src/semantic-release/ci-providers/github-workflows/lifter-test.js b/src/semantic-release/ci-providers/github-workflows/lifter-test.js
@@ -6,10 +6,10 @@ import any from '@travi/any';
 import {assert} from 'chai';
 import sinon from 'sinon';
 
-import * as releaseTriggerNeeds from './release-trigger-needs';
-import * as reusableReleaseWorkflow from './reusable-release-workflow';
-import * as releaseWorkflowLifter from './experimental-release-workflow/lifter';
-import lift from './lifter';
+import * as releaseTriggerNeeds from './release-trigger-needs.js';
+import * as reusableReleaseWorkflow from './reusable-release-workflow.js';
+import * as releaseWorkflowLifter from './experimental-release-workflow/lifter.js';
+import lift from './lifter.js';
 
 suite('github-workflows lifter for semantic-release', () => {
   let sandbox;
diff --git a/src/semantic-release/ci-providers/github-workflows/lifter.js b/src/semantic-release/ci-providers/github-workflows/lifter.js
@@ -2,9 +2,9 @@ import {promises as fs} from 'fs';
 import {load} from 'js-yaml';
 import {writeWorkflowFile} from '@form8ion/github-workflows-core';
 
-import determineTriggerNeedsFrom from './release-trigger-needs';
-import {lift as liftReleaseWorkflow} from './experimental-release-workflow';
-import {determineAppropriateWorkflow} from './reusable-release-workflow';
+import determineTriggerNeedsFrom from './release-trigger-needs.js';
+import {lift as liftReleaseWorkflow} from './experimental-release-workflow/index.js';
+import {determineAppropriateWorkflow} from './reusable-release-workflow.js';
 
 function removeCycjimmyActionFrom(otherJobs) {
   return Object.fromEntries(Object.entries(otherJobs).map(([jobName, job]) => [
diff --git a/src/semantic-release/ci-providers/github-workflows/release-trigger-needs-test.js b/src/semantic-release/ci-providers/github-workflows/release-trigger-needs-test.js
@@ -1,6 +1,6 @@
 import {assert} from 'chai';
 import any from '@travi/any';
-import determineTriggerNeedsFrom from './release-trigger-needs';
+import determineTriggerNeedsFrom from './release-trigger-needs.js';
 
 suite('release-trigger needs', () => {
   test('that no jobs are listed if neither `verify` nor `verify-matrix` are present in `jobs`', async () => {
diff --git a/src/semantic-release/ci-providers/github-workflows/reusable-release-workflow-test.js b/src/semantic-release/ci-providers/github-workflows/reusable-release-workflow-test.js
@@ -1,7 +1,7 @@
 import {assert} from 'chai';
 import any from '@travi/any';
 
-import {determineAppropriateWorkflow} from './reusable-release-workflow';
+import {determineAppropriateWorkflow} from './reusable-release-workflow.js';
 
 suite('reusable release workflow', () => {
   test('that the reusable workflow is defined for semantic-release\'s minimum node version', async () => {
diff --git a/src/semantic-release/ci-providers/github-workflows/tester-test.js b/src/semantic-release/ci-providers/github-workflows/tester-test.js
@@ -3,7 +3,7 @@ import core from '@form8ion/core';
 import any from '@travi/any';
 import sinon from 'sinon';
 import {assert} from 'chai';
-import projectUsesGithubWorkflows from './tester';
+import projectUsesGithubWorkflows from './tester.js';
 
 suite('GitHub workflows predicate', () => {
   const projectRoot = any.string();
diff --git a/src/semantic-release/ci-providers/index.js b/src/semantic-release/ci-providers/index.js
@@ -1 +1 @@
-export {lift, test, scaffold} from './github-workflows';
+export {lift, test, scaffold} from './github-workflows/index.js';
diff --git a/src/semantic-release/index.js b/src/semantic-release/index.js
@@ -1,3 +1,3 @@
-export {default as scaffold} from './scaffolder';
-export {default as test} from './tester';
-export {default as lift} from './lifter';
+export {default as scaffold} from './scaffolder.js';
+export {default as test} from './tester.js';
+export {default as lift} from './lifter.js';
diff --git a/src/semantic-release/lifter-test.js b/src/semantic-release/lifter-test.js
@@ -4,9 +4,9 @@ import {assert} from 'chai';
 import sinon from 'sinon';
 import any from '@travi/any';
 
-import * as githubWorkflowsTester from './ci-providers/github-workflows/tester';
-import * as githubWorkflowsLifter from './ci-providers/github-workflows/lifter';
-import lift from './lifter';
+import * as githubWorkflowsTester from './ci-providers/github-workflows/tester.js';
+import * as githubWorkflowsLifter from './ci-providers/github-workflows/lifter.js';
+import lift from './lifter.js';
 
 suite('semantic-release lifter', () => {
   let sandbox;
diff --git a/src/semantic-release/lifter.js b/src/semantic-release/lifter.js
@@ -1,6 +1,6 @@
 import {promises as fs} from 'fs';
 
-import {test as ciProviderCanBeLifted, lift as liftCiProvider} from './ci-providers';
+import {test as ciProviderCanBeLifted, lift as liftCiProvider} from './ci-providers/index.js';
 
 export default async function ({projectRoot}) {
   if (await ciProviderCanBeLifted({projectRoot})) {
diff --git a/src/semantic-release/scaffolder-test.js b/src/semantic-release/scaffolder-test.js
@@ -4,7 +4,7 @@ import {assert} from 'chai';
 import sinon from 'sinon';
 import any from '@travi/any';
 
-import scaffoldSemanticRelease from './scaffolder';
+import scaffoldSemanticRelease from './scaffolder.js';
 
 suite('semantic-release scaffolder', () => {
   let sandbox;
diff --git a/src/semantic-release/tester-test.js b/src/semantic-release/tester-test.js
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import {assert} from 'chai';
 import any from '@travi/any';
 
-import determineIfSemanticReleaseIsConfigured from './tester';
+import determineIfSemanticReleaseIsConfigured from './tester.js';
 
 suite('semantic-release predicate', () => {
   let sandbox;
diff --git a/src/tester-test.js b/src/tester-test.js
diff --git a/src/tester.js b/src/tester.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {test as semanticReleaseIsInUse, lift as liftSemanticRelease} from './semantic-release';`
	`1`	`+import {test as semanticReleaseIsInUse, lift as liftSemanticRelease} from './semantic-release/index.js';`
`2`	`2`
`3`	`3`	`export default async function ({projectRoot}) {`
`4`	`4`	`if (await semanticReleaseIsInUse({projectRoot})) {`