@nx/remix 16.4.0 → 16.7.0-beta.1

package/executors.json

@@ -0,0 +1,26 @@
+{
+  "executors": {
+    "serve": {
+      "implementation": "./src/executors/serve/serve.impl",
+      "schema": "./src/executors/serve/schema.json",
+      "description": "Serve a Remix application."
+    },
+    "build": {
+      "implementation": "./src/executors/build/build.impl",
+      "schema": "./src/executors/build/schema.json",
+      "description": "Build a Remix application."
+    }
+  },
+  "builders": {
+    "serve": {
+      "implementation": "./src/executors/serve/compat",
+      "schema": "./src/executors/serve/schema.json",
+      "description": "Serve a Remix application."
+    },
+    "build": {
+      "implementation": "./src/executors/build/build.impl",
+      "schema": "./src/executors/build/schema.json",
+      "description": "Build a Remix application."
+    }
+  }
+}

package/package.json

@@ -1,20 +1,22 @@
 {
   "name": "@nx/remix",
-  "version": "16.4.0",
-  "main": "src/index.js",
+  "version": "16.7.0-beta.1",
+  "main": "./src/index.js",
   "generators": "./generators.json",
+  "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "^16.0.3",
-    "@nx/js": "^16.0.3",
-    "@nx/react": "^16.0.3",
+    "@nx/devkit": "^16.7.0-rc.1",
+    "@nx/js": "^16.7.0-rc.1",
+    "@nx/react": "^16.7.0-rc.1",
+    "@nx/web": "16.7.1",
     "@phenomnomnominal/tsquery": "^5.0.1",
     "tslib": "^2.3.1",
     "vite": "4.3.9",
-    "@nrwl/remix": "16.4.0"
+    "@nrwl/remix": "16.7.0-beta.1"
   },
   "ng-update": {
     "requirements": {},
     "migrations": "./migrations.json"
   },
-  "types": "./src/index.d.ts"
+  "type": "commonjs"
 }

package/src/executors/build/build.impl.d.ts

@@ -0,0 +1,5 @@
+import { type ExecutorContext } from '@nx/devkit';
+import { type RemixBuildSchema } from './schema';
+export default function buildExecutor(options: RemixBuildSchema, context: ExecutorContext): Promise<{
+    success: boolean;
+}>;

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
+const dev_1 = require("@remix-run/dev");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+function buildExecutor(options, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
+        try {
+            yield dev_1.cli.run(['build', projectRoot]);
+        }
+        catch (error) {
+            devkit_1.logger.error(`Error occurred while trying to build application.`);
+            devkit_1.logger.error(error.toString());
+            return { success: false };
+        }
+        if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
+            (0, fs_extra_1.mkdir)(options.outputPath);
+        }
+        const builtPackageJson = (0, js_1.createPackageJson)(context.projectName, context.projectGraph, {
+            target: context.targetName,
+            root: context.root,
+            isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.
+        });
+        // Update `package.json` to reflect how users should run the build artifacts
+        builtPackageJson.scripts = {
+            start: 'remix-serve build',
+        };
+        updatePackageJson(builtPackageJson, context);
+        (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
+        if (options.generateLockfile) {
+            const lockFile = (0, js_1.createLockFile)(builtPackageJson);
+            (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)()}`, lockFile, {
+                encoding: 'utf-8',
+            });
+        }
+        // If output path is different from source path, then copy over the config and public files.
+        // This is the default behavior when running `nx build <app>`.
+        if (options.outputPath.replace(/\/$/, '') !== projectRoot) {
+            (0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
+                dereference: true,
+            });
+            (0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'build'), (0, path_1.join)(options.outputPath, 'build'), {
+                dereference: true,
+            });
+        }
+        return { success: true };
+    });
+}
+exports.default = buildExecutor;
+function updatePackageJson(packageJson, context) {
+    var _a, _b;
+    var _c;
+    if (!packageJson.scripts) {
+        packageJson.scripts = {};
+    }
+    if (!packageJson.scripts.start) {
+        packageJson.scripts.start = 'remix-serve build';
+    }
+    (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
+    // These are always required for a production Remix app to run.
+    const requiredPackages = [
+        'react',
+        'react-dom',
+        'isbot',
+        'typescript',
+        '@remix-run/css-bundle',
+        '@remix-run/node',
+        '@remix-run/react',
+        '@remix-run/serve',
+        '@remix-run/dev',
+    ];
+    for (const pkg of requiredPackages) {
+        const externalNode = context.projectGraph.externalNodes[`npm:${pkg}`];
+        if (externalNode) {
+            (_b = (_c = packageJson.dependencies)[pkg]) !== null && _b !== void 0 ? _b : (_c[pkg] = externalNode.data.version);
+        }
+    }
+}
+//# sourceMappingURL=build.impl.js.map

package/src/executors/build/build.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/executors/build/build.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/build/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/build/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const build_impl_1 = require("./build.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(build_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/build/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/executors/build/compat.ts"],"names":[],"mappings":";;AAAA,uCAA+C;AAE/C,6CAAyC;AAEzC,kBAAe,IAAA,0BAAiB,EAAC,oBAAa,CAAC,CAAC"}

package/src/executors/build/schema.d.ts

@@ -0,0 +1,5 @@
+export interface RemixBuildSchema {
+  outputPath: string;
+  includeDevDependenciesInPackageJson: boolean;
+  generateLockfile: boolean;
+}

package/src/executors/build/schema.json

@@ -0,0 +1,31 @@
+{
+  "version": 2,
+  "outputCapture": "pipe",
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "title": "Remix Build",
+  "description": "Build a Remix app.",
+  "type": "object",
+  "properties": {
+    "outputPath": {
+      "type": "string",
+      "description": "The output path of the generated files.",
+      "x-completion-type": "directory",
+      "x-priority": "important"
+    },
+    "includeDevDependenciesInPackageJson": {
+      "type": "boolean",
+      "description": "Include `devDependencies` in the generated package.json file. By default only production `dependencies` are included.",
+      "default": false
+    },
+    "generateLockfile": {
+      "type": "boolean",
+      "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "required": [
+    "outputPath"
+  ]
+}

package/src/executors/serve/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/serve/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const serve_impl_1 = require("./serve.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(serve_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/serve/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/executors/serve/compat.ts"],"names":[],"mappings":";;AAAA,uCAA+C;AAE/C,6CAAyC;AAEzC,kBAAe,IAAA,0BAAiB,EAAC,oBAAa,CAAC,CAAC"}

package/src/executors/serve/schema.d.ts

@@ -0,0 +1,9 @@
+export interface RemixServeSchema {
+  port: number;
+  devServerPort?: number;
+  debug?: boolean;
+  command?: string;
+  manual?: boolean;
+  tlsKey?: string;
+  tlsCert?: string;
+}

package/src/executors/serve/schema.json

@@ -0,0 +1,41 @@
+{
+  "version": 2,
+  "outputCapture": "pipe",
+  "cli": "nx",
+  "title": "Remix Serve",
+  "description": "Serve a Remix app.",
+  "type": "object",
+  "properties": {
+    "port": {
+      "type": "number",
+      "description": "Set PORT environment variable that can be used to serve the Remix application.",
+      "default": 4200
+    },
+    "devServerPort": {
+      "type": "number",
+      "description": "Port to start the dev server on."
+    },
+    "debug": {
+      "type": "boolean",
+      "description": "Attach a Node.js inspector.",
+      "default": false
+    },
+    "command": {
+      "type": "string",
+      "description": "Command used to run your app server."
+    },
+    "manual": {
+      "type": "boolean",
+      "description": "Enable manual mode",
+      "default": false
+    },
+    "tlsKey": {
+      "type": "string",
+      "description": "Path to TLS key (key.pem)."
+    },
+    "tlsCert": {
+      "type": "string",
+      "description": "Path to TLS certificate (cert.pem)."
+    }
+  }
+}

package/src/executors/serve/serve.impl.d.ts

@@ -0,0 +1,6 @@
+import { type ExecutorContext } from '@nx/devkit';
+import { type RemixServeSchema } from './schema';
+export default function serveExecutor(schema: RemixServeSchema, context: ExecutorContext): AsyncGenerator<{
+    success: boolean;
+    baseUrl: string;
+}, void, undefined>;

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
+function normalizeOptions(schema) {
+    var _a, _b, _c;
+    return Object.assign(Object.assign({}, schema), { port: (_a = schema.port) !== null && _a !== void 0 ? _a : 4200, debug: (_b = schema.debug) !== null && _b !== void 0 ? _b : false, manual: (_c = schema.manual) !== null && _c !== void 0 ? _c : false });
+}
+function buildRemixDevArgs(options) {
+    const args = [];
+    if (options.command) {
+        args.push(`--command=${options.command}`);
+    }
+    if (options.devServerPort) {
+        args.push(`--port=${options.devServerPort}`);
+    }
+    if (options.debug) {
+        args.push(`--debug`);
+    }
+    if (options.manual) {
+        args.push(`--manual`);
+    }
+    if (options.tlsKey) {
+        args.push(`--tls-key=${options.tlsKey}`);
+    }
+    if (options.tlsCert) {
+        args.push(`--tls-cert=${options.tlsCert}`);
+    }
+    return args;
+}
+function serveExecutor(schema, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
+        const options = normalizeOptions(schema);
+        const projectRoot = context.workspace.projects[context.projectName].root;
+        const remixBin = require.resolve('@remix-run/dev/dist/cli');
+        const args = buildRemixDevArgs(options);
+        // Cast to any to overwrite NODE_ENV
+        process.env.NODE_ENV = process.env.NODE_ENV
+            ? process.env.NODE_ENV
+            : 'development';
+        process.env.PORT = `${options.port}`;
+        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const server = (0, node_child_process_1.fork)(remixBin, ['dev', ...args], {
+                cwd: (0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot),
+                stdio: 'inherit',
+            });
+            server.once('exit', (code) => {
+                if (code === 0) {
+                    done();
+                }
+                else {
+                    error(new Error(`Remix app exited with code ${code}`));
+                }
+            });
+            const killServer = () => {
+                if (server.connected) {
+                    server.kill('SIGTERM');
+                }
+            };
+            process.on('exit', () => killServer());
+            process.on('SIGINT', () => killServer());
+            process.on('SIGTERM', () => killServer());
+            process.on('SIGHUP', () => killServer());
+            yield (0, wait_for_port_open_1.waitForPortOpen)(options.port);
+            next({
+                success: true,
+                baseUrl: `http://localhost:${options.port}`,
+            });
+        })))));
+    });
+}
+exports.default = serveExecutor;
+//# sourceMappingURL=serve.impl.js.map

package/src/executors/serve/serve.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/executors/serve/serve.impl.ts"],"names":[],"mappings":"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"}

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

@@ -305,27 +305,18 @@ module.exports = {
 
 exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using vitest 2`] = `
 "/// <reference types=\\"vitest\\" />
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import react from '@vitejs/plugin-react';
 import { defineConfig } from 'vite';
-import viteTsConfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/test',
 
-  plugins: [
-    react(),
-    viteTsConfigPaths({
-      root: '../../',
-    }),
-  ],
+  plugins: [react(), nxViteTsPaths()],
 
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [
-  //    viteTsConfigPaths({
-  //      root: '../../',
-  //    }),
-  //  ],
+  //  plugins: [ nxViteTsPaths() ],
   // },
 
   test: {
@@ -563,27 +554,18 @@ module.exports = {
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 2`] = `
 "/// <reference types=\\"vitest\\" />
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import react from '@vitejs/plugin-react';
 import { defineConfig } from 'vite';
-import viteTsConfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
   cacheDir: './node_modules/.vite/test',
 
-  plugins: [
-    react(),
-    viteTsConfigPaths({
-      root: './',
-    }),
-  ],
+  plugins: [react(), nxViteTsPaths()],
 
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [
-  //    viteTsConfigPaths({
-  //      root: './',
-  //    }),
-  //  ],
+  //  plugins: [ nxViteTsPaths() ],
   // },
 
   test: {

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

@@ -17,15 +17,16 @@ function default_1(tree, _options) {
             tags: options.parsedTags,
             targets: {
                 build: {
-                    command: `remix build`,
+                    executor: '@nx/remix:build',
+                    outputs: ['{options.outputPath}'],
                     options: {
-                        cwd: options.projectRoot,
+                        outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
                     },
                 },
                 serve: {
-                    command: `remix dev`,
+                    executor: `@nx/remix:serve`,
                     options: {
-                        cwd: options.projectRoot,
+                        port: 4200,
                     },
                 },
                 start: {

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

@@ -1 +1 @@
-{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/cypress/cypress.impl.d.ts

@@ -1,2 +1,3 @@
-import { Tree } from '@nx/devkit';
-export default function (tree: Tree, options: any): Promise<() => Promise<void>>;
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { CypressGeneratorSchema } from './schema';
+export default function (tree: Tree, options: CypressGeneratorSchema): Promise<GeneratorCallback>;

package/src/generators/cypress/cypress.impl.js

@@ -4,20 +4,22 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const package_json_1 = require("nx/package.json");
 function default_1(tree, options) {
+    var _a, _b, _c, _d;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (_a = options.baseUrl) !== null && _a !== void 0 ? _a : (options.baseUrl = 'http://localhost:3000');
         const { cypressInitGenerator, cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', package_json_1.version);
         const initSideEffects = yield cypressInitGenerator(tree, {});
         const projSideEffects = yield cypressProjectGenerator(tree, Object.assign(Object.assign({}, options), { standaloneConfig: true }));
-        const config = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        tree.delete((0, devkit_1.joinPathFragments)(config.sourceRoot, 'support', 'app.po.ts'));
-        tree.write((0, devkit_1.joinPathFragments)(config.sourceRoot, 'e2e', 'app.cy.ts'), `describe('webapp', () => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+        tree.delete((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'app.po.ts'));
+        tree.write((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'e2e', 'app.cy.ts'), `describe('webapp', () => {
   beforeEach(() => cy.visit('/'));
 
   it('should display welcome message', () => {
     cy.get('h1').contains('Welcome to Remix');
   });
 });`);
-        const supportFilePath = (0, devkit_1.joinPathFragments)(config.sourceRoot, 'support', 'e2e.ts');
+        const supportFilePath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts');
         const supportContent = tree.read(supportFilePath, 'utf-8');
         tree.write(supportFilePath, `${supportContent}
 
@@ -34,6 +36,26 @@ Cypress.on("uncaught:exception", (err) => {
     return false;
   }
 });`);
+        // run-commands won't emit { success: true, baseUrl: '...' } to Cypress executor.
+        // We'll wire it up manually and skip serve from Cypress.
+        projectConfig.targets.e2e.options.skipServe = true;
+        projectConfig.targets.e2e.options.baseUrl =
+            (_b = options.baseUrl) !== null && _b !== void 0 ? _b : 'http://localhost:3000';
+        projectConfig.targets.e2e.dependsOn = ['dev-server'];
+        delete projectConfig.targets.e2e.options.devServerTarget;
+        (_d = (_c = projectConfig.targets.e2e) === null || _c === void 0 ? void 0 : _c.configurations) === null || _d === void 0 ? true : delete _d.production.devServerTarget;
+        projectConfig.targets['dev-server'] = {
+            command: `nx serve ${options.project}`,
+            options: {
+                readyWhen: 'Server started',
+            },
+            configurations: {
+                production: {
+                    command: `nx serve ${options.project} --configuration=production`,
+                },
+            },
+        };
+        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
         // returning this in case the cypress generator has any side effects
         return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             yield initSideEffects();

package/src/generators/cypress/cypress.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,kDAAuD;AAEvD,mBAA+B,IAAU,EAAE,OAAY;;QACrD,MAAM,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EACrE,aAAa,EACb,sBAAS,CACV,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,IAAI,kCACrD,OAAO,KACV,gBAAgB,EAAE,IAAI,IACtB,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,CAAC,EACxD;;;;;;IAMA,CACD,CAAC;QAEF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,MAAM,CAAC,UAAU,EACjB,SAAS,EACT,QAAQ,CACT,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,cAAc;;;;;;;;;;;;;;IAcjB,CACD,CAAC;QAEF,oEAAoE;QACpE,OAAO,GAAS,EAAE;YAChB,MAAM,eAAe,EAAE,CAAC;YACxB,MAAM,eAAe,EAAE,CAAC;QAC1B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAxDD,4BAwDC"}
+{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AAEpB,kDAAuD;AAGvD,mBACE,IAAU,EACV,OAA+B;;;QAE/B,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,uBAAuB,EAAC;QAC5C,MAAM,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EACrE,aAAa,EACb,sBAAS,CACV,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,IAAI,kCACrD,OAAO,KACV,gBAAgB,EAAE,IAAI,IACtB,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CACpE,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,CAAC,EAC/D;;;;;;IAMA,CACD,CAAC;QAEF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,UAAU,EACxB,SAAS,EACT,QAAQ,CACT,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,cAAc;;;;;;;;;;;;;;IAcjB,CACD,CAAC;QAEF,iFAAiF;QACjF,yDAAyD;QACzD,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QACnD,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;YACvC,MAAA,OAAO,CAAC,OAAO,mCAAI,uBAAuB,CAAC;QAC7C,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,YAAY,CAAC,CAAC;QACrD,OAAO,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;QAClD,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,GAAG,0CAAE,cAAc,+CAAE,UAAU,CAAC,eAAe,CAAC;QAC7E,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG;YACpC,OAAO,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE;YACtC,OAAO,EAAE;gBACP,SAAS,EAAE,gBAAgB;aAC5B;YACD,cAAc,EAAE;gBACd,UAAU,EAAE;oBACV,OAAO,EAAE,YAAY,OAAO,CAAC,OAAO,6BAA6B;iBAClE;aACF;SACF,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAE9D,oEAAoE;QACpE,OAAO,GAAS,EAAE;YAChB,MAAM,eAAe,EAAE,CAAC;YACxB,MAAM,eAAe,EAAE,CAAC;QAC1B,CAAC,CAAA,CAAC;;CACH;AAnFD,4BAmFC"}

package/src/generators/cypress/schema.d.ts

@@ -0,0 +1,10 @@
+export interface CypressGeneratorSchema {
+  project: string;
+  name: string;
+  baseUrl?: string;
+  directory?: string;
+  linter?: 'none' | 'eslint';
+  js?: boolean;
+  skipFormat?: boolean;
+  setParserOptionsProject?: boolean;
+}

package/src/generators/preset/lib/normalize-options.d.ts

@@ -4,5 +4,8 @@ export interface NormalizedSchema extends RemixGeneratorSchema {
     appName: string;
     projectRoot: string;
     parsedTags: string[];
+    unitTestRunner?: 'jest' | 'none' | 'vitest';
+    e2eTestRunner?: 'cypress' | 'none';
+    js?: boolean;
 }
 export declare function normalizeOptions(tree: Tree, options: RemixGeneratorSchema): NormalizedSchema;

package/src/generators/preset/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/preset/lib/normalize-options.ts"],"names":[],"mappings":";;;AASA,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA6B;IAE7B,sKAAsK;IACtK,6EAA6E;IAC7E,+KAA+K;IAC/K,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7B,MAAM,WAAW,GAAG,YAAY,OAAO,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,uCACK,OAAO,KACV,OAAO;QACP,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAnBD,4CAmBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/preset/lib/normalize-options.ts"],"names":[],"mappings":";;;AAYA,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA6B;IAE7B,sKAAsK;IACtK,6EAA6E;IAC7E,+KAA+K;IAC/K,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7B,MAAM,WAAW,GAAG,YAAY,OAAO,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,uCACK,OAAO,KACV,OAAO;QACP,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAnBD,4CAmBC"}

package/src/generators/preset/preset.impl.js

@@ -7,6 +7,7 @@ const application_impl_1 = require("../application/application.impl");
 const setup_impl_1 = require("../setup/setup.impl");
 const normalize_options_1 = require("./lib/normalize-options");
 function default_1(tree, _options) {
+    var _a, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
         const tasks = [];
@@ -17,6 +18,9 @@ function default_1(tree, _options) {
             tags: options.tags,
             skipFormat: true,
             rootProject: true,
+            unitTestRunner: (_a = options.unitTestRunner) !== null && _a !== void 0 ? _a : 'vitest',
+            e2eTestRunner: (_b = options.e2eTestRunner) !== null && _b !== void 0 ? _b : 'cypress',
+            js: (_c = options.js) !== null && _c !== void 0 ? _c : false,
         });
         tasks.push(appGenTask);
         tree.delete('apps');

package/src/generators/preset/preset.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAElE,uCAA8C;AAC9C,sEAAmE;AACnE,oDAAiD;AACjD,+DAA2D;AAG3D,mBAA+B,IAAU,EAAE,QAA8B;;QACvE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAc,EAAC,IAAI,CAAC,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzB,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAoB,EAAC,IAAI,EAAE;YAClD,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEpB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,4BAqBC"}
+{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAElE,uCAA8C;AAC9C,sEAAmE;AACnE,oDAAiD;AACjD,+DAA2D;AAG3D,mBAA+B,IAAU,EAAE,QAA8B;;;QACvE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAc,EAAC,IAAI,CAAC,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzB,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAoB,EAAC,IAAI,EAAE;YAClD,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ;YAClD,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,SAAS;YACjD,EAAE,EAAE,MAAA,OAAO,CAAC,EAAE,mCAAI,KAAK;SACxB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEpB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;;CACnC;AAxBD,4BAwBC"}

package/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework jest 1`] = `
-"const config = {
+"import type { StorybookConfig } from '@storybook/react-vite';
+
+const config: StorybookConfig = {
   stories: ['../src/lib/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
-  addons: ['@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
   framework: {
     name: '@storybook/react-vite',
     options: {
@@ -23,9 +25,11 @@ export default config;
 `;
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework none 1`] = `
-"const config = {
+"import type { StorybookConfig } from '@storybook/react-vite';
+
+const config: StorybookConfig = {
   stories: ['../src/lib/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
-  addons: ['@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
   framework: {
     name: '@storybook/react-vite',
     options: {
@@ -45,9 +49,11 @@ export default config;
 `;
 
 exports[`Storybook Configuration it should create a storybook configuration and use react-vite framework with testing framework vitest 1`] = `
-"const config = {
+"import type { StorybookConfig } from '@storybook/react-vite';
+
+const config: StorybookConfig = {
   stories: ['../src/lib/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
-  addons: ['@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
   framework: {
     name: '@storybook/react-vite',
     options: {