🎥 Make videos programmatically with React
Fix colorized optional dependency errors
JonnyBurgere7d4972e8df6
diff --git a/packages/bundler/src/optional-dependencies.ts b/packages/bundler/src/optional-dependencies.tsindex b5ffccfe14..c7e641477f 100644--- a/packages/bundler/src/optional-dependencies.ts+++ b/packages/bundler/src/optional-dependencies.ts@@ -1,5 +1,6 @@// When Webpack cannot resolve these dependencies, it will not print an error message.+import {stripAnsi} from '@remotion/studio-shared';import type {Compiler} from 'webpack';const OPTIONAL_DEPENDENCIES = [@@ -25,8 +26,10 @@ export class AllowOptionalDependenciesPlugin {};},) {+ const message = stripAnsi(error.message);+for (const dependency of OPTIONAL_DEPENDENCIES) {- if (error.message.includes(`Can't resolve '${dependency}'`)) {+ if (message.includes(`Can't resolve '${dependency}'`)) {return false;}}@@ -36,7 +39,7 @@ export class AllowOptionalDependenciesPlugin {error.module?.resourceResolveData?.descriptionFileData?.name;for (const dependency of STUDIO_OPTIONAL_DEPENDENCIES) {if (- error.message.includes(`Can't resolve '${dependency}'`) &&+ message.includes(`Can't resolve '${dependency}'`) &&(issuerPackageName === '@remotion/studio' ||issuer.includes('/@remotion/studio/'))) {@@ -46,8 +49,8 @@ export class AllowOptionalDependenciesPlugin {for (const dependency of SOURCE_MAP_IGNORE) {if (- error.message.includes(`Can't resolve '${dependency}'`) &&- error.message.includes('source-map')+ message.includes(`Can't resolve '${dependency}'`) &&+ message.includes('source-map')) {return false;}diff --git a/packages/bundler/src/test/optional-dependencies.test.ts b/packages/bundler/src/test/optional-dependencies.test.tsindex f66275f11b..861c160b3f 100644--- a/packages/bundler/src/test/optional-dependencies.test.ts+++ b/packages/bundler/src/test/optional-dependencies.test.ts@@ -38,3 +38,17 @@ test('does not hide missing optional AI package imports in user code', () => {).toBe(true);}});++test('allows colorized Rspack errors for optional Studio dependencies', () => {+ const plugin = new AllowOptionalDependenciesPlugin();+ const error = missingOptionalPackageError(+ '@remotion/whisper-webgpu',+ '/project/node_modules/@remotion/studio/dist/esm/chunk.js',+ );+ error.message = error.message.replace(+ "'@remotion/whisper-webgpu'",+ "\u001b[33m'@remotion/whisper-webgpu'\u001b[39m",+ );++ expect(plugin.filter(error)).toBe(false);+});diff --git a/packages/bundler/src/test/rspack-optional-dependencies.test.ts b/packages/bundler/src/test/rspack-optional-dependencies.test.tsindex 9b9255eb9d..213019e92f 100644--- a/packages/bundler/src/test/rspack-optional-dependencies.test.ts+++ b/packages/bundler/src/test/rspack-optional-dependencies.test.ts@@ -110,7 +110,7 @@ test(rootDir: fixtureDirectory,rspack: true,}),- ).rejects.toThrow("Can't resolve 'definitely-not-an-installed-package'");+ ).rejects.toThrow('definitely-not-an-installed-package');} finally {rmSync(fixtureDirectory, {recursive: true, force: true});}