@nx/angular 0.0.0-pr-22179-271588f → 0.0.0-pr-26482-ebe2dba

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationDevServerExecutor = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
+const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
 const module_federation_2 = require("../../builders/utilities/module-federation");
@@ -34,13 +35,16 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         : (0, rxjs_for_await_1.eachValueFrom)((0, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
             builderName: '@nx/angular:webpack-browser',
             description: 'Build a browser application',
-            optionSchema: await Promise.resolve().then(() => require('../../builders/webpack-browser/schema.json')),
+            optionSchema: require('../../builders/webpack-browser/schema.json'),
         }, context)));
     if (options.isInitialHost === false) {
         return yield* currIter;
     }
-    let pathToManifestFile = (0, path_1.join)(context.root, project.sourceRoot, 'assets/module-federation.manifest.json');
-    if (options.pathToManifestFile) {
+    let pathToManifestFile;
+    if (!options.pathToManifestFile) {
+        pathToManifestFile = (0, module_federation_2.getDynamicMfManifestFile)(project, context.root);
+    }
+    else {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
             throw new Error(`The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`);
@@ -52,14 +56,17 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     (0, module_federation_2.validateDevRemotes)(options, workspaceProjects);
     const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
-    const remotes = (0, module_federation_1.getRemotes)(options.devRemotes, options.skipRemotes, moduleFederationConfig, {
+    const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
+    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,
         projectGraph: context.projectGraph,
         root: context.root,
     }, pathToManifestFile);
     if (remotes.devRemotes.length > 0 && !schema.staticRemotesPort) {
         options.staticRemotesPort = options.devRemotes.reduce((portToUse, r) => {
-            const remotePort = context.projectGraph.nodes[r].data.targets['serve'].options.port;
+            const remoteName = typeof r === 'string' ? r : r.remoteName;
+            const remotePort = context.projectGraph.nodes[remoteName].data.targets['serve'].options
+                .port;
             if (remotePort >= portToUse) {
                 return remotePort + 1;
             }
@@ -70,7 +77,8 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     const staticRemotesConfig = (0, lib_1.parseStaticRemotesConfig)(remotes.staticRemotes, context);
     await (0, lib_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
-    const devRemoteIters = await (0, lib_1.startDevRemotes)(remotes, workspaceProjects, options, context);
+    const devRemoteIters = await (0, lib_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context, 'serve');
+    const dynamicRemoteIters = await (0, lib_1.startRemotes)(remotes.dynamicRemotes, workspaceProjects, options, context, 'serve-static');
     const staticRemotesIter = remotes.staticRemotes.length > 0
         ? (0, lib_1.startStaticRemotesFileServer)(staticRemotesConfig, context, options)
         : undefined;
@@ -78,7 +86,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         ...v,
         baseUrl: undefined,
     }));
-    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...dynamicRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

package/src/executors/module-federation-dev-server/schema.d.ts

@@ -1,3 +1,5 @@
+import type { DevRemoteDefinition } from '../../builders/utilities/module-federation';
+
 interface BaseSchema {
   port?: number;
   host?: string;
@@ -16,7 +18,7 @@ interface BaseSchema {
   hmr?: boolean;
   watch?: boolean;
   poll?: number;
-  devRemotes?: string[];
+  devRemotes?: DevRemoteDefinition[];
   skipRemotes?: string[];
   pathToManifestFile?: string;
   static?: boolean;
@@ -37,6 +39,7 @@ export type SchemaWithBuildTarget = BaseSchema & {
 export type Schema = SchemaWithBrowserTarget | SchemaWithBuildTarget;
 
 export type NormalizedSchema = SchemaWithBuildTarget & {
+  devRemotes: DevRemoteDefinition[];
   liveReload: boolean;
   open: boolean;
   ssl: boolean;

package/src/executors/module-federation-dev-server/schema.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Module Federation Dev Server",
   "outputCapture": "direct-nodejs",
-  "description": "The module-federation-dev-server executor is reserved exclusively for use with host Module Federation applications. It allows the user to specify which remote applications should be served with the host.",
+  "description": "Serves host [Module Federation](https://module-federation.io/) applications ([webpack](https://webpack.js.org/)-based) allowing to specify which remote applications should be served with the host.",
   "type": "object",
   "presets": [
     {
@@ -15,7 +15,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v20."
     },
     "buildTarget": {
       "type": "string",
@@ -34,7 +34,7 @@
     },
     "proxyConfig": {
       "type": "string",
-      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
+      "description": "Proxy configuration file. For more information, see https://angular.dev/tools/cli/serve#proxying-to-a-backend-server."
     },
     "ssl": {
       "type": "boolean",
@@ -112,7 +112,24 @@
     "devRemotes": {
       "type": "array",
       "items": {
-        "type": "string"
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "remoteName": {
+                "type": "string"
+              },
+              "configuration": {
+                "type": "string"
+              }
+            },
+            "required": ["remoteName"],
+            "additionalProperties": false
+          }
+        ]
       },
       "description": "List of remote applications to run in development mode (i.e. using serve target).",
       "x-priority": "important"
@@ -122,7 +139,7 @@
       "items": {
         "type": "string"
       },
-      "description": "List of remote applications to not automatically serve, either statically or in development mode. This will not remove the remotes from the `module-federation.config` file, and therefore the application may still try to fetch these remotes.\nThis option is useful for when the `host` application is using a `remote` that does not live in the same workspace as the `host`."
+      "description": "List of remote applications to not automatically serve, either statically or in development mode. This will not remove the remotes from the `module-federation.config` file, and therefore the application may still try to fetch these remotes.\nThis option is useful if you have other means for serving the `remote` application(s).\n**NOTE:** Remotes that are not in the workspace will be skipped automatically."
     },
     "pathToManifestFile": {
       "type": "string",

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-packagr.js

@@ -6,9 +6,9 @@ const angular_version_utils_1 = require("../../utilities/angular-version-utils")
 async function getNgPackagrInstance(options) {
     const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     if (angularMajorVersion >= 17) {
-        const { WRITE_BUNDLES_TRANSFORM } = await Promise.resolve().then(() => require('./v17+/ng-package/entry-point/write-bundles.di'));
-        const { WRITE_PACKAGE_TRANSFORM } = await Promise.resolve().then(() => require('./v17+/ng-package/entry-point/write-package.di'));
-        const { STYLESHEET_PROCESSOR } = await Promise.resolve().then(() => require('../../utilities/ng-packagr/stylesheet-processor.di'));
+        const { WRITE_BUNDLES_TRANSFORM } = await import('./v17+/ng-package/entry-point/write-bundles.di.js');
+        const { WRITE_PACKAGE_TRANSFORM } = await import('./v17+/ng-package/entry-point/write-package.di.js');
+        const { STYLESHEET_PROCESSOR } = await import('../../utilities/ng-packagr/stylesheet-processor.di.js');
         const packagr = (0, ng_packagr_1.ngPackagr)();
         packagr.withProviders([
             WRITE_BUNDLES_TRANSFORM,
@@ -17,9 +17,9 @@ async function getNgPackagrInstance(options) {
         ]);
         return packagr;
     }
-    const { NX_ENTRY_POINT_PROVIDERS } = await Promise.resolve().then(() => require('./pre-v17/ng-package/entry-point/entry-point.di'));
-    const { nxProvideOptions } = await Promise.resolve().then(() => require('./pre-v17/ng-package/options.di'));
-    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await Promise.resolve().then(() => require('./pre-v17/ng-package/package.di'));
+    const { NX_ENTRY_POINT_PROVIDERS } = await import('./pre-v17/ng-package/entry-point/entry-point.di.js');
+    const { nxProvideOptions } = await import('./pre-v17/ng-package/options.di.js');
+    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await import('./pre-v17/ng-package/package.di.js');
     const packagr = new ng_packagr_1.NgPackagr([
         ...NX_PACKAGE_PROVIDERS,
         ...NX_ENTRY_POINT_PROVIDERS,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ng-package/entry-point/compile-ngc.transform.js

@@ -9,11 +9,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCompileNgcTransformFactory = void 0;
+const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
-const path = require("path");
-const ts = require("typescript");
+const path = tslib_1.__importStar(require("path"));
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ng-package/entry-point/write-package.transform.js

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxWritePackageTransform = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("ng-packagr/lib/graph/node");
 const transform_1 = require("ng-packagr/lib/graph/transform");
@@ -15,7 +16,7 @@ const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const fs_1 = require("ng-packagr/lib/utils/fs");
 const glob_1 = require("ng-packagr/lib/utils/glob");
 const path_1 = require("ng-packagr/lib/utils/path");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const angular_version_utils_1 = require("../../../../../utilities/angular-version-utils");
 const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ng-package/options.di.js

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
-const findCacheDirectory = require("find-cache-dir");
+const tslib_1 = require("tslib");
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -30,5 +31,5 @@ function normalizeOptions(options = {}) {
 }
 function findCachePath() {
     const name = 'ng-packagr';
-    return findCacheDirectory({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
+    return (0, find_cache_dir_1.default)({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
 }

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ngc/compile-source-files.d.ts

@@ -5,9 +5,8 @@
  * - Use custom StylesheetProcessor instead of the one provided by ng-packagr.
  * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
-import type { CompilerOptions, ParsedConfiguration } from '@angular/compiler-cli';
 import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
 import * as ts from 'typescript';
 import { NgPackagrOptions } from '../ng-package/options.di';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
-export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor): Promise<void>;
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: any, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<ts.CompilerOptions>, stylesheetProcessor?: StylesheetProcessor): Promise<void>;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ngc/compile-source-files.js

@@ -8,15 +8,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
+const tslib_1 = require("tslib");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const cache_compiler_host_1 = require("ng-packagr/lib/ts/cache-compiler-host");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const node_path_1 = require("node:path");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
-const ng_compiler_cli_1 = require("../../../../utilities/ng-compiler-cli");
+const module_loader_1 = require("../../../../utilities/module-loader");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor) {
-    const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    const { NgtscProgram, formatDiagnostics } = await (0, module_loader_1.loadEsmModule)('@angular/compiler-cli');
     const { cacheDirectory, watch, cacheEnabled } = options;
     const tsConfigOptions = {
         ...tsConfig.options,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/styles/stylesheet-processor.js

@@ -8,14 +8,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StylesheetProcessor = exports.InlineStyleLanguage = exports.CssUrl = void 0;
-const browserslist = require("browserslist");
+const tslib_1 = require("tslib");
+const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const fs_1 = require("fs");
-const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
 const cache_1 = require("ng-packagr/lib/utils/cache");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
-const autoprefixer = require("autoprefixer");
-const postcssUrl = require("postcss-url");
+const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
+const postcss_url_1 = tslib_1.__importDefault(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -39,12 +39,12 @@ class StylesheetProcessor {
         this.includePaths = includePaths;
         this.cacheDirectory = cacheDirectory;
         this.tailwindConfig = tailwindConfig;
-        this.esbuild = new esbuild_executor_1.EsbuildExecutor();
+        this.esbuild = new (require('ng-packagr/lib/esbuild/esbuild-executor').EsbuildExecutor)();
         // By default, browserslist defaults are too inclusive
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -63,7 +63,7 @@ class StylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
         const tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.projectBasePath, this.tailwindConfig);
         if (tailwindSetup) {
@@ -135,9 +135,9 @@ class StylesheetProcessor {
             postCssPlugins.push((0, tailwindcss_1.getTailwindPostCssPlugin)(tailwindSetup));
         }
         if (this.cssUrl !== CssUrl.none) {
-            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
+            postCssPlugins.push((0, postcss_url_1.default)({ url: this.cssUrl }));
         }
-        postCssPlugins.push(autoprefixer({
+        postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,
             overrideBrowserslist: this.browserslistData,
         }));
@@ -148,14 +148,14 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                return (await Promise.resolve().then(() => require('sass'))).compileString(css, {
+                return (await import('sass')).compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),
                     syntax: '.sass' === ext ? 'indented' : 'scss',
                     loadPaths: this.styleIncludePaths,
                 }).css;
             }
             case '.less': {
-                const { css: content } = await (await Promise.resolve().then(() => require('less'))).render(css, {
+                const { css: content } = await (await import('less')).render(css, {
                     filename: filePath,
                     javascriptEnabled: true,
                     paths: this.styleIncludePaths,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.transform.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxWritePackageTransform = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("ng-packagr/lib/graph/node");
 const transform_1 = require("ng-packagr/lib/graph/transform");
@@ -14,7 +15,7 @@ const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const fs_1 = require("ng-packagr/lib/utils/fs");
 const glob_1 = require("ng-packagr/lib/utils/glob");
 const path_1 = require("ng-packagr/lib/utils/path");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
     const ngEntryPoint = entryPoint.data.entryPoint;

package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js

@@ -10,7 +10,7 @@ async function initializeNgPackgrLite(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)(options);
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }

package/src/executors/ng-packagr-lite/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but with some key differences:\n- For supported Angular versions lower than v16, it doesn't run `ngcc` automatically (`ngcc` is no longer available from Angular v16 onwards, for lower versions, it needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2022 bundles (ESM2020 for supported Angular versions lower than v16).",
+  "description": "Builds an Angular library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but it only produces ESM2022 bundles.",
   "cli": "nx",
   "type": "object",
   "presets": [

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js

@@ -9,18 +9,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileNgcTransformFactory = void 0;
+const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
-const ora = require("ora");
-const path = require("path");
-const ts = require("typescript");
+const ora_1 = tslib_1.__importDefault(require("ora"));
+const path = tslib_1.__importStar(require("path"));
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const ng_compiler_cli_1 = require("../../utils/ng-compiler-cli");
 const compileNgcTransformFactory = (StylesheetProcessor, options) => {
     return (0, transform_1.transformFromPromise)(async (graph) => {
-        const spinner = ora({
+        const spinner = (0, ora_1.default)({
             hideCursor: false,
             discardStdin: false,
         });

package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
-const findCacheDirectory = require("find-cache-dir");
+const tslib_1 = require("tslib");
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -30,5 +31,5 @@ function normalizeOptions(options = {}) {
 }
 function findCachePath() {
     const name = 'ng-packagr';
-    return findCacheDirectory({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
+    return (0, find_cache_dir_1.default)({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
 }

package/src/executors/package/ng-packagr-adjustments/ng-packagr.js

@@ -6,14 +6,14 @@ const angular_version_utils_1 = require("../../utilities/angular-version-utils")
 async function getNgPackagrInstance(options) {
     const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     if (angularMajorVersion >= 17) {
-        const { STYLESHEET_PROCESSOR } = await Promise.resolve().then(() => require('../../utilities/ng-packagr/stylesheet-processor.di'));
+        const { STYLESHEET_PROCESSOR } = await import('../../utilities/ng-packagr/stylesheet-processor.di.js');
         const packagr = (0, ng_packagr_1.ngPackagr)();
         packagr.withProviders([STYLESHEET_PROCESSOR]);
         return packagr;
     }
-    const { NX_ENTRY_POINT_PROVIDERS } = await Promise.resolve().then(() => require('./ng-package/entry-point/entry-point.di'));
-    const { nxProvideOptions } = await Promise.resolve().then(() => require('./ng-package/options.di'));
-    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await Promise.resolve().then(() => require('./ng-package/package.di'));
+    const { NX_ENTRY_POINT_PROVIDERS } = await import('./ng-package/entry-point/entry-point.di.js');
+    const { nxProvideOptions } = await import('./ng-package/options.di.js');
+    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await import('./ng-package/package.di.js');
     const packagr = new ng_packagr_1.NgPackagr([
         ...NX_PACKAGE_PROVIDERS,
         ...NX_ENTRY_POINT_PROVIDERS,

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.d.ts

@@ -6,9 +6,8 @@
  * - Support ngcc for Angular < 16.
  * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
-import type { CompilerOptions, ParsedConfiguration } from '@angular/compiler-cli';
 import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
 import * as ts from 'typescript';
 import { NgPackagrOptions } from '../ng-package/options.di';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
-export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: any): Promise<void>;
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: any, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<ts.CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: any): Promise<void>;

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -9,15 +9,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
+const tslib_1 = require("tslib");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const cache_compiler_host_1 = require("ng-packagr/lib/ts/cache-compiler-host");
 const node_path_1 = require("node:path");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
-const ng_compiler_cli_1 = require("../../../utilities/ng-compiler-cli");
+const module_loader_1 = require("../../../utilities/module-loader");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor, ngccProcessor) {
-    const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    const { NgtscProgram, formatDiagnostics } = await (0, module_loader_1.loadEsmModule)('@angular/compiler-cli');
     const { cacheDirectory, watch, cacheEnabled } = options;
     const tsConfigOptions = {
         ...tsConfig.options,

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -8,14 +8,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StylesheetProcessor = exports.CssUrl = void 0;
-const browserslist = require("browserslist");
+const tslib_1 = require("tslib");
+const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const fs_1 = require("fs");
-const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
 const cache_1 = require("ng-packagr/lib/utils/cache");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
-const autoprefixer = require("autoprefixer");
-const postcssUrl = require("postcss-url");
+const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
+const postcss_url_1 = tslib_1.__importDefault(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -32,12 +32,12 @@ class StylesheetProcessor {
         this.includePaths = includePaths;
         this.cacheDirectory = cacheDirectory;
         this.tailwindConfig = tailwindConfig;
-        this.esbuild = new esbuild_executor_1.EsbuildExecutor();
+        this.esbuild = new (require('ng-packagr/lib/esbuild/esbuild-executor').EsbuildExecutor)();
         // By default, browserslist defaults are too inclusive
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -56,7 +56,7 @@ class StylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
         const tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.projectBasePath, this.tailwindConfig);
         if (tailwindSetup) {
@@ -128,9 +128,9 @@ class StylesheetProcessor {
             postCssPlugins.push((0, tailwindcss_1.getTailwindPostCssPlugin)(tailwindSetup));
         }
         if (this.cssUrl !== CssUrl.none) {
-            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
+            postCssPlugins.push((0, postcss_url_1.default)({ url: this.cssUrl }));
         }
-        postCssPlugins.push(autoprefixer({
+        postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,
             overrideBrowserslist: this.browserslistData,
         }));
@@ -141,14 +141,14 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                return (await Promise.resolve().then(() => require('sass'))).compileString(css, {
+                return (await import('sass')).compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),
                     syntax: '.sass' === ext ? 'indented' : 'scss',
                     loadPaths: this.styleIncludePaths,
                 }).css;
             }
             case '.less': {
-                const { css: content } = await (await Promise.resolve().then(() => require('less'))).render(css, {
+                const { css: content } = await (await import('less')).render(css, {
                     filename: filePath,
                     javascriptEnabled: true,
                     paths: this.styleIncludePaths,

package/src/executors/package/package.impl.js

@@ -12,7 +12,7 @@ async function initializeNgPackagr(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)(options);
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }

package/src/executors/package/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
+  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
   "cli": "nx",
   "type": "object",
   "presets": [

package/src/executors/utilities/esbuild-extensions.d.ts

@@ -1,10 +1,8 @@
-import type { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/index-html-generator';
 import type { Plugin } from 'esbuild';
-import type { Connect } from 'vite';
 export type PluginSpec = {
     path: string;
     options: any;
 };
 export declare function loadPlugins(plugins: string[] | PluginSpec[] | undefined, tsConfig: string): Promise<Plugin[]>;
-export declare function loadMiddleware(middlewareFns: string[] | undefined, tsConfig: string): Promise<Connect.NextHandleFunction[]>;
-export declare function loadIndexHtmlTransformer(indexHtmlTransformerPath: string, tsConfig: string): Promise<IndexHtmlTransform>;
+export declare function loadMiddleware(middlewareFns: string[] | undefined, tsConfig: string): Promise<any[]>;
+export declare function loadIndexHtmlTransformer(indexHtmlTransformerPath: string, tsConfig: string): Promise<any>;

package/src/executors/utilities/module-loader.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare function loadModule<T = any>(path: string): Promise<T>;
 /**
  * This uses a dynamic import to load a module which may be ESM.
@@ -12,4 +11,4 @@ export declare function loadModule<T = any>(path: string): Promise<T>;
  * @param modulePath The path of the module to load.
  * @returns A Promise that resolves to the dynamically imported module.
  */
-export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;
+export declare function loadEsmModule<T = any>(modulePath: string | URL): Promise<T>;