@nrwl/remix 15.8.5 → 15.9.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nrwl/remix",
-  "version": "15.8.5",
+  "version": "15.9.0",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {
-    "@nrwl/devkit": "15.8.5",
-    "@nrwl/js": "15.8.5",
-    "@nrwl/react": "15.8.5",
+    "@nrwl/devkit": "15.9.2",
+    "@nrwl/js": "15.9.2",
+    "@nrwl/react": "15.9.2",
     "@swc/core": "1.3.35",
     "tslib": "2.3.1"
   },

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

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const create_ts_config_1 = require("@nrwl/js/src/utils/typescript/create-ts-config");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const versions_1 = require("../../utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
 function default_1(tree, _options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -15,22 +17,74 @@ function default_1(tree, _options) {
             tags: options.parsedTags,
         });
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@remix-run/node': '^1.14.0',
-            '@remix-run/react': '^1.14.0',
-            '@remix-run/serve': '^1.14.0',
-            isbot: '^3.6.5',
-            react: '^18.2.0',
-            'react-dom': '^18.2.0',
+            '@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': '^1.14.0',
-            '@remix-run/eslint-config': '^1.14.0',
-            '@types/react': '^18.0.25',
-            '@types/react-dom': '^18.0.8',
-            eslint: '^8.27.0',
-            typescript: '^4.8.4',
+            '@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);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) }));
+        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) {
+            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+                json['scripts'] = {
+                    build: 'nx exec -- remix build',
+                    dev: 'nx exec -- remix dev',
+                    start: 'nx exec -- remix-serve build',
+                    typecheck: 'nx exec -- tsc',
+                };
+                return json;
+            });
+            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.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;
+            });
+            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.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

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":";;;AAAA,yCASsB;AACtB,2FAAqF;AACrF,+DAA2D;AAG3D,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;YACpC,WAAW,EAAE,aAAa;YAC1B,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,iBAAiB,EAAE,SAAS;YAC5B,kBAAkB,EAAE,SAAS;YAC7B,kBAAkB,EAAE,SAAS;YAC7B,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;SACvB,EACD;YACE,gBAAgB,EAAE,SAAS;YAC3B,0BAA0B,EAAE,SAAS;YACrC,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,SAAS;YAC7B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,QAAQ;SACrB,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,IAEtD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAhDD,4BAgDC"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,yCAWsB;AACtB,qFAAqF;AACrF,2FAAqF;AACrF,mDAS8B;AAC9B,+DAA2D;AAG3D,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;YACpC,WAAW,EAAE,aAAa;YAC1B,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,iBAAiB,EAAE,uBAAY;YAC/B,kBAAkB,EAAE,uBAAY;YAChC,kBAAkB,EAAE,uBAAY;YAChC,KAAK,EAAE,uBAAY;YACnB,KAAK,EAAE,uBAAY;YACnB,WAAW,EAAE,0BAAe;SAC7B,EACD;YACE,gBAAgB,EAAE,uBAAY;YAC9B,0BAA0B,EAAE,uBAAY;YACxC,cAAc,EAAE,4BAAiB;YACjC,kBAAkB,EAAE,+BAAoB;YACxC,MAAM,EAAE,wBAAa;YACrB,UAAU,EAAE,4BAAiB;SAC9B,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,MAAM,IAAI,mCACL,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,YAAY,EAAZ,uBAAY;YACZ,YAAY,EAAZ,uBAAY;YACZ,YAAY,EAAZ,uBAAY;YACZ,eAAe,EAAf,0BAAe;YACf,iBAAiB,EAAjB,4BAAiB;YACjB,oBAAoB,EAApB,+BAAoB;YACpB,aAAa,EAAb,wBAAa;YACb,iBAAiB,EAAjB,4BAAiB,GAClB,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,EAC5C,OAAO,CAAC,WAAW,EACnB,IAAI,CACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxC,IAAI,CAAC,SAAS,CAAC,GAAG;oBAChB,KAAK,EAAE,wBAAwB;oBAC/B,GAAG,EAAE,sBAAsB;oBAC3B,KAAK,EAAE,8BAA8B;oBACrC,SAAS,EAAE,gBAAgB;iBAC5B,CAAC;gBAEF,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,GAAG,SAAS,uCAAuC,CACpD,CAAC;SACH;aAAM;YACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,CAAC,WAAW,EACnB,IAAI,CACL,CAAC;SACH;QAED,IAAI,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YAC5D,+EAA+E;YAC/E,MAAM,gBAAgB,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;YAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACzC,OAAO,IAAI,CAAC,OAAO,CAAC;gBACpB,IAAI,CAAC,eAAe,iDACf,gBAAgB,CAAC,eAAe,GAChC,IAAI,CAAC,eAAe;oBACvB,iCAAiC;oBACjC,wFAAwF;oBACxF,KAAK,EAAE;wBACL,KAAK,EAAE,CAAC,SAAS,CAAC;qBACnB,GACF,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG;oBACb,GAAG,CAAC,MAAA,gBAAgB,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;iBACxB,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG;oBACb,GAAG,CAAC,MAAA,gBAAgB,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;iBACxB,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnC;aAAM;YACL,yFAAyF;YACzF,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjHD,4BAiHC"}

package/src/generators/application/files/integrated/package.json__tmpl__

@@ -0,0 +1,32 @@
+{
+  "private": true,
+  "name": "<%= projectName %>",
+  "description": "",
+  "license": "",
+  "scripts": {
+    "build": "nx exec -- remix build",
+    "dev": "nx exec -- remix dev",
+    "start": "nx exec -- remix-serve build",
+    "typecheck": "nx exec -- tsc"
+  },
+  "dependencies": {
+    "@remix-run/node": "<%= remixVersion %>",
+    "@remix-run/react": "<%= remixVersion %>",
+    "@remix-run/serve": "<%= remixVersion %>",
+    "isbot": "<%= isbotVersion %>",
+    "react": "<%= reactVersion %>",
+    "react-dom": "<%= reactDomVersion %>"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "<%= remixVersion %>",
+    "@remix-run/eslint-config": "<%= remixVersion %>",
+    "@types/react": "<%= typesReactVersion %>",
+    "@types/react-dom": "<%= typesReactDomVersion %>",
+    "eslint": "<%= eslintVersion %>",
+    "typescript": "<%= typescriptVersion %>"
+  },
+  "engines": {
+    "node": ">=14"
+  },
+  "sideEffects": false
+}

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

@@ -1,5 +1,5 @@
-import { NxRemixGeneratorSchema } from '../schema';
 import { Tree } from '@nrwl/devkit';
+import { NxRemixGeneratorSchema } from '../schema';
 export interface NormalizedSchema extends NxRemixGeneratorSchema {
     projectName: string;
     projectRoot: string;

package/src/generators/application/lib/normalize-options.js

@@ -6,7 +6,9 @@ function normalizeOptions(tree, options) {
     const { appsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
     const name = (0, devkit_1.names)(options.name).fileName;
     const projectName = name;
-    const projectRoot = (0, devkit_1.joinPathFragments)(appsDir, name);
+    const projectRoot = options.rootProject
+        ? '.'
+        : (0, devkit_1.joinPathFragments)(appsDir, name);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAQtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,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,WAAW;QACX,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAlBD,4CAkBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAStB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrC,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,WAAW;QACX,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AApBD,4CAoBC"}

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

@@ -2,4 +2,5 @@ export interface NxRemixGeneratorSchema {
   name: string;
   tags?: string;
   skipFormat?: boolean;
+  rootProject?: boolean;
 }

package/src/generators/application/schema.json

@@ -23,6 +23,11 @@
       "type": "boolean",
       "description": "Skip formatting files",
       "default": false
+    },
+    "rootProject": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "default": false
     }
   }
 }

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

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
     // There is a bug in Nx core where custom preset args are not passed correctly for boolean values, thus causing the name to be "commit" or "nx-cloud" when not passed.
     // TODO(jack): revert this hack once Nx core is fixed for custom preset args.
     // TODO(philip): presets should probably be using the `appName` flag to name the app, but it's not getting passed down to this generator properly and is always an empty string
-    const name = (0, devkit_1.names)(!options.remixAppName ? 'webapp' : options.remixAppName).fileName;
-    const appName = name;
-    const projectRoot = `packages/${name}`;
+    const appName = options.name;
+    const projectRoot = `packages/${appName}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

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":";;;AAAA,yCAA2C;AAS3C,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA6B;IAE7B,sKAAsK;IACtK,6EAA6E;IAC7E,+KAA+K;IAC/K,MAAM,IAAI,GAAG,IAAA,cAAK,EAChB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CACxD,CAAC,QAAQ,CAAC;IACX,MAAM,OAAO,GAAG,IAAI,CAAC;IACrB,MAAM,WAAW,GAAG,YAAY,IAAI,EAAE,CAAC;IACvC,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;AAtBD,4CAsBC"}
+{"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"}

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

@@ -16,8 +16,11 @@ function default_1(tree, _options) {
             name: options.appName,
             tags: options.tags,
             skipFormat: true,
+            rootProject: true,
         });
         tasks.push(appGenTask);
+        tree.delete('apps');
+        tree.delete('libs');
         yield (0, devkit_1.formatFiles)(tree);
         return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
     });

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,yCAAoE;AAEpE,2FAAqF;AACrF,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;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjBD,4BAiBC"}
+{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAEpE,2FAAqF;AACrF,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,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,4BAqBC"}

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

@@ -1,4 +1,4 @@
 export interface RemixGeneratorSchema {
-  remixAppName: string;
+  name: string;
   tags?: string;
 }

package/src/generators/preset/schema.json

@@ -5,18 +5,9 @@
   "title": "",
   "type": "object",
   "properties": {
-    "remixAppName": {
-      "type": "string",
-      "description": "",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What is the name of the app?"
-    },
     "tags": {
       "type": "string",
-      "description": "Add tags to the app (used for linting)",
+      "description": "Add tags to the app (used for linting).",
       "alias": "t"
     }
   }

package/src/utils/versions.d.ts

@@ -0,0 +1,8 @@
+export declare const remixVersion = "^1.14.3";
+export declare const isbotVersion = "^3.6.5";
+export declare const reactVersion = "^18.2.0";
+export declare const reactDomVersion = "^18.2.0";
+export declare const typesReactVersion = "^18.0.25";
+export declare const typesReactDomVersion = "^18.0.8";
+export declare const eslintVersion = "^8.27.0";
+export declare const typescriptVersion = "^4.8.4";

package/src/utils/versions.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = void 0;
+exports.remixVersion = '^1.14.3';
+exports.isbotVersion = '^3.6.5';
+exports.reactVersion = '^18.2.0';
+exports.reactDomVersion = '^18.2.0';
+exports.typesReactVersion = '^18.0.25';
+exports.typesReactDomVersion = '^18.0.8';
+exports.eslintVersion = '^8.27.0';
+exports.typescriptVersion = '^4.8.4';
+//# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC"}

package/src/generators/application/files/package.json__tmpl__

@@ -1,32 +0,0 @@
-{
-  "private": true,
-  "name": "<%= projectName %>",
-  "description": "",
-  "license": "",
-  "scripts": {
-    "build": "remix build",
-    "dev": "remix dev",
-    "start": "remix-serve build",
-    "typecheck": "tsc"
-  },
-  "dependencies": {
-    "@remix-run/node": "^1.14.0",
-    "@remix-run/react": "^1.14.0",
-    "@remix-run/serve": "^1.14.0",
-    "isbot": "^3.6.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@remix-run/dev": "^1.14.0",
-    "@remix-run/eslint-config": "^1.14.0",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.8",
-    "eslint": "^8.27.0",
-    "typescript": "^4.8.4"
-  },
-  "engines": {
-    "node": ">=14"
-  },
-  "sideEffects": false
-}