|
2 | 2 | /* eslint-disable max-lines */ |
3 | 3 | import { getSentryRelease } from '@sentry/node'; |
4 | 4 | import { arrayify, dropUndefinedKeys, escapeStringForRegex, loadModule, logger } from '@sentry/utils'; |
5 | | -import type SentryCliPlugin from '@sentry/webpack-plugin'; |
6 | 5 | import * as chalk from 'chalk'; |
7 | 6 | import * as fs from 'fs'; |
8 | 7 | import * as path from 'path'; |
@@ -313,16 +312,15 @@ export function constructWebpackConfigFunction( |
313 | 312 | // without, the option to use `hidden-source-map` only applies to the client-side build. |
314 | 313 | newConfig.devtool = userSentryOptions.hideSourceMaps && !isServer ? 'hidden-source-map' : 'source-map'; |
315 | 314 |
|
316 | | - const SentryWebpackPlugin = loadModule<SentryCliPlugin>('@sentry/webpack-plugin'); |
317 | | - if (SentryWebpackPlugin) { |
318 | | - newConfig.plugins = newConfig.plugins || []; |
319 | | - newConfig.plugins.push( |
320 | | - // @ts-expect-error - this exists, the dynamic import just doesn't know about it |
321 | | - new SentryWebpackPlugin( |
322 | | - getWebpackPluginOptions(buildContext, userSentryWebpackPluginOptions, userSentryOptions), |
323 | | - ), |
324 | | - ); |
325 | | - } |
| 315 | + const SentryWebpackPlugin = loadModule('@sentry/webpack-plugin'); |
| 316 | + |
| 317 | + newConfig.plugins = newConfig.plugins || []; |
| 318 | + newConfig.plugins.push( |
| 319 | + // @ts-expect-error - this exists, the dynamic import just doesn't know about it |
| 320 | + new SentryWebpackPlugin( |
| 321 | + getWebpackPluginOptions(buildContext, userSentryWebpackPluginOptions, userSentryOptions), |
| 322 | + ), |
| 323 | + ); |
326 | 324 | } |
327 | 325 | } |
328 | 326 |
|
@@ -771,10 +769,10 @@ function shouldEnableWebpackPlugin(buildContext: BuildContext, userSentryOptions |
771 | 769 | // architecture-specific version of the `sentry-cli` binary. If `yarn install`, `npm install`, or `npm ci` are run |
772 | 770 | // with the `--ignore-scripts` option, this will be blocked and the missing binary will cause an error when users |
773 | 771 | // try to build their apps. |
774 | | - const SentryWebpackPlugin = loadModule<SentryCliPlugin>('@sentry/webpack-plugin'); |
| 772 | + const SentryWebpackPlugin = loadModule('@sentry/webpack-plugin'); |
775 | 773 |
|
776 | 774 | // @ts-expect-error - this exists, the dynamic import just doesn't know it |
777 | | - if (!SentryWebpackPlugin || !SentryWebpackPlugin.cliBinaryExists()) { |
| 775 | + if (!SentryWebpackPlugin.cliBinaryExists()) { |
778 | 776 | // eslint-disable-next-line no-console |
779 | 777 | console.error( |
780 | 778 | `${chalk.red('error')} - ${chalk.bold('Sentry CLI binary not found.')} Source maps will not be uploaded.\n`, |
|
0 commit comments