@nrwl/remix 1.0.0-alpha.4 → 1.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/remix",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {

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

@@ -1,5 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json",
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2019"],

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

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import { NxRemixGeneratorSchema } from './schema';
-export default function (tree: Tree, _options: NxRemixGeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export default function (tree: Tree, _options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;

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

@@ -4,24 +4,59 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const application_impl_1 = require("../application/application.impl");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const child_process_1 = require("child_process");
 function default_1(tree, _options) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
-        const task = yield (0, application_impl_1.default)(tree, {
+        const tasks = [];
+        const pm = (0, devkit_1.detectPackageManager)();
+        const appGenTask = yield (0, application_impl_1.default)(tree, {
             name: options.projectName,
             tags: options.tags,
             skipFormat: true,
         });
+        tasks.push(appGenTask);
         // Enable yarn/npm/pnpm workspaces for buildable libs
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a;
-            (_a = json.workspaces) !== null && _a !== void 0 ? _a : (json.workspaces = ['dist/libs/*']);
-            return json;
-        });
+        if (pm !== 'pnpm') {
+            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+                var _a;
+                (_a = json.workspaces) !== null && _a !== void 0 ? _a : (json.workspaces = ['dist/libs/*']);
+                return json;
+            });
+        }
+        else {
+            tree.write('pnpm-workspace.yaml', `packages:
+  - 'libs/*`);
+        }
+        // Ignore nested project files
+        const ignoreFile = tree.read('.gitignore').toString();
+        tree.write('.gitignore', `${ignoreFile
+            .replace('/dist', 'dist')
+            .replace('/node_modules', 'node_modules')}
+  // Remix files
+  apps/**/build
+  apps/**/.cache
+  `);
         // No need for workspace.json in latest Nx
         tree.delete('workspace.json');
         yield (0, devkit_1.formatFiles)(tree);
-        return task;
+        tasks.push(() => {
+            let command;
+            if (pm === 'npm') {
+                command = `npm install -ws`;
+            }
+            else if (pm === 'yarn') {
+                command = `yarn`;
+            }
+            else if (pm === 'pnpm') {
+                command = `pnpm install`;
+            }
+            (0, child_process_1.execSync)(command, {
+                stdio: [0, 1, 2],
+            });
+        });
+        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
     });
 }
 exports.default = default_1;

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

@@ -1 +1 @@
-{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,yCAA6D;AAG7D,+DAA2D;AAC3D,sEAAmE;AAEnE,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEjD,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAoB,EAAC,IAAI,EAAE;YAC5C,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,qDAAqD;QACrD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,CAAC,aAAa,CAAC,EAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE9B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AArBD,4BAqBC"}
+{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,+DAA2D;AAC3D,sEAAmE;AACnE,2FAAqF;AACrF,iDAAyC;AAEzC,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,IAAA,6BAAoB,GAAE,CAAC;QAElC,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAoB,EAAC,IAAI,EAAE;YAClD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,qDAAqD;QACrD,IAAI,EAAE,KAAK,MAAM,EAAE;YACjB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACxC,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,CAAC,aAAa,CAAC,EAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,KAAK,CACR,qBAAqB,EACrB;YACM,CACP,CAAC;SACH;QAED,8BAA8B;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtD,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,GAAG,UAAU;aACV,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;aACxB,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC;;;;GAI5C,CACA,CAAC;QAEF,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE9B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAI,OAAe,CAAC;YACpB,IAAI,EAAE,KAAK,KAAK,EAAE;gBAChB,OAAO,GAAG,iBAAiB,CAAC;aAC7B;iBAAM,IAAI,EAAE,KAAK,MAAM,EAAE;gBACxB,OAAO,GAAG,MAAM,CAAC;aAClB;iBAAM,IAAI,EAAE,KAAK,MAAM,EAAE;gBACxB,OAAO,GAAG,cAAc,CAAC;aAC1B;YACD,IAAA,wBAAQ,EAAC,OAAO,EAAE;gBAChB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA3DD,4BA2DC"}