@nx/remix 22.0.0-beta.5 → 22.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "22.0.0-beta.5",
+  "version": "22.0.0-beta.7",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -29,15 +29,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.0.0-beta.5",
-    "@nx/js": "22.0.0-beta.5",
-    "@nx/react": "22.0.0-beta.5",
-    "@nx/workspace": "22.0.0-beta.5",
+    "@nx/devkit": "22.0.0-beta.7",
+    "@nx/js": "22.0.0-beta.7",
+    "@nx/react": "22.0.0-beta.7",
+    "@nx/workspace": "22.0.0-beta.7",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.5"
+    "nx": "22.0.0-beta.7"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.14.0"

package/src/generators/application/application.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA6BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA8SjC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA6BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA2SjC;AAED,eAAe,yBAAyB,CAAC"}

package/src/generators/application/application.impl.js

@@ -98,7 +98,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {
-            const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
             const vitestTask = await vitestGenerator(tree, {
                 uiFramework: 'react',
                 project: options.projectName,
@@ -120,7 +120,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
             tasks.push(vitestTask);
         }
         else {
-            const { configurationGenerator: jestConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const { configurationGenerator: jestConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
             const jestTask = await jestConfigurationGenerator(tree, {
                 project: options.projectName,
                 setupFile: 'none',
@@ -145,7 +145,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         tree.delete((0, devkit_1.joinPathFragments)(options.projectRoot, `tests/routes/_index.spec.tsx`));
     }
     if (options.linter !== 'none') {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', (0, versions_1.getPackageVersion)(tree, 'nx'));
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
         const { addIgnoresToLintConfig } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
         const eslintTask = await lintProjectGenerator(tree, {
             linter: options.linter,

package/src/generators/application/lib/add-e2e.js

@@ -10,7 +10,7 @@ async function addE2E(tree, options) {
         : p.plugin === '@nx/remix/plugin');
     let e2eWebsServerInfo = await getRemixE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'), options.addPlugin ?? Boolean(hasRemixPlugin));
     if (options.e2eTestRunner === 'cypress') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',
@@ -51,7 +51,7 @@ async function addE2E(tree, options) {
         return e2eTask;
     }
     else if (options.e2eTestRunner === 'playwright') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (0, versions_1.getPackageVersion)(tree, 'nx'));
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',

package/src/generators/application/lib/ignore-vite-temp-files.js

@@ -26,7 +26,7 @@ async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
     if (!isEslintInstalled(tree)) {
         return;
     }
-    (0, devkit_1.ensurePackage)('@nx/eslint', (0, versions_1.getPackageVersion)(tree, 'nx'));
+    (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
     const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
     if (!isEslintConfigSupported(tree)) {
         return;

package/src/generators/library/library.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/library/library.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAe,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AAS9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQvD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAoE/B;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"library.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/library/library.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAe,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AAS9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AASvD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAsE/B;AAED,eAAe,qBAAqB,CAAC"}

package/src/generators/library/library.impl.js

@@ -8,6 +8,7 @@ const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const update_dependencies_1 = require("../utils/update-dependencies");
 async function remixLibraryGenerator(tree, schema) {
     return remixLibraryGeneratorInternal(tree, {
         addPlugin: false,
@@ -18,6 +19,8 @@ async function remixLibraryGenerator(tree, schema) {
 async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
+    const installTask = (0, update_dependencies_1.updateDependencies)(tree);
+    tasks.push(installTask);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         js: schema.js,
         addTsPlugin,

package/src/utils/versions.d.ts

@@ -17,5 +17,4 @@ export declare const testingLibraryDomVersion = "^10.4.0";
 export declare const testingLibraryUserEventsVersion = "^14.5.2";
 export declare const viteVersion = "^5.0.0";
 export declare function getRemixVersion(tree: Tree): string;
-export declare function getPackageVersion(tree: Tree, packageName: string): any;
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAE,MAAM,YAAY,CAAC;AAE5C,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AACrC,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD,eAAO,MAAM,4BAA4B,UAAU,CAAC;AACpD,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,+BAA+B,YAAY,CAAC;AACzD,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,OAOhE"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvE,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AACrC,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD,eAAO,MAAM,4BAA4B,UAAU,CAAC;AACpD,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,+BAA+B,YAAY,CAAC;AACzD,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAIlD"}

package/src/utils/versions.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryDomVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
 exports.getRemixVersion = getRemixVersion;
-exports.getPackageVersion = getPackageVersion;
 const devkit_1 = require("@nx/devkit");
 exports.nxVersion = require('../../package.json').version;
 exports.remixVersion = '^2.15.0';
@@ -23,11 +22,5 @@ exports.testingLibraryDomVersion = '^10.4.0';
 exports.testingLibraryUserEventsVersion = '^14.5.2';
 exports.viteVersion = '^5.0.0';
 function getRemixVersion(tree) {
-    return getPackageVersion(tree, '@remix-run/dev') ?? exports.remixVersion;
-}
-function getPackageVersion(tree, packageName) {
-    const packageJsonContents = (0, devkit_1.readJson)(tree, 'package.json');
-    return (packageJsonContents?.['devDependencies']?.[packageName] ??
-        packageJsonContents?.['dependencies']?.[packageName] ??
-        null);
+    return ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@remix-run/dev') ?? exports.remixVersion);
 }