diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index cfbae0ecfa53..b2f0cdfd63f1 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -82,8 +82,6 @@ ts_project( ":node_modules/@angular-devkit/core", ":node_modules/@angular/ssr", ":node_modules/@babel/core", - ":node_modules/@babel/helper-annotate-as-pure", - ":node_modules/@babel/helper-split-export-declaration", ":node_modules/@inquirer/confirm", ":node_modules/@oxc-project/types", ":node_modules/@vitejs/plugin-basic-ssl", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 59ffa8ee54a4..633064827709 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -21,8 +21,6 @@ "@ampproject/remapping": "2.3.0", "@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER", "@babel/core": "8.0.1", - "@babel/helper-annotate-as-pure": "8.0.0", - "@babel/helper-split-export-declaration": "7.24.7", "@inquirer/confirm": "6.1.1", "@vitejs/plugin-basic-ssl": "2.3.0", "beasties": "0.4.3", diff --git a/packages/angular/build/src/private.ts b/packages/angular/build/src/private.ts index 50d57d0e5a01..f1eb9dccb459 100644 --- a/packages/angular/build/src/private.ts +++ b/packages/angular/build/src/private.ts @@ -32,7 +32,6 @@ export { } from './builders/dev-server/options'; // Tools -export * from './tools/babel/plugins'; export type { ExternalResultMetadata } from './tools/esbuild/bundler-execution-result'; export { emitFilesToDisk } from './tools/esbuild/utils'; export { transformSupportedBrowsersToTargets } from './tools/esbuild/utils'; diff --git a/packages/angular/build/src/tools/babel/plugins/index.ts b/packages/angular/build/src/tools/babel/plugins/index.ts deleted file mode 100644 index dfdcd0b2d6b9..000000000000 --- a/packages/angular/build/src/tools/babel/plugins/index.ts +++ /dev/null @@ -1,12 +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 - */ - -export { default as adjustStaticMembers } from './adjust-static-class-members'; -export { default as adjustTypeScriptEnums } from './adjust-typescript-enums'; -export { default as elideAngularMetadata } from './elide-angular-metadata'; -export { default as markTopLevelPure } from './pure-toplevel-functions'; diff --git a/packages/angular/build/src/tools/babel/typings.d.ts b/packages/angular/build/src/tools/babel/typings.d.ts deleted file mode 100644 index c2132a921dd9..000000000000 --- a/packages/angular/build/src/tools/babel/typings.d.ts +++ /dev/null @@ -1,21 +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 - */ - -declare module '@babel/helper-annotate-as-pure' { - export default function annotateAsPure( - pathOrNode: import('@babel/types').Node | { node: import('@babel/types').Node }, - ): void; -} - -declare module '@babel/helper-split-export-declaration' { - export default function splitExportDeclaration( - exportDeclaration: import('@babel/core').NodePath< - import('@babel/types').ExportDefaultDeclaration - >, - ): void; -} diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 90fc7bf4b1fc..308ee73e52f3 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -200,6 +200,7 @@ ts_project( deps = [ ":build_angular", ":build_angular_test_utils", + ":node_modules/@babel/core", ":node_modules/tinyglobby", "//:node_modules/@types/node", "//:node_modules/prettier", diff --git a/packages/angular/build/src/tools/babel/plugins/adjust-static-class-members.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/adjust-static-class-members.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members.ts diff --git a/packages/angular/build/src/tools/babel/plugins/adjust-static-class-members_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members_spec.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/adjust-static-class-members_spec.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members_spec.ts diff --git a/packages/angular/build/src/tools/babel/plugins/adjust-typescript-enums.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/adjust-typescript-enums.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums.ts diff --git a/packages/angular/build/src/tools/babel/plugins/adjust-typescript-enums_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums_spec.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/adjust-typescript-enums_spec.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums_spec.ts diff --git a/packages/angular/build/src/tools/babel/plugins/elide-angular-metadata.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/elide-angular-metadata.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata.ts diff --git a/packages/angular/build/src/tools/babel/plugins/elide-angular-metadata_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata_spec.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/elide-angular-metadata_spec.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata_spec.ts diff --git a/packages/angular/build/src/tools/babel/plugins/pure-toplevel-functions.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/pure-toplevel-functions.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions.ts diff --git a/packages/angular/build/src/tools/babel/plugins/pure-toplevel-functions_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions_spec.ts similarity index 100% rename from packages/angular/build/src/tools/babel/plugins/pure-toplevel-functions_spec.ts rename to packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions_spec.ts diff --git a/packages/angular_devkit/build_angular/src/tools/babel/plugins/types.d.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/types.d.ts index 4ff052dcb136..22c8d81dc1d9 100644 --- a/packages/angular_devkit/build_angular/src/tools/babel/plugins/types.d.ts +++ b/packages/angular_devkit/build_angular/src/tools/babel/plugins/types.d.ts @@ -18,3 +18,17 @@ declare module 'istanbul-lib-instrument' { options?: { inputSourceMap?: object | null }, ): Visitor; } + +declare module '@babel/helper-annotate-as-pure' { + export default function annotateAsPure( + pathOrNode: import('@babel/types').Node | { node: import('@babel/types').Node }, + ): void; +} + +declare module '@babel/helper-split-export-declaration' { + export default function splitExportDeclaration( + exportDeclaration: import('@babel/core').NodePath< + import('@babel/types').ExportDefaultDeclaration + >, + ): void; +} diff --git a/packages/angular_devkit/build_angular/src/tools/babel/presets/application.ts b/packages/angular_devkit/build_angular/src/tools/babel/presets/application.ts index f5c8a4c8b9c6..9fd8e04fddac 100644 --- a/packages/angular_devkit/build_angular/src/tools/babel/presets/application.ts +++ b/packages/angular_devkit/build_angular/src/tools/babel/presets/application.ts @@ -212,17 +212,17 @@ export default function (api: unknown, options: ApplicationPresetOptions) { } if (options.optimize) { - const { - adjustStaticMembers, - adjustTypeScriptEnums, - elideAngularMetadata, - markTopLevelPure, - } = require('@angular/build/private'); plugins.push( - [markTopLevelPure, { topLevelSafeMode: options.optimize.topLevelSafeMode }], - elideAngularMetadata, - adjustTypeScriptEnums, - [adjustStaticMembers, { wrapDecorators: options.optimize.wrapDecorators }], + [ + require('../plugins/pure-toplevel-functions').default, + { topLevelSafeMode: options.optimize.topLevelSafeMode }, + ], + require('../plugins/elide-angular-metadata').default, + require('../plugins/adjust-typescript-enums').default, + [ + require('../plugins/adjust-static-class-members').default, + { wrapDecorators: options.optimize.wrapDecorators }, + ], ); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c240d7031d6..0e3c3cd04d51 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -337,12 +337,6 @@ importers: '@babel/core': specifier: 8.0.1 version: 8.0.1 - '@babel/helper-annotate-as-pure': - specifier: 8.0.0 - version: 8.0.0 - '@babel/helper-split-export-declaration': - specifier: 7.24.7 - version: 7.24.7 '@inquirer/confirm': specifier: 6.1.1 version: 6.1.1(@types/node@22.20.1)