@nx/remix 17.0.0 → 17.0.4

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

@@ -1,3 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NxRemixGeneratorSchema } from './schema';
-export default function (tree: Tree, _options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixApplicationGenerator(tree: Tree, options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixApplicationGeneratorInternal(tree: Tree, _options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export default remixApplicationGenerator;

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

@@ -1,21 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
+exports.remixApplicationGeneratorInternal = exports.remixApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
 const versions_1 = require("../../utils/versions");
-const cypress_impl_1 = require("../cypress/cypress.impl");
 const lib_1 = require("./lib");
-function default_1(tree, _options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, _options);
-        const tasks = [];
-        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-            root: options.projectRoot,
-            sourceRoot: `${options.projectRoot}`,
-            projectType: 'application',
-            tags: options.parsedTags,
-            targets: {
+const update_dependencies_1 = require("../utils/update-dependencies");
+const init_1 = require("../init/init");
+const js_1 = require("@nx/js");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const testing_config_utils_1 = require("../../utils/testing-config-utils");
+function remixApplicationGenerator(tree, options) {
+    return remixApplicationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
+}
+exports.remixApplicationGenerator = remixApplicationGenerator;
+async function remixApplicationGeneratorInternal(tree, _options) {
+    const options = await (0, lib_1.normalizeOptions)(tree, _options);
+    const tasks = [
+        await (0, init_1.default)(tree, {
+            skipFormat: true,
+            addPlugin: options.addPlugin,
+        }),
+        await (0, js_1.initGenerator)(tree, { skipFormat: true }),
+    ];
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/remix:build');
+    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
+        root: options.projectRoot,
+        sourceRoot: `${options.projectRoot}`,
+        projectType: 'application',
+        tags: options.parsedTags,
+        targets: !options.addPlugin
+            ? {
                 build: {
                     executor: '@nx/remix:build',
                     outputs: ['{options.outputPath}'],
@@ -26,125 +45,167 @@ function default_1(tree, _options) {
                 serve: {
                     executor: `@nx/remix:serve`,
                     options: {
+                        command: `${(0, devkit_1.getPackageManagerCommand)().exec} remix-serve build/index.js`,
+                        manual: true,
                         port: 4200,
                     },
                 },
                 start: {
                     dependsOn: ['build'],
-                    command: `remix-serve build`,
+                    command: `remix-serve build/index.js`,
                     options: {
                         cwd: options.projectRoot,
                     },
                 },
                 typecheck: {
-                    command: `tsc`,
+                    command: `tsc --project tsconfig.app.json`,
                     options: {
                         cwd: options.projectRoot,
                     },
                 },
-            },
-        });
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@remix-run/node': versions_1.remixVersion,
-            '@remix-run/react': versions_1.remixVersion,
-            '@remix-run/serve': versions_1.remixVersion,
-            isbot: versions_1.isbotVersion,
-            react: versions_1.reactVersion,
-            'react-dom': versions_1.reactDomVersion,
-        }, {
-            '@remix-run/dev': versions_1.remixVersion,
-            '@remix-run/eslint-config': versions_1.remixVersion,
-            '@types/react': versions_1.typesReactVersion,
-            '@types/react-dom': versions_1.typesReactDomVersion,
-            eslint: versions_1.eslintVersion,
-            typescript: versions_1.typescriptVersion,
-        });
-        tasks.push(installTask);
-        const vars = Object.assign(Object.assign({}, options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), remixVersion: versions_1.remixVersion,
-            isbotVersion: versions_1.isbotVersion,
-            reactVersion: versions_1.reactVersion,
-            reactDomVersion: versions_1.reactDomVersion,
-            typesReactVersion: versions_1.typesReactVersion,
-            typesReactDomVersion: versions_1.typesReactDomVersion,
-            eslintVersion: versions_1.eslintVersion,
-            typescriptVersion: versions_1.typescriptVersion });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/common'), options.projectRoot, vars);
-        if (options.rootProject) {
-            const gitignore = tree.read('.gitignore', 'utf-8');
-            tree.write('.gitignore', `${gitignore}\n.cache\nbuild\npublic/build\n.env\n`);
-        }
-        else {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/integrated'), options.projectRoot, vars);
-        }
-        if (options.unitTestRunner !== 'none') {
-            if (options.unitTestRunner === 'vitest') {
-                const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
-                const vitestTask = yield vitestGenerator(tree, {
-                    uiFramework: 'react',
-                    project: options.projectName,
-                    coverageProvider: 'c8',
-                    inSourceTests: false,
-                    skipFormat: true,
-                    testEnvironment: 'jsdom',
-                });
-                tasks.push(vitestTask);
-            }
-            else {
-                const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', (0, versions_1.getPackageVersion)(tree, 'nx'));
-                const jestTask = yield jestProjectGenerator(tree, {
-                    project: options.projectName,
-                    skipFormat: true,
-                    setupFile: 'none',
-                    supportTsx: true,
-                });
-                tasks.push(jestTask);
             }
-            const pkgInstallTask = (0, lib_1.updateUnitTestConfig)(tree, options.projectRoot, options.unitTestRunner);
-            tasks.push(pkgInstallTask);
-        }
-        if (options.js) {
-            (0, devkit_1.toJS)(tree);
-        }
-        if (options.rootProject && tree.exists('tsconfig.base.json')) {
-            // If this is a standalone project, merge tsconfig.json and tsconfig.base.json.
-            const tsConfigBaseJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
-            (0, devkit_1.updateJson)(tree, 'tsconfig.json', (json) => {
-                var _a, _b, _c, _d;
-                delete json.extends;
-                json.compilerOptions = Object.assign(Object.assign(Object.assign({}, tsConfigBaseJson.compilerOptions), json.compilerOptions), { 
-                    // Taken from remix default setup
-                    // https://github.com/remix-run/remix/blob/68c8982/templates/remix/tsconfig.json#L15-L17
-                    paths: {
-                        '~/*': ['./app/*'],
-                    } });
-                json.include = [
-                    ...((_a = tsConfigBaseJson.include) !== null && _a !== void 0 ? _a : []),
-                    ...((_b = json.include) !== null && _b !== void 0 ? _b : []),
-                ];
-                json.exclude = [
-                    ...((_c = tsConfigBaseJson.exclude) !== null && _c !== void 0 ? _c : []),
-                    ...((_d = json.exclude) !== null && _d !== void 0 ? _d : []),
-                ];
-                return json;
+            : {},
+    });
+    const installTask = (0, update_dependencies_1.updateDependencies)(tree);
+    tasks.push(installTask);
+    const vars = {
+        ...options,
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        remixVersion: versions_1.remixVersion,
+        isbotVersion: versions_1.isbotVersion,
+        reactVersion: versions_1.reactVersion,
+        reactDomVersion: versions_1.reactDomVersion,
+        typesReactVersion: versions_1.typesReactVersion,
+        typesReactDomVersion: versions_1.typesReactDomVersion,
+        eslintVersion: versions_1.eslintVersion,
+        typescriptVersion: versions_1.typescriptVersion,
+    };
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/common'), options.projectRoot, vars);
+    if (options.rootProject) {
+        const gitignore = tree.read('.gitignore', 'utf-8');
+        tree.write('.gitignore', `${gitignore}\n.cache\nbuild\npublic/build\n.env\n`);
+    }
+    else {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/integrated'), options.projectRoot, vars);
+    }
+    if (options.unitTestRunner !== 'none') {
+        if (options.unitTestRunner === 'vitest') {
+            const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const vitestTask = await vitestGenerator(tree, {
+                uiFramework: 'react',
+                project: options.projectName,
+                coverageProvider: 'v8',
+                inSourceTests: false,
+                skipFormat: true,
+                testEnvironment: 'jsdom',
+                skipViteConfig: true,
+                addPlugin: options.addPlugin,
             });
-            tree.delete('tsconfig.base.json');
+            createOrEditViteConfig(tree, {
+                project: options.projectName,
+                includeLib: false,
+                includeVitest: true,
+                testEnvironment: 'jsdom',
+                imports: [`import react from '@vitejs/plugin-react';`],
+                plugins: [`react()`],
+            }, true, undefined, true);
+            tasks.push(vitestTask);
         }
         else {
-            // Otherwise, extract the tsconfig.base.json from tsconfig.json so we can share settings.
-            (0, create_ts_config_1.extractTsConfigBase)(tree);
-        }
-        if (options.e2eTestRunner === 'cypress') {
-            const cypressTasks = yield (0, cypress_impl_1.default)(tree, {
+            const { configurationGenerator: jestConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const jestTask = await jestConfigurationGenerator(tree, {
                 project: options.projectName,
-                name: options.rootProject ? `e2e` : `${options.projectName}-e2e`,
+                setupFile: 'none',
+                supportTsx: true,
+                skipSerializers: false,
+                skipPackageJson: false,
+                skipFormat: true,
+                addPlugin: options.addPlugin,
             });
-            tasks.push(cypressTasks);
+            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+            if (projectConfig.targets['test']?.options) {
+                projectConfig.targets['test'].options.passWithNoTests = true;
+                (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
+            }
+            tasks.push(jestTask);
         }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+        const pkgInstallTask = (0, lib_1.updateUnitTestConfig)(tree, options.projectRoot, options.unitTestRunner, options.rootProject);
+        tasks.push(pkgInstallTask);
+    }
+    else {
+        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 eslintTask = await lintProjectGenerator(tree, {
+            linter: options.linter,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            skipFormat: true,
+            rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
+        });
+        tasks.push(eslintTask);
+        tree.write((0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintignore'), (0, devkit_1.stripIndents) `build
+    public/build`);
+    }
+    if (options.js) {
+        (0, devkit_1.toJS)(tree);
+    }
+    if (options.rootProject && tree.exists('tsconfig.base.json')) {
+        // If this is a standalone project, merge tsconfig.json and tsconfig.base.json.
+        const tsConfigBaseJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
+        (0, devkit_1.updateJson)(tree, 'tsconfig.json', (json) => {
+            delete json.extends;
+            json.compilerOptions = {
+                ...tsConfigBaseJson.compilerOptions,
+                ...json.compilerOptions,
+                // Taken from remix default setup
+                // https://github.com/remix-run/remix/blob/68c8982/templates/remix/tsconfig.json#L15-L17
+                paths: {
+                    '~/*': ['./app/*'],
+                },
+            };
+            json.include = [
+                ...(tsConfigBaseJson.include ?? []),
+                ...(json.include ?? []),
+            ];
+            json.exclude = [
+                ...(tsConfigBaseJson.exclude ?? []),
+                ...(json.exclude ?? []),
+            ];
+            return json;
+        });
+        tree.delete('tsconfig.base.json');
+    }
+    else {
+        // Otherwise, extract the tsconfig.base.json from tsconfig.json so we can share settings.
+        (0, create_ts_config_1.extractTsConfigBase)(tree);
+    }
+    if (options.rootProject) {
+        (0, devkit_1.updateJson)(tree, `package.json`, (json) => {
+            json.type = 'module';
+            return json;
+        });
+        if (options.unitTestRunner === 'jest') {
+            tree.write('jest.preset.js', `import { nxPreset } from '@nx/jest/preset/jest-preset.js';
+export default {...nxPreset};
+`);
+            (0, testing_config_utils_1.updateJestTestMatch)(tree, 'jest.config.ts', '<rootDir>/tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+    }
+    tasks.push(await (0, lib_1.addE2E)(tree, options));
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.default = default_1;
-//# sourceMappingURL=application.impl.js.map
+exports.remixApplicationGeneratorInternal = remixApplicationGeneratorInternal;
+exports.default = remixApplicationGenerator;