Skip to content

Commit 6471bf5

Browse files
CharlieHelpsCharlieHelps
committed
Resolve rebase conflicts for ESLint resolver settings and lockfile (eslint-import-resolver-typescript ^4.4.4)
1 parent 9c89e00 commit 6471bf5

18 files changed

Lines changed: 31 additions & 31 deletions

‎pnpm-lock.yaml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/helpers/unit.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { join, isAbsolute } from 'node:path';
44
import webpack from 'webpack';
55
import { merge } from 'webpack-merge';
66

7-
import { WebpackManifestPlugin } from '../../src/index.ts';
7+
import { WebpackManifestPlugin } from '../../src/index.js';
88

99
const { log } = console;
1010

‎test/integration/hoisting.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { join } from 'node:path';
22

33
import test from '../helpers/ava-compat';
4-
import { WebpackManifestPlugin } from '../../src/index.ts';
5-
import { compile, hashLiteral, readJson, writeFile } from '../helpers/integration.ts';
4+
import { WebpackManifestPlugin } from '../../src/index.js';
5+
import { compile, hashLiteral, readJson, writeFile } from '../helpers/integration.js';
66

77
const outputPath = join(__dirname, '../output/scoped-hoisting');
88

‎test/integration/import-update.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { join } from 'node:path';
33
import webpack from 'webpack';
44

55
import test from '../helpers/ava-compat';
6-
import { WebpackManifestPlugin } from '../../src/index.ts';
7-
import { readJson, watch, writeFile } from '../helpers/integration.ts';
6+
import { WebpackManifestPlugin } from '../../src/index.js';
7+
import { readJson, watch, writeFile } from '../helpers/integration.js';
88

99
const outputPath = join(__dirname, '../output/watch-import-chunk');
1010

‎test/integration/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { join } from 'node:path';
33
import del from 'del';
44

55
import test from '../helpers/ava-compat';
6-
import { compile, readJson } from '../helpers/integration.ts';
7-
import { getAsset } from '../helpers/webpack-version-helpers.ts';
8-
import { getCompilerHooks, WebpackManifestPlugin } from '../../src/index.ts';
6+
import { compile, readJson } from '../helpers/integration.js';
7+
import { getAsset } from '../helpers/webpack-version-helpers.js';
8+
import { getCompilerHooks, WebpackManifestPlugin } from '../../src/index.js';
99

1010
const outputPath = join(__dirname, '../output/single-file');
1111

‎test/integration/location.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { join } from 'node:path';
33
import del from 'del';
44

55
import test from '../helpers/ava-compat';
6-
import { WebpackManifestPlugin } from '../../src/index.ts';
7-
import { compile, readJson } from '../helpers/integration.ts';
6+
import { WebpackManifestPlugin } from '../../src/index.js';
7+
import { compile, readJson } from '../helpers/integration.js';
88

99
const absOutputPath = join(__dirname, '../output/absolute-manifest');
1010
const outputPath = join(__dirname, '../output/relative-manifest');

‎test/integration/memory-fs.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import del from 'del';
44
import MemoryFileSystem from 'memory-fs';
55

66
import test from '../helpers/ava-compat';
7-
import { WebpackManifestPlugin } from '../../src/index.ts';
8-
import { compile, readJson } from '../helpers/integration.ts';
7+
import { WebpackManifestPlugin } from '../../src/index.js';
8+
import { compile, readJson } from '../helpers/integration.js';
99

1010
const outputPath = join(__dirname, '../output/emit');
1111

‎test/integration/multiple.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { join } from 'node:path';
33
import del from 'del';
44

55
import test from '../helpers/ava-compat';
6-
import { WebpackManifestPlugin } from '../../src/index.ts';
7-
import { compile, readJson } from '../helpers/integration.ts';
6+
import { WebpackManifestPlugin } from '../../src/index.js';
7+
import { compile, readJson } from '../helpers/integration.js';
88

99
const outputPath = join(__dirname, '../output/multiple-compilation');
1010
const outputMultiPath = join(__dirname, '../output/multiple-manifest');

‎test/integration/watch-mode.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { join } from 'node:path';
33
import webpack from 'webpack';
44

55
import test from '../helpers/ava-compat';
6-
import { WebpackManifestPlugin } from '../../src/index.ts';
7-
import { hashLiteral, readJson, watch, writeFile } from '../helpers/integration.ts';
6+
import { WebpackManifestPlugin } from '../../src/index.js';
7+
import { hashLiteral, readJson, watch, writeFile } from '../helpers/integration.js';
88

99
const outputPath = join(__dirname, '../output/watch-mode');
1010

‎test/unit/copy-plugin.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { join } from 'node:path';
33
import del from 'del';
44

55
import test from '../helpers/ava-compat';
6-
import { compile } from '../helpers/unit.ts';
7-
import { MockCopyPlugin } from '../helpers/MockCopyPlugin.ts';
6+
import { compile } from '../helpers/unit.js';
7+
import { MockCopyPlugin } from '../helpers/MockCopyPlugin.js';
88

99
const outputPath = join(__dirname, '../output/copy-plugin');
1010

0 commit comments

Comments
 (0)