Revert "Support inline server functions (#10162)"

This reverts commit 9855f55.

Author: devongovett

.prettierignore

@@ -7,7 +7,6 @@ packages/*/*/test/mochareporters.json
 packages/*/*/test/fixtures
 packages/*/*/test/.parcel-cache
 packages/examples/react-server-components/src/server.js
-packages/transformers/js/src/rsc-utils.js
 vendor
 tmp
 .parcel-cache

Cargo.lock

@@ -8,7 +8,7 @@ edition = "2024"
 napi = ["dep:napi", "dep:napi-derive", "dep:crossbeam-channel"]
 
 [dependencies]
-indexmap = {version = "1.9.2", features = ["serde"] }
+indexmap = "1.9.2"
 swc_core = { version = "21", features = [
   "common",
   "common_sourcemap",

crates/macros/Cargo.toml

@@ -475,22 +475,14 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
       }
     }
 
-    // If all of the assets are dependent (e.g. circular dependency),
-    // make the first one the main resolved asset.
-    let entryAssetId;
-    if (assets.length > 1 && dependentAssetKeys.size === assets.length) {
-      entryAssetId = assets[0].id;
-    }
-
     let assetObjects: Array<{|
       assetNodeId: NodeId,
       dependentAssets: Array<Asset>,
     |}> = [];
     let assetNodeIds = [];
     for (let asset of assets) {
       this.normalizeEnvironment(asset);
-      let isDirect =
-        asset.id === entryAssetId || !dependentAssetKeys.has(asset.uniqueKey);
+      let isDirect = !dependentAssetKeys.has(asset.uniqueKey);
 
       let dependentAssets = [];
       for (let dep of asset.dependencies.values()) {

packages/core/core/src/AssetGraph.js

@@ -352,8 +352,8 @@ export default class UncommittedAsset {
 
   createChildAsset(
     result: TransformerResult,
-    plugin?: PackageName,
-    configPath?: ProjectPath,
+    plugin: PackageName,
+    configPath: ProjectPath,
     configKeyPath?: string,
   ): UncommittedAsset {
     let content = result.content ?? null;

packages/core/core/src/UncommittedAsset.js

@@ -20,7 +20,6 @@ import type {
   MutableAssetSymbols as IMutableAssetSymbols,
   AssetSymbols as IAssetSymbols,
   BundleBehavior,
-  TransformerResult,
 } from '@parcel/types';
 import type {Asset as AssetValue, ParcelOptions} from '../types';
 
@@ -236,17 +235,6 @@ export class MutableAsset extends BaseAsset implements IMutableAsset {
     return this;
   }
 
-  createChildAsset(result?: TransformerResult): MutableAsset {
-    let asset = this.#asset.createChildAsset(
-      result || {
-        type: this.#asset.value.type,
-      },
-    );
-    asset.transformers = this.#asset.transformers;
-    asset.sourceContent = this.#asset.sourceContent;
-    return new MutableAsset(asset);
-  }
-
   setMap(map: ?SourceMap): void {
     this.#asset.setMap(map);
   }
@@ -300,7 +288,6 @@ export class MutableAsset extends BaseAsset implements IMutableAsset {
       );
     }
     this.#asset.value.uniqueKey = uniqueKey;
-    this.#asset.updateId();
   }
 
   get symbols(): IMutableAssetSymbols {

packages/core/core/src/public/Asset.js

@@ -3025,7 +3025,7 @@ describe('javascript', function () {
       b.getBundles().find(b => b.type === 'js').filePath,
       'utf8',
     );
-    assert(dist.includes('$lodash = require("lodash");'));
+    assert(dist.includes('$eyi1T$lodash = require("lodash");'));
 
     let add = await run(b);
     assert.equal(add(2, 3), 5);

packages/core/integration-tests/test/javascript.js

@@ -312,77 +312,6 @@ describe('react server components', function () {
           assert.equal(v, 3);
         });
 
-        it('should support passing inline server references to the client', async function () {
-          await fsFixture(overlayFS, dir)`
-          index.jsx:
-            import {Client} from './client';
-            import {loadServerAction} from 'react-server-dom-parcel/server.edge';
-            const root = 2;
-            function Server({value}) {
-              return <Client action={async arg => {
-                "use server";
-                return root + value + arg;  
-              }} />;
-            }
-
-            async function runAction(id, args) {
-              let action = await loadServerAction(id);
-              return action(...args);
-            }
-            output = {Server, runAction};
-
-          client.jsx:
-            "use client";
-            export function Client() {
-              return <p>Client</p>;
-            }
-        `;
-
-          let b = await bundle(path.join(dir, '/index.jsx'), {
-            inputFS: overlayFS,
-            targets: ['default'],
-            defaultTargetOptions: {
-              shouldScopeHoist,
-            },
-          });
-
-          let bundles = b.getBundles();
-          assert.equal(bundles.length, 2);
-          assert.equal(bundles[0].env.context, 'react-server');
-          assert.equal(bundles[1].env.context, 'react-client');
-          assertBundles(
-            b,
-            [
-              {
-                assets: ['index.jsx', 'index.jsx', 'rsc-utils.js'],
-              },
-              {
-                assets: ['client.jsx'],
-              },
-            ],
-            {skipNodeModules: true},
-          );
-
-          let res = (await run(b, null, {require: false})).output;
-          let result = res.Server({value: 2});
-          assert.equal(
-            result.type.$$typeof,
-            Symbol.for('react.client.reference'),
-          );
-          assert.equal(typeof result.props.action, 'function');
-          assert.equal(
-            result.props.action.$$typeof,
-            Symbol.for('react.server.reference'),
-          );
-          assert.equal(typeof result.props.action.$$id, 'string');
-
-          let x = await res.runAction(result.props.action.$$id, [
-            ...result.props.action.$$bound,
-            5,
-          ]);
-          assert.equal(x, 9);
-        });
-
         it('should support "use server-entry"', async function () {
           await fsFixture(overlayFS, dir)`
           index.jsx:

packages/core/integration-tests/test/react-server.js

@@ -3,79 +3,98 @@
 
 /* auto-generated by NAPI-RS */
 
-export declare function findAncestorFile(filenames: Array<string>, from: string, root: string): string | null
-export declare function findFirstFile(names: Array<string>): string | null
-export declare function findNodeModule(module: string, from: string): string | null
-export declare function hashString(s: string): string
-export declare function hashBuffer(buf: Buffer): string
-export declare function optimizeImage(kind: string, buf: Buffer): Buffer
-export declare function transformHtml(opts: object): unknown
-export declare function packageHtml(opts: object): unknown
-export declare function optimizeHtml(opts: object): unknown
-export declare function transformSvg(opts: object): unknown
-export declare function packageSvg(opts: object): unknown
-export declare function optimizeSvg(opts: object): unknown
-export declare function svgReact(opts: object): unknown
+export interface JsMacroError {
+  kind: number;
+  message: string;
+}
+export declare function findAncestorFile(
+  filenames: Array<string>,
+  from: string,
+  root: string,
+): string | null;
+export declare function findFirstFile(names: Array<string>): string | null;
+export declare function findNodeModule(
+  module: string,
+  from: string,
+): string | null;
+export declare function hashString(s: string): string;
+export declare function hashBuffer(buf: Buffer): string;
+export declare function optimizeImage(kind: string, buf: Buffer): Buffer;
+export declare function transformHtml(opts: object): unknown;
+export declare function packageHtml(opts: object): unknown;
+export declare function optimizeHtml(opts: object): unknown;
+export declare function transformSvg(opts: object): unknown;
+export declare function packageSvg(opts: object): unknown;
+export declare function optimizeSvg(opts: object): unknown;
+export declare function svgReact(opts: object): unknown;
 export interface JsFileSystemOptions {
-  read: (...args: any[]) => any
-  readLink: (...args: any[]) => any
-  kind: (...args: any[]) => any
-  includeNodeModules?: NapiSideEffectsVariants
+  read: (...args: any[]) => any;
+  readLink: (...args: any[]) => any;
+  kind: (...args: any[]) => any;
+  includeNodeModules?: NapiSideEffectsVariants;
 }
 export interface FileSystem {
-  fs?: JsFileSystemOptions
-  includeNodeModules?: NapiSideEffectsVariants
-  conditions?: number
-  moduleDirResolver?: (...args: any[]) => any
-  mode: number
-  entries?: number
-  extensions?: Array<string>
-  packageExports: boolean
-  typescript?: boolean
+  fs?: JsFileSystemOptions;
+  includeNodeModules?: NapiSideEffectsVariants;
+  conditions?: number;
+  moduleDirResolver?: (...args: any[]) => any;
+  mode: number;
+  entries?: number;
+  extensions?: Array<string>;
+  packageExports: boolean;
+  typescript?: boolean;
 }
 export interface ResolveOptions {
-  filename: string
-  specifierType: string
-  parent: string
-  packageConditions?: Array<string>
+  filename: string;
+  specifierType: string;
+  parent: string;
+  packageConditions?: Array<string>;
 }
 export interface FilePathCreateInvalidation {
-  filePath: string
+  filePath: string;
 }
 export interface FileNameCreateInvalidation {
-  fileName: string
-  aboveFilePath: string
+  fileName: string;
+  aboveFilePath: string;
 }
 export interface GlobCreateInvalidation {
-  glob: string
+  glob: string;
 }
 export interface ResolveResult {
-  resolution: unknown
-  invalidateOnFileChange: Array<string>
-  invalidateOnFileCreate: Array<FilePathCreateInvalidation | FileNameCreateInvalidation | GlobCreateInvalidation>
-  query?: string
-  sideEffects: boolean
-  error: unknown
-  moduleType: number
+  resolution: unknown;
+  invalidateOnFileChange: Array<string>;
+  invalidateOnFileCreate: Array<
+    | FilePathCreateInvalidation
+    | FileNameCreateInvalidation
+    | GlobCreateInvalidation
+  >;
+  query?: string;
+  sideEffects: boolean;
+  error: unknown;
+  moduleType: number;
 }
 export interface JsInvalidations {
-  invalidateOnFileChange: Array<string>
-  invalidateOnFileCreate: Array<FilePathCreateInvalidation | FileNameCreateInvalidation | GlobCreateInvalidation>
-  invalidateOnStartup: boolean
+  invalidateOnFileChange: Array<string>;
+  invalidateOnFileCreate: Array<
+    | FilePathCreateInvalidation
+    | FileNameCreateInvalidation
+    | GlobCreateInvalidation
+  >;
+  invalidateOnStartup: boolean;
 }
-export declare function transform(opts: object): unknown
-export declare function transformAsync(opts: object): object
+export declare function transform(opts: object): unknown;
+export declare function transformAsync(opts: object): object;
 export declare class Hash {
-  constructor()
-  writeString(s: string): void
-  writeBuffer(buf: Buffer): void
-  finish(): string
+  constructor();
+  writeString(s: string): void;
+  writeBuffer(buf: Buffer): void;
+  finish(): string;
 }
 export declare class Resolver {
-  constructor(projectRoot: string, options: FileSystem)
-  resolve(options: ResolveOptions): ResolveResult
-  resolveAsync(): object
-  resolveAsync(options: ResolveOptions): object
-  getInvalidations(path: string): JsInvalidations
-  getInvalidations(path: string): JsInvalidations
+  constructor(projectRoot: string, options: FileSystem);
+  resolve(options: ResolveOptions): ResolveResult;
+  resolveAsync(): object;
+  resolveAsync(options: ResolveOptions): object;
+  getInvalidations(path: string): JsInvalidations;
+  getInvalidations(path: string): JsInvalidations;
 }