From 6867395ce79cd5ab97ef3b6ea13ffb3412f956e5 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:40:14 +0200
Subject: [PATCH] fix(vite-plugin): Ensure `post` order of
 `sentry-vite-release-injection-plugin` to avoid breaking
 `@rollup/plugin-commonjs` step (#578)

---
 .gitignore                                      | 1 +
 packages/bundler-plugin-core/src/index.ts       | 2 +-
 packages/playground/vite.config.smallNodeApp.js | 2 +-
 packages/vite-plugin/src/index.ts               | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e462f7bc..7f95f101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules
 yarn-error.log
 
 .vscode/settings.json
+.idea
 
 *.tgz
 
diff --git a/packages/bundler-plugin-core/src/index.ts b/packages/bundler-plugin-core/src/index.ts
index 794b67c9..e6162710 100644
--- a/packages/bundler-plugin-core/src/index.ts
+++ b/packages/bundler-plugin-core/src/index.ts
@@ -43,7 +43,7 @@ interface SentryUnpluginFactoryOptions {
  *
  * Release injection:
  * Per default the sentry bundler plugin will inject a global `SENTRY_RELEASE` into each JavaScript/TypeScript module
- * that is part of the bundle. On a technical level this is done by appending an import (`import "sentry-release-injector;"`)
+ * that is part of the bundle. On a technical level this is done by appending an import (`import "sentry-release-injector";`)
  * to all entrypoint files of the user code (see `transformInclude` and `transform` hooks). This import is then resolved
  * by the sentry plugin to a virtual module that sets the global variable (see `resolveId` and `load` hooks).
  * If a user wants to inject the release into a particular set of modules they can use the `releaseInjectionTargets` option.
diff --git a/packages/playground/vite.config.smallNodeApp.js b/packages/playground/vite.config.smallNodeApp.js
index 34c1586a..a038686a 100644
--- a/packages/playground/vite.config.smallNodeApp.js
+++ b/packages/playground/vite.config.smallNodeApp.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { sentryVitePlugin } from "@sentry/bundler-plugin-core";
+import { sentryVitePlugin } from "@sentry/vite-plugin";
 import { defineConfig } from "vite";
 import * as path from "path";
 
diff --git a/packages/vite-plugin/src/index.ts b/packages/vite-plugin/src/index.ts
index d840077b..9aa1ee34 100644
--- a/packages/vite-plugin/src/index.ts
+++ b/packages/vite-plugin/src/index.ts
@@ -14,7 +14,9 @@ import { UnpluginOptions } from "unplugin";
 function viteReleaseInjectionPlugin(injectionCode: string): UnpluginOptions {
   return {
     name: "sentry-vite-release-injection-plugin",
-    enforce: "pre" as const, // need this so that vite runs the resolveId hook
+    // run `post` to avoid tripping up @rollup/plugin-commonjs when cjs is used
+    // as we inject an `import` statement
+    enforce: "post" as const, // need this so that vite runs the resolveId hook
     vite: createRollupReleaseInjectionHooks(injectionCode),
   };
 }