Project import generated by Copybara.

GitOrigin-RevId: 710a5d8064274048f54f0c76deb5666d64ffe255

Author: Redditbara

packages/build-pack/src/__tests__/esbuild/ESBuildPack.spec.ts

@@ -534,30 +534,6 @@ describe('ES Build Pack', () => {
         expect(cleanedUpCode).not.toContain(`__toESM(require_${stub}(), 1)`)
       );
     });
-
-    it('removes plugin code when DEVVIT_BUNDLE_STRIP_PLUGINS is set', async () => {
-      process.env.DEVVIT_BUNDLE_STRIP_PLUGINS = '1';
-      const result = await build({
-        bundle: true,
-        entryPoints: [path.resolve(__dirname, '..', 'test-actors', 'code-split', 'main.tsx')],
-        minify: false,
-        outfile: 'main.js',
-        plugins: [serverClientCodeSplit(true)],
-        format: 'cjs',
-        jsxFactory: 'Devvit.createFragment',
-        jsxFragment: 'Devvit.Fragment',
-        target: 'es2020',
-        write: false,
-      });
-      const clientBundle = result.outputFiles.find((bundle) =>
-        bundle.text.includes('"server-only:')
-      );
-      expect(clientBundle?.text).not.toBeUndefined();
-      const stubbedRedis = result.outputFiles?.[0]?.text.match(
-        /var import_RedisClient[0-9]* = __toESM\(require_server_stub\(\), 1\)/gm
-      );
-      expect(stubbedRedis).toBeTruthy();
-    });
   });
 });
 

packages/build-pack/src/esbuild/plugins/serverClientCodeSplit.ts

@@ -10,17 +10,6 @@ import type {
   PluginBuild,
 } from 'esbuild';
 
-// public-api paths to strip from client builds
-// subfolders of: packages/public-api/src/apis/
-const SERVER_ONLY_PLUGIN_PATHS = [
-  'key-value-storage',
-  'media',
-  'modLog',
-  'reddit',
-  'redis',
-  'scheduler',
-];
-
 // Code stamped in client builds that replaces server-only code as `server-stub.js`
 const CLIENT_CIRCUITBREAK_STUB = `
   let circuitBreak = globalThis.circuitBreak;
@@ -65,18 +54,6 @@ export function serverClientCodeSplit(watchMode: boolean = false): Plugin {
   return {
     name: 'removeServerCode',
     setup(build: PluginBuild) {
-      let publicApiDir: string;
-
-      // We can't call build.resolve() outside of one of the plugin callbacks
-      build.onStart(async () => {
-        const { path: resolvedPath } = await build.resolve('@devvit/public-api', {
-          resolveDir: '.',
-          kind: 'import-statement',
-          pluginData: 'removeServerCodeStart',
-        });
-        publicApiDir = path.dirname(resolvedPath);
-      });
-
       // Remove code the developer has marked as server-only by naming convention:
       build.onResolve(
         { filter: /(\/server\/)|(\.server\.(js|ts)x?$)/ },
@@ -113,26 +90,6 @@ export function serverClientCodeSplit(watchMode: boolean = false): Plugin {
         }
       );
 
-      // If set, don't strip plugin code from client bundles
-      if (process.env.DEVVIT_BUNDLE_STRIP_PLUGINS === '1') {
-        // Remove plugins from public-api that are non-op on clients and always
-        // result in a circuit break:
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        const publicApiFilter = new RegExp(`/(${SERVER_ONLY_PLUGIN_PATHS.join('|')})/`);
-        build.onResolve({ filter: publicApiFilter }, (args: OnResolveArgs): OnResolveResult => {
-          // Since the regex for public-api paths is so broad, ensure the resolved import is from
-          // @devvit/public-api and not someplace else
-          if (!args.importer.startsWith(publicApiDir)) {
-            return {};
-          }
-
-          return {
-            namespace: SERVER_ONLY_NAMESPACE,
-            path: SERVER_ONLY_FILENAME,
-          };
-        });
-      }
-
       // Create the circuit break stub and return a Proxy object so any
       // fields or functions imported throw a CircuitBreak exception instead
       // of a ReferenceError.

packages/public-api/package.json

@@ -33,7 +33,6 @@
   },
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@devvit/metrics": "0.13.7",
     "@devvit/protos": "0.13.7",
     "@devvit/shared": "0.13.7",
     "@devvit/shared-types": "0.13.7",