Address PR feedback: remove any casts, use core rm helper, clarify comments

Author: sdkennedy2

packages/plugins/apps/src/index.test.ts

@@ -8,6 +8,7 @@ import * as identifier from '@dd/apps-plugin/identifier';
 import * as uploader from '@dd/apps-plugin/upload';
 import { getPlugins } from '@dd/apps-plugin';
 import * as fsHelpers from '@dd/core/helpers/fs';
+import type { PluginOptions } from '@dd/core/types';
 import {
     getGetPluginsArg,
     getMockBundler,
@@ -20,6 +21,13 @@ import path from 'path';
 
 import { APPS_API_PATH } from './constants';
 
+/** Extract and assert closeBundle from the first plugin's vite hooks. */
+function extractCloseBundle(plugins: PluginOptions[]) {
+    const plugin = plugins[0];
+    expect(typeof plugin?.vite?.closeBundle).toBe('function');
+    return plugin.vite!.closeBundle as () => Promise<void>;
+}
+
 describe('Apps Plugin - getPlugins', () => {
     const buildRoot = '/project';
     const outDir = '/project/dist';
@@ -58,10 +66,8 @@ describe('Apps Plugin - getPlugins', () => {
         });
         jest.spyOn(identifier, 'resolveIdentifier').mockReturnValue({});
 
-        const plugin = getPlugins(getArgs())[0];
-        await expect((plugin as any).vite.closeBundle()).rejects.toThrow(
-            'Missing apps identification',
-        );
+        const closeBundle = extractCloseBundle(getPlugins(getArgs()));
+        await expect(closeBundle()).rejects.toThrow('Missing apps identification');
 
         expect(uploadSpy).not.toHaveBeenCalled();
         expect(collectSpy).not.toHaveBeenCalled();
@@ -86,16 +92,18 @@ describe('Apps Plugin - getPlugins', () => {
             errors: [],
             warnings: [],
         });
-        const rmSpy = jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined as any);
-
-        const plugin = getPlugins(
-            getGetPluginsArg(
-                { apps: { include: ['public/**/*'] } },
-                { bundler: { ...getMockBundler({ name: 'vite' }), outDir }, buildRoot },
+        const rmSpy = jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined);
+
+        const closeBundle = extractCloseBundle(
+            getPlugins(
+                getGetPluginsArg(
+                    { apps: { include: ['public/**/*'] } },
+                    { bundler: { ...getMockBundler({ name: 'vite' }), outDir }, buildRoot },
+                ),
             ),
-        )[0];
+        );
 
-        await (plugin as any).vite.closeBundle();
+        await closeBundle();
 
         expect(assets.collectAssets).toHaveBeenCalledWith(['public/**/*', 'dist/**/*'], buildRoot);
         expect(archive.createArchive).not.toHaveBeenCalled();
@@ -116,7 +124,7 @@ describe('Apps Plugin - getPlugins', () => {
             { absolutePath: '/project/dist/index.js', relativePath: 'dist/index.js' },
         ];
         jest.spyOn(assets, 'collectAssets').mockResolvedValue(mockedAssets);
-        jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined as any);
+        jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined);
         jest.spyOn(archive, 'createArchive').mockResolvedValue({
             archivePath: '/tmp/dd-apps-123/datadog-apps-assets.zip',
             assets: mockedAssets,
@@ -127,8 +135,8 @@ describe('Apps Plugin - getPlugins', () => {
             warnings: ['first warning'],
         });
 
-        const plugin = getPlugins(getArgs())[0];
-        await (plugin as any).vite.closeBundle();
+        const closeBundle = extractCloseBundle(getPlugins(getArgs()));
+        await closeBundle();
 
         expect(assets.collectAssets).toHaveBeenCalledWith(['dist/**/*'], buildRoot);
         expect(archive.createArchive).toHaveBeenCalledWith([
@@ -167,7 +175,7 @@ describe('Apps Plugin - getPlugins', () => {
             { absolutePath: '/project/dist/app.js', relativePath: 'dist/app.js' },
         ];
         jest.spyOn(assets, 'collectAssets').mockResolvedValue(mockedAssets);
-        jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined as any);
+        jest.spyOn(fsHelpers, 'rm').mockResolvedValue(undefined);
         jest.spyOn(archive, 'createArchive').mockResolvedValue({
             archivePath: '/tmp/dd-apps-456/datadog-apps-assets.zip',
             assets: mockedAssets,
@@ -178,8 +186,8 @@ describe('Apps Plugin - getPlugins', () => {
             warnings: [],
         });
 
-        const plugin = getPlugins(getArgs())[0];
-        await expect((plugin as any).vite.closeBundle()).rejects.toThrow('upload failed');
+        const closeBundle = extractCloseBundle(getPlugins(getArgs()));
+        await expect(closeBundle()).rejects.toThrow('upload failed');
 
         expect(mockLogFn).toHaveBeenCalledWith(expect.stringContaining('upload failed'), 'error');
         expect(fsHelpers.rm).toHaveBeenCalledWith(path.resolve('/tmp/dd-apps-456'));

packages/plugins/apps/src/vite/build-backend-functions.ts

@@ -56,9 +56,7 @@ export async function buildBackendFunctions(
                 output: { format: 'es', exports: 'named', entryFileNames: '[name].js' },
                 preserveEntrySignatures: 'exports-only',
                 treeshake: false,
-                // Silence "use client" directive warnings from third-party deps.
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                onwarn(warning: any, defaultHandler: any) {
+                onwarn(warning, defaultHandler) {
                     if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
                         return;
                     }
@@ -91,8 +89,8 @@ export async function buildBackendFunctions(
 
     const output = Array.isArray(result) ? result[0] : result;
 
-    // viteBuild always returns RolldownOutput here since we don't set build.watch.
-    // RolldownWatcher would only be returned if watch mode were enabled.
+    // vite.build() returns RolldownOutput | RolldownWatcher.
+    // Since we don't enable watch mode, we always get RolldownOutput.
     if ('output' in output) {
         for (const chunk of output.output) {
             if (chunk.type !== 'chunk' || !chunk.isEntry) {

packages/plugins/apps/src/vite/index.ts

@@ -2,8 +2,8 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2019-Present Datadog, Inc.
 
+import { rm } from '@dd/core/helpers/fs';
 import type { Logger, PluginOptions } from '@dd/core/types';
-import { rm } from 'fs/promises';
 import type { build } from 'vite';
 
 import type { BackendFunction } from '../backend/discovery';
@@ -49,7 +49,7 @@ export const getVitePlugin = ({
             await handleUpload();
         } finally {
             if (backendOutDir) {
-                await rm(backendOutDir, { recursive: true, force: true });
+                await rm(backendOutDir);
             }
         }
     },