Skip to content

Commit 9779b2d

Browse files
committed
move to nodenext and simplify TS/ESM config
Signed-off-by: CrazyMax <[email protected]>
1 parent 2417240 commit 9779b2d

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

eslint.config.cjs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,7 @@ module.exports = defineConfig([
3636
globalIgnores(['.yarn/**/*', 'lib/**/*', 'coverage/**/*', 'node_modules/**/*']),
3737
{
3838
extends: fixupConfigRules(
39-
compat.extends(
40-
'eslint:recommended',
41-
'plugin:@typescript-eslint/eslint-recommended',
42-
'plugin:@typescript-eslint/recommended',
43-
'plugin:import/errors',
44-
'plugin:import/typescript',
45-
'plugin:import/warnings',
46-
'plugin:vitest/recommended',
47-
'plugin:prettier/recommended'
48-
)
39+
compat.extends('eslint:recommended', 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'plugin:import/errors', 'plugin:import/typescript', 'plugin:import/warnings', 'plugin:prettier/recommended')
4940
),
5041

5142
plugins: {
@@ -75,9 +66,10 @@ module.exports = defineConfig([
7566
'import/no-unresolved': [
7667
'error',
7768
{
78-
ignore: ['\\.js$', 'csv-parse/sync', '@octokit/openapi-types', '@octokit/core', '@octokit/plugin-rest-endpoint-methods']
69+
ignore: ['\\.js$', 'csv-parse/sync', '@octokit/openapi-types', '@octokit/core', '@octokit/plugin-rest-endpoint-methods', 'vitest/config']
7970
}
8071
],
72+
'vitest/no-conditional-expect': 'error',
8173
'vitest/no-disabled-tests': 0
8274
}
8375
}

src/github/artifact.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
import crypto from 'crypto';
1818
import fs from 'fs';
1919
import path from 'path';
20-
import {CreateArtifactRequest, FinalizeArtifactRequest, StringValue} from '@actions/artifact/lib/generated';
21-
import {internalArtifactTwirpClient} from '@actions/artifact/lib/internal/shared/artifact-twirp-client';
22-
import {getBackendIdsFromToken} from '@actions/artifact/lib/internal/shared/util';
23-
import {getExpiration} from '@actions/artifact/lib/internal/upload/retention';
20+
import {CreateArtifactRequest, FinalizeArtifactRequest, StringValue} from '@actions/artifact/lib/generated/index.js';
21+
import {internalArtifactTwirpClient} from '@actions/artifact/lib/internal/shared/artifact-twirp-client.js';
22+
import {getBackendIdsFromToken} from '@actions/artifact/lib/internal/shared/util.js';
23+
import {getExpiration} from '@actions/artifact/lib/internal/upload/retention.js';
2424
import {InvalidResponseError, NetworkError} from '@actions/artifact';
2525
import * as core from '@actions/core';
2626
import {TransferProgressEvent} from '@azure/core-rest-pipeline';
2727
import {BlobClient, BlobHTTPHeaders} from '@azure/storage-blob';
2828

2929
import {UploadOpts, UploadResponse} from '../types/github/artifact.js';
30-
import {GitHub} from './github';
30+
import {GitHub} from './github.js';
3131

3232
export class GitHubArtifact {
3333
public static async upload(opts: UploadOpts): Promise<UploadResponse> {

src/github/summary.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {dump as yamldump} from 'js-yaml';
1919
import os from 'os';
2020
import * as core from '@actions/core';
2121

22-
import {GitHub} from './github';
22+
import {GitHub} from './github.js';
2323
import {Util} from '../util.js';
2424

2525
import {BuildSummaryOpts, SummaryTableCell} from '../types/github/summary.js';

src/types/github/summary.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
import * as core from '@actions/core';
1818

19-
import {UploadResponse} from './artifact';
20-
import {BakeDefinition} from '../buildx/bake';
21-
import {ExportResponse} from '../buildx/history';
19+
import {UploadResponse} from './artifact.js';
20+
import {BakeDefinition} from '../buildx/bake.js';
21+
import {ExportResponse} from '../buildx/history.js';
2222

2323
export type SummaryTableRow = Parameters<typeof core.summary.addTable>[0][number];
2424
export type SummaryTableCell = Exclude<SummaryTableRow[number], string>;

tsconfig.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"module": "es2020",
4-
"moduleResolution": "bundler",
3+
"module": "nodenext",
4+
"moduleResolution": "nodenext",
55
"esModuleInterop": true,
66
"isolatedModules": true,
77
"strict": true,
@@ -12,13 +12,13 @@
1212
"rootDir": "./src",
1313
"forceConsistentCasingInFileNames": true,
1414
"noImplicitAny": false,
15-
"resolveJsonModule": true,
1615
"useUnknownInCatchVariables": false,
17-
"skipLibCheck": true,
16+
"skipLibCheck": true
1817
},
18+
"include": [
19+
"src/**/*.ts"
20+
],
1921
"exclude": [
20-
"./__mocks__/**/*",
21-
"./__tests__/**/*",
2222
"./lib/**/*",
2323
"node_modules"
2424
]

0 commit comments

Comments
 (0)