Skip to content

Commit

Permalink
Merge branch 'master' into issue-363-tsconfig-resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
privatenumber authored Jul 15, 2024
2 parents 3c44679 + 3dd1107 commit 6b20c7b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Test
on:
push:
branches: [develop]
branches: [master, develop]
pull_request:
jobs:
test:
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import {
RawSource as WP4RawSource,
SourceMapSource as WP4SourceMapSource,
} from 'webpack-sources';
import webpack4 from 'webpack';
import webpack5 from 'webpack5';
import type webpack4 from 'webpack';
import type webpack5 from 'webpack5';
import ModuleFilenameHelpers from 'webpack/lib/ModuleFilenameHelpers.js';
import { version } from '../package.json';
import type { EsbuildPluginOptions } from './types.js';
Expand Down

0 comments on commit 6b20c7b

Please sign in to comment.