diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index ee90b96ec703..b475ebfdf1bc 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -72,7 +72,6 @@ copy_to_bin( RUNTIME_ASSETS = glob( include = [ "src/**/schema.json", - "src/**/*.js", "src/**/*.html", ], ) + [ diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts index 16aaa04d8c34..da07543fafa8 100644 --- a/packages/angular_devkit/build_angular/src/utils/index.ts +++ b/packages/angular_devkit/build_angular/src/utils/index.ts @@ -8,7 +8,6 @@ export * from './default-progress'; export { deleteOutputDir, loadProxyConfiguration } from '@angular/build/private'; -export * from './run-module-as-observable-fork'; export * from './normalize-file-replacements'; export * from './normalize-asset-patterns'; export * from './normalize-source-maps'; diff --git a/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts b/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts deleted file mode 100644 index f447103da9b4..000000000000 --- a/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts +++ /dev/null @@ -1,86 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -import { BuilderOutput } from '@angular-devkit/architect'; -import { ForkOptions, fork } from 'node:child_process'; -import { resolve } from 'node:path'; -import { Observable } from 'rxjs'; -import treeKill from 'tree-kill'; - -export function runModuleAsObservableFork( - cwd: string, - modulePath: string, - exportName: string | undefined, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - args: any[], -): Observable { - return new Observable((obs) => { - const workerPath: string = resolve(__dirname, './run-module-worker.js'); - - const debugArgRegex = /--inspect(?:-brk|-port)?|--debug(?:-brk|-port)/; - const execArgv = process.execArgv.filter((arg) => { - // Remove debug args. - // Workaround for https://github.com/nodejs/node/issues/9435 - return !debugArgRegex.test(arg); - }); - const forkOptions: ForkOptions = { - cwd, - execArgv, - }; - - // TODO: support passing in a logger to use as stdio streams - // if (logger) { - // (forkOptions as any).stdio = [ - // 'ignore', - // logger.info, // make it a stream - // logger.error, // make it a stream - // ]; - // } - - const forkedProcess = fork(workerPath, undefined, forkOptions); - - // Cleanup. - const killForkedProcess = () => { - if (forkedProcess && forkedProcess.pid) { - treeKill(forkedProcess.pid, 'SIGTERM'); - } - }; - - // Handle child process exit. - const handleChildProcessExit = (code?: number) => { - killForkedProcess(); - if (code && code !== 0) { - obs.error(); - } - obs.next({ success: true }); - obs.complete(); - }; - forkedProcess.once('exit', handleChildProcessExit); - forkedProcess.once('SIGINT', handleChildProcessExit); - forkedProcess.once('uncaughtException', handleChildProcessExit); - - // Handle parent process exit. - const handleParentProcessExit = () => { - killForkedProcess(); - }; - process.once('exit', handleParentProcessExit); - process.once('SIGINT', handleParentProcessExit); - process.once('uncaughtException', handleParentProcessExit); - - // Run module. - forkedProcess.send({ - hash: '5d4b9a5c0a4e0f9977598437b0e85bcc', - modulePath, - exportName, - args, - }); - - // Teardown logic. When unsubscribing, kill the forked process. - return killForkedProcess; - }); -} diff --git a/packages/angular_devkit/build_angular/src/utils/run-module-worker.js b/packages/angular_devkit/build_angular/src/utils/run-module-worker.js deleted file mode 100644 index a6f3fa54513a..000000000000 --- a/packages/angular_devkit/build_angular/src/utils/run-module-worker.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ -process.on('message', (message) => { - // Only process messages with the hash in 'run-module-as-observable-fork.ts'. - if (message.hash === '5d4b9a5c0a4e0f9977598437b0e85bcc') { - const requiredModule = require(message.modulePath); - if (message.exportName) { - requiredModule[message.exportName](...message.args); - } else { - requiredModule(...message.args); - } - } -});