Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/bundler-plugin-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { createLogger } from "./sentry/logger";
import { allowedToSendTelemetry, createSentryInstance } from "./sentry/telemetry";
import { Options } from "./types";
import {
determineReleaseName,
generateGlobalInjectorCode,
getDependencies,
getPackageJson,
Expand Down Expand Up @@ -134,7 +135,8 @@ export function sentryUnpluginFactory({
plugins.push(releaseInjectionPlugin(injectionCode));
}

if (!options.release.name) {
const releaseManagementPluginReleaseName = options.release.name ?? determineReleaseName();
if (!releaseManagementPluginReleaseName) {
logger.warn(
"No release name provided. Will not create release. Please set the `release.name` option to identifiy your release."
);
Expand All @@ -154,7 +156,7 @@ export function sentryUnpluginFactory({
plugins.push(
releaseManagementPlugin({
logger,
releaseName: options.release.name,
releaseName: releaseManagementPluginReleaseName,
shouldCreateRelease: options.release.create,
shouldCleanArtifacts: options.release.cleanArtifacts,
shouldFinalizeRelease: options.release.finalize,
Expand Down
12 changes: 5 additions & 7 deletions packages/bundler-plugin-core/src/options-mapping.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Logger } from "./sentry/logger";
import { Options as UserOptions } from "./types";
import { determineReleaseName } from "./utils";

export type NormalizedOptions = ReturnType<typeof normalizeUserOptions>;

Expand All @@ -20,13 +19,12 @@ export function normalizeUserOptions(userOptions: UserOptions) {
disable: userOptions.disable ?? false,
sourcemaps: userOptions.sourcemaps,
release: {
name: determineReleaseName(),
inject: true,
create: true,
finalize: true,
vcsRemote: process.env["SENTRY_VSC_REMOTE"] ?? "origin",
cleanArtifacts: false,
...userOptions.release,
inject: userOptions.release?.inject ?? true,
create: userOptions.release?.create ?? true,
finalize: userOptions.release?.finalize ?? true,
vcsRemote: userOptions.release?.vcsRemote ?? process.env["SENTRY_VSC_REMOTE"] ?? "origin",
cleanArtifacts: userOptions.release?.cleanArtifacts ?? false,
},
_experiments: userOptions._experiments ?? {},
};
Expand Down
23 changes: 13 additions & 10 deletions packages/bundler-plugin-core/src/plugins/debug-id-upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,19 @@ export function debugIdUploadPlugin({
})
);

await cliInstance.releases.uploadSourceMaps(releaseName ?? "", {
include: [
{
paths: [tmpUploadFolder],
rewrite: false,
dist: dist,
},
],
useArtifactBundle: true,
});
await cliInstance.releases.uploadSourceMaps(
releaseName ?? "undefined", // unfortunetly this needs a value for now but it will not matter since debug IDs overpower releases anyhow
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we/CLI team going to fix this on the CLI side ?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think we should. Unfortunately, it will make the interface of Sentry CLI even more complicated.

{
include: [
{
paths: [tmpUploadFolder],
rewrite: false,
dist: dist,
},
],
useArtifactBundle: true,
}
);

if (deleteFilesAfterUpload) {
const filePathsToDelete = await glob(deleteFilesAfterUpload, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ const entryPointPath = path.resolve(__dirname, "input", "entrypoint.js");
const outputDir = path.resolve(__dirname, "out");

createCjsBundles({ index: entryPointPath }, outputDir, {
release: {
name: "build-information-injection-test",
},
_experiments: { injectBuildInformation: true },
});
6 changes: 4 additions & 2 deletions packages/playground/build-esbuild.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
const { sentryEsbuildPlugin } = require("@sentry/esbuild-plugin");
const { build } = require("esbuild");
const placeHolderOptions = require("./config.json");

build({
entryPoints: ["./src/entrypoint1.js"],
outdir: "./out/esbuild",
plugins: [
sentryEsbuildPlugin({
...placeHolderOptions,
sourcemaps: {
assets: "./out/esbuild/**",
deleteFilesAfterUpload: "./out/esbuild/**/*.map",
},
}),
],
minify: true,
Expand Down
11 changes: 8 additions & 3 deletions packages/playground/build-webpack4.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ const path = require("path");
const webpack4 = require("webpack4");
const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");

const placeHolderOptions = require("./config.json");

webpack4(
{
mode: "production",
Expand All @@ -16,7 +14,14 @@ webpack4(
library: "ExampleBundle",
libraryTarget: "commonjs",
},
plugins: [sentryWebpackPlugin({ ...placeHolderOptions })],
plugins: [
sentryWebpackPlugin({
sourcemaps: {
assets: "./out/webpack4/**",
deleteFilesAfterUpload: "./out/webpack4/**/*.map",
},
}),
],
devtool: "source-map",
},
(err) => {
Expand Down
11 changes: 8 additions & 3 deletions packages/playground/build-webpack5.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ const path = require("path");
const webpack5 = require("webpack");
const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");

const placeHolderOptions = require("./config.json");

webpack5(
{
cache: false,
Expand All @@ -18,7 +16,14 @@ webpack5(
},
},
mode: "production",
plugins: [sentryWebpackPlugin({ ...placeHolderOptions })],
plugins: [
sentryWebpackPlugin({
sourcemaps: {
assets: "./out/webpack5/**",
deleteFilesAfterUpload: "./out/webpack5/**/*.map",
},
}),
],
devtool: "source-map",
},
(err) => {
Expand Down
8 changes: 0 additions & 8 deletions packages/playground/config.json

This file was deleted.

5 changes: 4 additions & 1 deletion packages/playground/rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ export default {
input,
plugins: [
sentryRollupPlugin({
...JSON.parse(fs.readFileSync("./config.json", "utf-8")),
sourcemaps: {
assets: "./out/rollup/**",
deleteFilesAfterUpload: "./out/rollup/**/*.map",
},
}),
],
output: {
Expand Down
6 changes: 4 additions & 2 deletions packages/playground/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { sentryVitePlugin } from "@sentry/vite-plugin";
import { defineConfig } from "vite";
import * as path from "path";
import placeHolderOptions from "./config.json";

export default defineConfig({
build: {
Expand All @@ -17,7 +16,10 @@ export default defineConfig({
},
plugins: [
sentryVitePlugin({
...placeHolderOptions,
sourcemaps: {
assets: "./out/vite/**",
deleteFilesAfterUpload: "./out/vite/**/*.map",
},
}),
],
});