@nx/remix 22.4.0-beta.2 → 22.4.0-beta.4

package/generators.json

@@ -69,7 +69,8 @@
     "setup-tailwind": {
       "implementation": "./src/generators/setup-tailwind/setup-tailwind.impl",
       "schema": "./src/generators/setup-tailwind/schema.json",
-      "description": "Generates a TailwindCSS configuration for the Remix application"
+      "description": "Generates a TailwindCSS configuration for the Remix application",
+      "x-deprecated": "Generating Tailwind configuration is no longer maintained. This generator will be removed in Nx 23."
     },
     "storybook-configuration": {
       "implementation": "./src/generators/storybook-configuration/storybook-configuration.impl#remixStorybookConfiguration",

package/migrations.json

@@ -70,8 +70,8 @@
         }
       }
     },
-    "22.4.0": {
-      "version": "22.4.0-beta.2",
+    "22.3.4": {
+      "version": "22.3.4-beta.0",
       "packages": {
         "@remix-run/node": {
           "version": "2.17.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "22.4.0-beta.2",
+  "version": "22.4.0-beta.4",
   "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,16 +29,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.0-beta.2",
-    "@nx/js": "22.4.0-beta.2",
-    "@nx/react": "22.4.0-beta.2",
-    "@nx/workspace": "22.4.0-beta.2",
+    "@nx/devkit": "22.4.0-beta.4",
+    "@nx/js": "22.4.0-beta.4",
+    "@nx/react": "22.4.0-beta.4",
+    "@nx/workspace": "22.4.0-beta.4",
     "tslib": "^2.3.0",
-    "@phenomnomnominal/tsquery": "~5.0.1"
+    "@phenomnomnominal/tsquery": "~6.1.4"
   },
   "devDependencies": {
-    "nx": "22.4.0-beta.2",
-    "@nx/vitest": "22.4.0-beta.2"
+    "nx": "22.4.0-beta.4",
+    "@nx/vitest": "22.4.0-beta.4"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.17.3"

package/src/generators/application/__snapshots__/application.impl.spec.ts.snap

@@ -135,7 +135,6 @@ export default function Index() {
 exports[`Remix Application Integrated Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 import { defineConfig } from 'cypress';
-
 export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
@@ -388,7 +387,6 @@ export default function Index() {
 exports[`Remix Application Standalone Project Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 import { defineConfig } from 'cypress';
-
 export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,YAAY,CAAC;AAG1D,eAAO,MAAM,uBAAuB;;;;;;;CAOnC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,UAMzD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqB,MAAM,YAAY,CAAC;AAE1D,eAAO,MAAM,uBAAuB;;;;;;;CAOnC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,UAMzD"}

package/src/generators/setup-tailwind/setup-tailwind.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-tailwind.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/setup-tailwind/setup-tailwind.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAGpD,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,uBAiC7B"}
+{"version":3,"file":"setup-tailwind.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/setup-tailwind/setup-tailwind.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAGpD,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,uBAqC7B"}

package/src/generators/setup-tailwind/setup-tailwind.impl.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const insert_statement_after_imports_1 = require("../../utils/insert-statement-after-imports");
 async function setupTailwind(tree, options) {
+    devkit_1.logger.warn(`The 'setup-tailwind' generator is deprecated. Generating Tailwind configuration is no longer maintained. This generator will be removed in Nx 23.`);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), project.root, {
         tpl: '',

package/src/utils/testing-config-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing-config-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/testing-config-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKrD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,MAAM,QA6CxB;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,QA0CxB;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,QAsBvB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,MAAM,QAsBvB"}
+{"version":3,"file":"testing-config-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/testing-config-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKrD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,MAAM,QAuCxB;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,QAsCxB;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,QAsBvB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,MAAM,QAsBvB"}

package/src/utils/testing-config-utils.js

@@ -11,25 +11,19 @@ function updateVitestTestSetup(tree, pathToVitestConfig, pathToTestSetup) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToVitestConfig, 'utf-8');
-    const ast = tsquery.ast(fileContents);
+    const sourceFile = ast(fileContents);
     const TEST_SETUPFILES_SELECTOR = 'PropertyAssignment:has(Identifier[name=test]) PropertyAssignment:has(Identifier[name=setupFiles])';
-    const nodes = tsquery(ast, TEST_SETUPFILES_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const nodes = query(sourceFile, TEST_SETUPFILES_SELECTOR);
     let updatedFileContents = fileContents;
     if (nodes.length === 0) {
         const TEST_CONFIG_SELECTOR = 'PropertyAssignment:has(Identifier[name=test]) > ObjectLiteralExpression';
-        const testConfigNodes = tsquery(ast, TEST_CONFIG_SELECTOR, {
-            visitAllChildren: true,
-        });
+        const testConfigNodes = query(sourceFile, TEST_CONFIG_SELECTOR);
         updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, testConfigNodes[0].getStart() + 1)}setupFiles: ['${pathToTestSetup}'],${fileContents.slice(testConfigNodes[0].getStart() + 1)}`;
     }
     else {
-        const arrayNodes = tsquery(nodes[0], 'ArrayLiteralExpression', {
-            visitAllChildren: true,
-        });
+        const arrayNodes = query(nodes[0], 'ArrayLiteralExpression');
         if (arrayNodes.length !== 0) {
             updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, arrayNodes[0].getStart() + 1)}'${pathToTestSetup}',${fileContents.slice(arrayNodes[0].getStart() + 1)}`;
         }
@@ -40,23 +34,19 @@ function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToJestConfig, 'utf-8');
-    const ast = tsquery.ast(fileContents);
+    const sourceFile = ast(fileContents);
     const TEST_SETUPFILES_SELECTOR = 'PropertyAssignment:has(Identifier[name=setupFilesAfterEnv])';
-    const nodes = tsquery(ast, TEST_SETUPFILES_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const nodes = query(sourceFile, TEST_SETUPFILES_SELECTOR);
     if (nodes.length === 0) {
         const CONFIG_SELECTOR = 'ObjectLiteralExpression';
-        const nodes = tsquery(ast, CONFIG_SELECTOR, { visitAllChildren: true });
+        const nodes = query(sourceFile, CONFIG_SELECTOR);
         const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, nodes[0].getStart() + 1)}setupFilesAfterEnv: ['${pathToTestSetup}'],${fileContents.slice(nodes[0].getStart() + 1)}`;
         tree.write(pathToJestConfig, updatedFileContents);
     }
     else {
-        const arrayNodes = tsquery(nodes[0], 'ArrayLiteralExpression', {
-            visitAllChildren: true,
-        });
+        const arrayNodes = query(nodes[0], 'ArrayLiteralExpression');
         if (arrayNodes.length !== 0) {
             const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, arrayNodes[0].getStart() + 1)}'${pathToTestSetup}',${fileContents.slice(arrayNodes[0].getStart() + 1)}`;
             tree.write(pathToJestConfig, updatedFileContents);
@@ -67,11 +57,11 @@ function updateJestTestMatch(tree, pathToJestConfig, includesString) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToJestConfig, 'utf-8');
-    const ast = tsquery.ast(fileContents);
+    const sourceFile = ast(fileContents);
     const TEST_MATCH_SELECTOR = 'PropertyAssignment:has(Identifier[name=testMatch])';
-    const nodes = tsquery(ast, TEST_MATCH_SELECTOR, { visitAllChildren: true });
+    const nodes = query(sourceFile, TEST_MATCH_SELECTOR);
     if (nodes.length !== 0) {
         const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, nodes[0].getStart())}testMatch: ["${includesString}"]${fileContents.slice(nodes[0].getEnd())}`;
         tree.write(pathToJestConfig, updatedFileContents);
@@ -81,11 +71,11 @@ function updateVitestTestIncludes(tree, pathToVitestConfig, includesString) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToVitestConfig, 'utf-8');
-    const ast = tsquery.ast(fileContents);
+    const sourceFile = ast(fileContents);
     const TEST_INCLUDE_SELECTOR = 'PropertyAssignment:has(Identifier[name=test]) PropertyAssignment:has(Identifier[name=include])';
-    const nodes = tsquery(ast, TEST_INCLUDE_SELECTOR, { visitAllChildren: true });
+    const nodes = query(sourceFile, TEST_INCLUDE_SELECTOR);
     if (nodes.length !== 0) {
         const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, nodes[0].getStart())}include: ["${includesString}"]${fileContents.slice(nodes[0].getEnd())}`;
         tree.write(pathToVitestConfig, updatedFileContents);