@nx/rollup 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -30,8 +30,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.11",
-    "@nx/js": "23.0.0-beta.11",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -49,7 +49,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.11",
+    "nx": "23.0.0-beta.13",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {

package/src/executors/rollup/lib/normalize.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeRollupExecutorOptions = normalizeRollupExecutorOptions;
 exports.normalizePluginPath = normalizePluginPath;
 const path_1 = require("path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeRollupExecutorOptions(options, context) {
     const { root } = context;
-    const skipTypeCheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)() ? true : options.skipTypeCheck;
+    const skipTypeCheck = (0, internal_1.isUsingTsSolutionSetup)() ? true : options.skipTypeCheck;
     return {
         ...options,
         rollupConfig: []

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

@@ -10,7 +10,7 @@ const internal_1 = require("@nx/devkit/internal");
 const normalize_1 = require("./lib/normalize");
 const with_nx_1 = require("../../plugins/with-nx/with-nx");
 const generate_package_json_1 = require("../../plugins/package-json/generate-package-json");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_2 = require("@nx/js/internal");
 const deprecation_1 = require("../../utils/deprecation");
 async function* rollupExecutor(rawOptions, context) {
     (0, deprecation_1.warnRollupExecutorDeprecation)();
@@ -80,7 +80,7 @@ async function* rollupExecutor(rawOptions, context) {
 }
 // -----------------------------------------------------------------------------
 async function createRollupOptions(options, context) {
-    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
+    const { dependencies } = (0, internal_2.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
     const rollupConfig = (0, with_nx_1.withNx)(options, {}, dependencies);
     // `generatePackageJson` is a plugin rather than being embedded into @nx/rollup:rollup.
     // Make sure the plugin is always present to keep the previous before of Nx < 19.4, where it was not a plugin.

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAOjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAkBpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAoC7B;AAsPD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,iBAAiB,EAOjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAkBpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAoC7B;AAwPD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -4,9 +4,7 @@ exports.configurationGenerator = configurationGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
@@ -24,7 +22,7 @@ async function configurationGenerator(tree, options) {
     if (!options.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     let outputConfig;
     if ((0, has_plugin_1.hasPlugin)(tree)) {
         outputConfig = createRollupConfig(tree, options, isTsSolutionSetup);
@@ -105,7 +103,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
     }
     else {
         packageJson = {
-            name: options.importPath || (0, get_import_path_1.getImportPath)(tree, options.project),
+            name: options.importPath || (0, internal_2.getImportPath)(tree, options.project),
             version: '0.0.1',
         };
     }
@@ -119,9 +117,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
             // target must exist if we don't receive an outputConfig
             const projectTarget = project.targets[options.buildTarget];
             const nxJson = (0, devkit_1.readNxJson)(tree);
-            const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (projectTarget.executor
-                ? nxJson.targetDefaults?.[projectTarget.executor]
-                : undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
+            const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
             ({ main, outputPath } = mergedTarget.options);
         }
         packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
@@ -134,7 +130,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
             format: options.format ?? ['esm'],
             outputFileExtensionForCjs: '.cjs.js',
             outputFileExtensionForEsm: '.esm.js',
-            developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
+            developmentConditionName: (0, internal_2.getDefinedCustomConditionName)(tree),
         });
         // rollup has a specific declaration file generation not handled by the util above,
         // adjust accordingly
@@ -146,7 +142,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
 }
 function addBuildTarget(tree, options, isTsSolutionSetup) {
     (0, internal_1.addBuildTargetDefaults)(tree, '@nx/rollup:rollup', options.buildTarget, [
-        ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+        internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const prevBuildOptions = project.targets?.[options.buildTarget]?.options;
@@ -209,7 +205,7 @@ function updateTsConfig(tree, options) {
         throw new Error(`The '${tsconfigPath}' file doesn't exist. Provide the 'tsConfig' option with the correct path pointing to the tsconfig file to use for builds.`);
     }
     if (!ts) {
-        ts = (0, ensure_typescript_1.ensureTypescript)();
+        ts = (0, internal_2.ensureTypescript)();
     }
     const parsedTsConfig = (0, js_1.readTsConfig)(tsconfigPath, {
         ...ts.sys,

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAkGlE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA+GlE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -18,9 +18,13 @@ async function convertToInferred(tree, options) {
             return;
         // Since targetDefaults for '@nx/rollup:rollup' will no longer apply, we want to copy them to the target options.
         const nxJson = (0, devkit_1.readNxJson)(tree);
-        const defaults = nxJson.targetDefaults['@nx/rollup:rollup'];
+        const defaults = (0, internal_1.normalizeTargetDefaults)(nxJson?.targetDefaults).find((e) => e.executor === '@nx/rollup:rollup' &&
+            e.target === undefined &&
+            e.projects === undefined &&
+            e.plugin === undefined);
         if (defaults) {
-            for (const [key, value] of Object.entries(defaults)) {
+            const { target: _t, executor: _e, projects: _p, plugin: _pl, ...rest } = defaults;
+            for (const [key, value] of Object.entries(rest)) {
                 target[key] ??= value;
             }
         }

package/src/plugins/nx-copy-assets.plugin.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'rollup';
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 export interface NxCopyAssetsPluginOptions {
     assets: (string | AssetGlob)[];
     outputPath: string;

package/src/plugins/nx-copy-assets.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAG3D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAiBA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqD7E"}
+{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAiBA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqD7E"}

package/src/plugins/nx-copy-assets.plugin.js

@@ -4,7 +4,7 @@ exports.extractGlobLiteralPrefix = extractGlobLiteralPrefix;
 exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
-const copy_assets_handler_1 = require("@nx/js/src/utils/assets/copy-assets-handler");
+const internal_1 = require("@nx/js/internal");
 /**
  * Splits a glob into its literal directory prefix and the remaining pattern.
  * CopyAssetsHandler expects input to be a directory and glob to be a pattern
@@ -60,7 +60,7 @@ function nxCopyAssetsPlugin(options) {
             const outputDir = (0, node_path_1.isAbsolute)(options.outputPath)
                 ? options.outputPath
                 : (0, node_path_1.join)(devkit_1.workspaceRoot, options.outputPath);
-            handler = new copy_assets_handler_1.CopyAssetsHandler({
+            handler = new internal_1.CopyAssetsHandler({
                 rootDir: devkit_1.workspaceRoot,
                 projectDir: options.projectRoot,
                 outputDir,

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAKd,MAAM,YAAY,CAAC;AAUpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAmC1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAKd,MAAM,YAAY,CAAC;AASpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAmC1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -8,8 +8,7 @@ const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
+const internal_2 = require("@nx/js/internal");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -25,7 +24,7 @@ exports.createNodes = [
         const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rollup-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -96,7 +95,7 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
                 ? ['production', '^production']
                 : ['default', '^default']),
             { externalDependencies: ['rollup'] },
-            ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+            internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
         ],
         outputs,
         metadata: {
@@ -118,7 +117,7 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
             '@nx/js:typescript-sync',
         ];
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function getOutputs(rollupConfigs, projectRoot) {

package/src/plugins/with-nx/normalize-options.js

@@ -5,13 +5,13 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeOptions(projectRoot, sourceRoot, options) {
     if (global.NX_GRAPH_CREATION)
         return options;
     normalizeRelativePaths(projectRoot, options);
     // New TS Solution already has a typecheck target
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)()) {
+    if ((0, internal_1.isUsingTsSolutionSetup)()) {
         options.skipTypeCheck = true;
     }
     return {

package/src/plugins/with-nx/type-definitions.d.ts

@@ -0,0 +1,8 @@
+import type { OutputBundle } from 'rollup';
+export declare function typeDefinitions(options: {
+    projectRoot: string;
+}): {
+    name: string;
+    generateBundle(_opts: unknown, bundle: OutputBundle): Promise<void>;
+};
+//# sourceMappingURL=type-definitions.d.ts.map

package/src/plugins/with-nx/type-definitions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-definitions.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/type-definitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAe3C,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE;;0BAGhC,OAAO,UAAU,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;EA2C5E"}

package/src/plugins/with-nx/type-definitions.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typeDefinitions = typeDefinitions;
+const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
+/*
+ * This plugin takes all entry-points from the generated bundle and creates a
+ * bundled version of corresponding d.ts files.
+ *
+ * For example, `src/index.ts` generates two corresponding files:
+ * - `dist/xyz/index.js`
+ * - `dist/xyz/src/index.d.ts`
+ *
+ * We want a third file: `dist/index.d.ts` that re-exports from `src/index.d.ts`.
+ * That way, when TSC or IDEs look for types, it will find them in the right place.
+ */
+function typeDefinitions(options) {
+    return {
+        name: 'dts-bundle',
+        async generateBundle(_opts, bundle) {
+            for (const [name, file] of Object.entries(bundle)) {
+                if (file.type === 'asset' ||
+                    !file.isEntry ||
+                    file.facadeModuleId == null) {
+                    continue;
+                }
+                const hasDefaultExport = file.exports.includes('default');
+                const entrySourceFileName = (0, path_1.relative)(options.projectRoot, file.facadeModuleId);
+                const entrySourceDtsName = entrySourceFileName.replace(/\.[cm]?[jt]sx?$/, '');
+                // Replace various JavaScript file extensions (e.g., .js, .cjs, .mjs, .cjs.js, .mjs.js) with .d.ts for generating type definition file names.
+                // This regex matches the pattern used in packages/rollup/src/plugins/package-json/update-package-json.ts
+                const dtsFileName = file.fileName.replace(/(\.cjs|\.mjs|\.esm\.js|\.cjs\.js|\.mjs\.js|\.js)$/, '.d.ts');
+                const relativeSourceDtsName = JSON.stringify('./' + entrySourceDtsName);
+                const dtsFileSource = hasDefaultExport
+                    ? (0, devkit_1.stripIndents) `
+              export * from ${relativeSourceDtsName};
+              export { default } from ${relativeSourceDtsName};
+            `
+                    : `export * from ${relativeSourceDtsName};\n`;
+                this.emitFile({
+                    type: 'asset',
+                    fileName: dtsFileName,
+                    source: dtsFileSource,
+                });
+            }
+        },
+    };
+}

package/src/plugins/with-nx/with-nx.d.ts

@@ -1,4 +1,4 @@
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/js/internal';
 import * as rollup from 'rollup';
 import { RollupWithNxPluginOptions } from './with-nx-options';
 export declare function withNx(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[]): rollup.RollupOptions;

package/src/plugins/with-nx/with-nx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx.ts"],"names":[],"mappings":"AAUA,OAAO,EAIL,6BAA6B,EAC9B,MAAM,uCAAuC,CAAC;AAY/C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AA4B9D,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CAuQtB"}
+{"version":3,"file":"with-nx.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,6BAA6B,EAG9B,MAAM,iBAAiB,CAAC;AASzB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AA4B9D,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CAuQtB"}

package/src/plugins/with-nx/with-nx.js

@@ -4,10 +4,9 @@ exports.withNx = withNx;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
+const internal_1 = require("@nx/js/internal");
+const type_definitions_1 = require("./type-definitions");
+const js_1 = require("@nx/js");
 const plugin_babel_1 = require("@rollup/plugin-babel");
 const plugin_node_resolve_1 = tslib_1.__importDefault(require("@rollup/plugin-node-resolve"));
 const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
@@ -52,16 +51,16 @@ dependencies) {
         : (0, devkit_1.readCachedProjectGraph)();
     // If dependencies are not passed from executor, calculate them from project graph.
     if (!dependencies && !global.NX_GRAPH_CREATION) {
-        const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, projectNode.name, process.env.NX_TASK_TARGET_TARGET, process.env.NX_TASK_TARGET_CONFIGURATION, true);
+        const result = (0, internal_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, projectNode.name, process.env.NX_TASK_TARGET_TARGET, process.env.NX_TASK_TARGET_CONFIGURATION, true);
         dependencies = result.dependencies;
     }
-    const projectSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+    const projectSourceRoot = (0, internal_1.getProjectSourceRoot)(projectNode.data);
     const options = (0, normalize_options_1.normalizeOptions)(projectNode.data.root, projectSourceRoot, rawOptions);
     const useBabel = options.compiler === 'babel';
     const useSwc = options.compiler === 'swc';
     const tsConfigPath = options.buildLibsFromSource || global.NX_GRAPH_CREATION
         ? (0, node_path_1.join)(devkit_1.workspaceRoot, options.tsConfig)
-        : (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, devkit_1.workspaceRoot, projectNode.data.root, dependencies);
+        : (0, internal_1.createTmpTsConfig)(options.tsConfig, devkit_1.workspaceRoot, projectNode.data.root, dependencies);
     ensureTypeScript();
     const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
     const tsConfig = ts.parseJsonConfigFileContent(tsConfigFile.config, ts.sys, (0, node_path_1.dirname)(tsConfigPath));
@@ -141,7 +140,7 @@ dependencies) {
     if (!global.NX_GRAPH_CREATION) {
         // Ensure TypeScript is available before any plugin initialization
         ensureTypeScript();
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)();
         if (isTsSolutionSetup) {
             if (options.generatePackageJson) {
                 throw new Error(`Setting 'generatePackageJson: true' is not supported with the current TypeScript setup. Update the 'package.json' file at the project root as needed and unset the 'generatePackageJson' option. See https://nx.dev/docs/technologies/node/guides/deploying-node-projects for the recommended pruned package.json workflow.`);
@@ -252,10 +251,10 @@ function createInput(options) {
     return input;
 }
 function createTsCompilerOptions(projectRoot, config, tsConfigPath, options, dependencies) {
-    const compilerOptionPaths = (0, buildable_libs_utils_1.computeCompilerOptionsPaths)(config, dependencies ?? []);
+    const compilerOptionPaths = (0, internal_1.computeCompilerOptionsPaths)(config, dependencies ?? []);
     // Resolve paths to absolute so they work without baseUrl and regardless
     // of which tsconfig the plugin reads (project vs workspace root).
-    const pathsBase = (0, ts_config_1.resolvePathsBaseUrl)(tsConfigPath);
+    const pathsBase = (0, js_1.resolvePathsBaseUrl)(tsConfigPath);
     for (const key of Object.keys(compilerOptionPaths)) {
         compilerOptionPaths[key] = compilerOptionPaths[key].map((p) => {
             if ((0, path_1.isAbsolute)(p)) {

package/src/utils/ensure-dependencies.js

@@ -2,22 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("./versions");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("./versions");
 function ensureDependencies(tree, options) {
     switch (options.compiler) {
         case 'swc':
             return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@swc/helpers': versions_1.swcHelpersVersion,
-                '@swc/core': versions_1.swcCoreVersion,
-                'swc-loader': versions_2.swcLoaderVersion,
+                '@swc/helpers': internal_1.swcHelpersVersion,
+                '@swc/core': internal_1.swcCoreVersion,
+                'swc-loader': versions_1.swcLoaderVersion,
             });
         case 'babel':
             return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'core-js': versions_2.coreJsVersion, // needed for preset-env to work
-                tslib: versions_2.tsLibVersion,
+                'core-js': versions_1.coreJsVersion, // needed for preset-env to work
+                tslib: versions_1.tsLibVersion,
             });
         default:
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_2.tsLibVersion });
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_1.tsLibVersion });
     }
 }