@nx/rollup 23.2.0-beta.4 → 23.2.0-beta.5

package/dist/src/generators/configuration/configuration.js

@@ -6,7 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 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");
 const has_plugin_1 = require("../../utils/has-plugin");
 const deprecation_1 = require("../../utils/deprecation");
@@ -119,7 +118,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, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
+            const mergedTarget = (0, internal_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
             ({ main, outputPath } = mergedTarget.options);
         }
         packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {

package/dist/src/plugins/package-json/generate-package-json.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'rollup';
-import type { PackageJson } from 'nx/src/utils/package-json';
+import { type PackageJson } from '@nx/devkit/internal';
 export interface GeneratePackageJsonOptions {
     outputPath: string;
     main: string;

package/dist/src/plugins/package-json/update-package-json.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'nx/src/utils/package-json';
+import { PackageJson } from '@nx/devkit/internal';
 export declare function updatePackageJson(options: {
     outputPath: string;
     main: string;

package/dist/src/plugins/package-json/update-package-json.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePackageJson = updatePackageJson;
 const path_1 = require("path");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
+const devkit_2 = require("@nx/devkit");
 function updatePackageJson(options, packageJson) {
     const jsFileRegex = /(\.cjs|\.mjs|\.esm\.js|\.cjs\.js|\.mjs\.js|\.js)$/;
     const hasEsmFormat = options.format.includes('esm');
@@ -63,10 +63,10 @@ function updatePackageJson(options, packageJson) {
                     // Make sure both ESM and CJS point to same instance of the package because libs like React, RxJS, etc. requires it.
                     // Also need a special .cjs.default.js file that re-exports the `default` from CJS, or else
                     // default import in Node will not work.
-                    (0, fs_1.writeFileSync)((0, path_1.join)(devkit_1.workspaceRoot, options.outputPath, filePath.replace(/\.cjs\.js$/, '.cjs.default.js')), `exports._default = require('./${(0, path_1.parse)(filePath).base}').default;`);
-                    (0, fs_1.writeFileSync)((0, path_1.join)(devkit_1.workspaceRoot, options.outputPath, fauxEsmFilePath), 
+                    (0, fs_1.writeFileSync)((0, path_1.join)(devkit_2.workspaceRoot, options.outputPath, filePath.replace(/\.cjs\.js$/, '.cjs.default.js')), `exports._default = require('./${(0, path_1.parse)(filePath).base}').default;`);
+                    (0, fs_1.writeFileSync)((0, path_1.join)(devkit_2.workspaceRoot, options.outputPath, fauxEsmFilePath), 
                     // Re-export from relative CJS file, and Node will synthetically export it as ESM.
-                    (0, devkit_1.stripIndents) `
+                    (0, devkit_2.stripIndents) `
             export * from './${relativeFile}';
             export { _default as default } from './${relativeFile.replace(/\.cjs\.js$/, '.cjs.default.js')}';
             `);
@@ -83,7 +83,7 @@ function updatePackageJson(options, packageJson) {
     else {
         packageJson.types ??= packageJson.main.replace(jsFileRegex, '.d.ts');
     }
-    (0, fileutils_1.writeJsonFile)((0, path_1.join)(devkit_1.workspaceRoot, options.outputPath, 'package.json'), packageJson);
+    (0, devkit_1.writeJsonFile)((0, path_1.join)(devkit_2.workspaceRoot, options.outputPath, 'package.json'), packageJson);
 }
 function getExports(options) {
     const exports = {};

package/dist/src/plugins/plugin.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
 const internal_1 = require("@nx/devkit/internal");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
 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 internal_2 = require("@nx/js/internal");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
@@ -21,8 +19,8 @@ exports.createNodes = [
     rollupConfigGlob,
     async (configFilePaths, options, context) => {
         const normalizedOptions = normalizeOptions(options);
-        const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rollup-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(normalizedOptions);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `rollup-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.5",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -91,8 +91,8 @@
     "postcss": "^8.4.38",
     "postcss-modules": "^6.0.1",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.4",
-    "@nx/js": "23.2.0-beta.4"
+    "@nx/devkit": "23.2.0-beta.5",
+    "@nx/js": "23.2.0-beta.5"
   },
   "peerDependencies": {
     "rollup": "^3.0.0 || ^4.0.0"
@@ -104,7 +104,7 @@
   },
   "devDependencies": {
     "source-map-js": "^1.2.0",
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.5"
   },
   "publishConfig": {
     "access": "public"