@nrwl/remix 1.0.0-alpha.1 → 1.0.0-alpha.13

package/README.md

@@ -1,7 +1,101 @@
-# nx-remix
+<p style="text-align: center;"><img src="https://github.com/nrwl/nx-labs/raw/main/packages/nx-remix/nx-remix.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
-This library was generated with [Nx](https://nx.dev).
+Next generation full stack framework and build system together. Build better websites with [Remix](https://remix.run/) and [Nx](https://nx.dev).
 
-## Running unit tests
+Nx makes supercharges your builds, and the optional [Nx Cloud](https://nx.app) provide out-of-the-box distributed caching, distributed task execution, and valuable workspace insights.
+
+## Creating new Remix workspace
+
+Use `--project=@nrwl/remix` when creating new workspace.
+
+e.g.
+
+```bash
+npx create-nx-workspace@latest acme \
+--preset=@nrwl/remix \
+--project=demo
+```
+
+Now, you can go into the `acme` folder and start development.
+
+```bash
+cd acme
+npx nx dev demo
+```
+
+**Note:** This command runs the `dev` script in `apps/demo/package.json`.
+
+You can also run `nx build demo` and `nx start demo`.
+
+## Existing workspaces
+
+You can add Remix to any existing Nx workspace.
+
+First, install the plugin:
+
+```bash
+npm install --save-dev @nrwl/remix
+
+# Or with yarn
+yarn add -D @nrwl/remix
+```
+
+Then, run the setup generator:
+
+```bash
+npx nx g @nrwl/remix:setup
+```
+
+You can then add your first app and run it:
+
+```bash
+npx nx g @nrwl/remix:app demo
+```
+
+## Workspace libraries
+
+The Remix setup leverages npm/yarn/pnpm workspaces and Nx buildable libraries.
+
+```bash
+npx nx g @nrwl/remix:lib mylib
+```
+
+Import the new library in your app.
+
+```typescript jsx
+// apps/demo/app/root.tsx
+import { Mylib } from '@acme/mylib';
+
+// ...
+
+export default function App() {
+  return (
+    <Document>
+      <Layout>
+        <Mylib />
+        <Outlet />
+      </Layout>
+    </Document>
+  );
+}
+```
+
+Now, run the dev server again to see the new library in action.
+
+```bash
+npx nx dev demo
+```
+
+**Note:** You must restart the server if you make any changes to your library. Luckily, with Nx cache this operation should be super fast.
+
+## Contributing
+
+### Running unit tests
 
 Run `nx test nx-remix` to execute the unit tests via [Jest](https://jestjs.io).
+
+### Publishing
+
+```bash
+nx publish nx-remix --ver=[version]
+```

package/generators.json

@@ -7,7 +7,26 @@
     "preset": {
       "factory": "./src/generators/preset/preset.impl",
       "schema": "./src/generators/preset/schema.json",
-      "description": "Generate a new remix workspace"
+      "description": "Generate a new Remix workspace"
+    },
+    "setup": {
+      "factory": "./src/generators/setup/setup.impl",
+      "schema": "./src/generators/setup/schema.json",
+      "description": "Setup a Remix workspace"
+    },
+    "application": {
+      "factory": "./src/generators/application/application.impl",
+      "schema": "./src/generators/application/schema.json",
+      "description": "Generate a new Remix application",
+      "aliases": ["app"],
+      "x-type": "application"
+    },
+    "library": {
+      "factory": "./src/generators/library/library.impl",
+      "schema": "./src/generators/library/schema.json",
+      "description": "Generate a new library",
+      "aliases": ["lib"],
+      "x-type": "library"
     }
   }
 }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@nrwl/remix",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.13",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {
-    "@nrwl/devkit": "^13.3.9",
-    "@nrwl/react": "^13.3.9",
+    "@nrwl/devkit": "^13.4.1",
+    "@nrwl/js": "^13.4.1",
+    "@nrwl/react": "^13.4.1",
     "tslib": "^2.3.1"
   },
   "typings": "./src/index.d.ts"

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

@@ -11,8 +11,8 @@ function default_1(tree, _options) {
         const tasks = [];
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
             root: options.projectRoot,
-            projectType: 'library',
-            sourceRoot: `${options.projectRoot}/src`,
+            sourceRoot: `${options.projectRoot}`,
+            projectType: 'application',
             tags: options.parsedTags,
         });
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {

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

@@ -1 +1 @@
-{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AAEtB,+DAA2D;AAC3D,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;QAEtC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,WAAW,EAAE,SAAS;YACtB,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,MAAM;YACxC,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,kBAAkB,EAAE,QAAQ;YAC5B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;YACtB,KAAK,EAAE,QAAQ;YACf,kBAAkB,EAAE,QAAQ;SAC7B,EACD;YACE,gBAAgB,EAAE,QAAQ;YAC1B,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,SAAS;YAC7B,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,IAEX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,iBAAiB,EAAE;gBAC1B,GAAG,EAAE,OAAO,CAAC,WAAW;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,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;AAnDD,4BAmDC"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AAEtB,+DAA2D;AAC3D,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;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,kBAAkB,EAAE,QAAQ;YAC5B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;YACtB,KAAK,EAAE,QAAQ;YACf,kBAAkB,EAAE,QAAQ;SAC7B,EACD;YACE,gBAAgB,EAAE,QAAQ;YAC1B,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,SAAS;YAC7B,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,IAEX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,iBAAiB,EAAE;gBAC1B,GAAG,EAAE,OAAO,CAAC,WAAW;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,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;AAnDD,4BAmDC"}

package/src/generators/{preset/files/README.md → application/files/README.md__tmpl__}

@@ -1,13 +1,14 @@
-# Welcome to Remix!
+# Welcome to Nx + Remix!
 
 - [Remix Docs](https://remix.run/docs)
+- [Nx Docs](https://nx.dev)
 
 ## Development
 
 From your terminal:
 
 ```sh
-npm run dev
+npx nx dev <%= projectName %>
 ```
 
 This starts your app in development mode, rebuilding assets on file changes.
@@ -17,13 +18,13 @@ This starts your app in development mode, rebuilding assets on file changes.
 First, build your app for production:
 
 ```sh
-npm run build
+npx nx build <%= projectName %>
 ```
 
 Then run the app in production mode:
 
 ```sh
-npm start
+npx nx start <%= projectName %>
 ```
 
 Now you'll need to pick a host to deploy it to.
@@ -34,8 +35,8 @@ If you're familiar with deploying node applications, the built-in Remix app serv
 
 Make sure to deploy the output of `remix build`
 
-- `build/`
-- `public/build/`
+- `packages/<%= projectName %>/build/`
+- `packages/<%= projectName %>/public/build/`
 
 ### Using a Template
 

package/src/generators/{preset → application}/files/app/root.tsx__tmpl__

@@ -10,8 +10,8 @@ import {
 } from "remix";
 import type { LinksFunction } from "remix";
 
-import globalStylesUrl from "./styles/global.css";
-import darkStylesUrl from "./styles/dark.css";
+import globalStylesUrl from "~/styles/global.css";
+import darkStylesUrl from "~/styles/dark.css";
 
 // https://remix.run/api/app#links
 export let links: LinksFunction = () => {

package/src/generators/{preset → application}/files/app/routes/demos/about.tsx__tmpl__

@@ -1,7 +1,7 @@
 import { Outlet } from "remix";
 import type { MetaFunction, LinksFunction } from "remix";
 
-import stylesUrl from "../../styles/demos/about.css";
+import stylesUrl from "~/styles/demos/about.css";
 
 export let meta: MetaFunction = () => {
   return {

package/src/generators/{preset → 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"],
@@ -9,7 +8,9 @@
     "resolveJsonModule": true,
     "target": "ES2019",
     "strict": true,
-
+    "paths": {
+      "~/*": ["./app/*"]
+    },
     // Remix takes care of building everything in `remix build`.
     "noEmit": true
   }

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
     const name = (0, devkit_1.names)(options.name).fileName;
     const projectName = name;
-    const projectRoot = `packages/${name}`;
+    const projectRoot = `apps/${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/nx-remix/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAQ3C,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;IAE/B,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,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,WAAW;QACX,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAjBD,4CAiBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-remix/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAQvE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;IAE/B,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,MAAM,WAAW,GAAG,QAAQ,IAAI,EAAE,CAAC;IACnC,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;AAjBD,4CAiBC"}

package/src/generators/application/schema.json

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
-  "$id": "NxRemix",
-  "title": "",
+  "$id": "NxRemixApplication",
+  "title": "Create an Application",
   "type": "object",
   "properties": {
     "name": {

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

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

package/src/generators/library/library.impl.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const library_1 = require("@nrwl/react/src/generators/library/library");
+const linter_1 = require("@nrwl/linter");
+const child_process_1 = require("child_process");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+function default_1(tree, options) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const tasks = [];
+        const name = (0, devkit_1.names)(options.name).fileName;
+        const pm = (0, devkit_1.detectPackageManager)();
+        const projectRoot = (0, devkit_1.joinPathFragments)('libs', name);
+        const libGenTask = yield (0, library_1.libraryGenerator)(tree, {
+            name,
+            // Remix can only work with buildable libs and yarn/npm workspaces
+            buildable: true,
+            compiler: 'babel',
+            style: 'css',
+            unitTestRunner: 'jest',
+            tags: options.tags,
+            importPath: options.importPath,
+            skipFormat: false,
+            skipTsConfig: false,
+            linter: linter_1.Linter.EsLint,
+            component: true,
+        });
+        tasks.push(libGenTask);
+        // Nest dist under project root to we can link it
+        const project = (0, devkit_1.readProjectConfiguration)(tree, name);
+        project.targets.build.options = Object.assign(Object.assign({}, project.targets.build.options), { format: ['cjs'], outputPath: (0, devkit_1.joinPathFragments)(projectRoot, 'dist') });
+        (0, devkit_1.updateProjectConfiguration)(tree, name, project);
+        // Point to nested dist for yarn/npm/pnpm workspaces
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'), (json) => {
+            json.main = './dist/index.cjs.js';
+            json.typings = './dist/index.d.ts';
+            return json;
+        });
+        // Link workspaces
+        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;
+//# sourceMappingURL=library.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"library.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/library/library.impl.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AACtB,wEAA8E;AAE9E,yCAAsC;AACtC,iDAAyC;AACzC,2FAAqF;AAErF,mBAA+B,IAAU,EAAE,OAA+B;;QACxE,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAA,6BAAoB,GAAE,CAAC;QAClC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,IAAI,EAAE;YAC9C,IAAI;YAEJ,kEAAkE;YAClE,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,OAAO;YAEjB,KAAK,EAAE,KAAK;YACZ,cAAc,EAAE,MAAM;YACtB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;YACnB,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,iDAAiD;QACjD,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCACxB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAChC,MAAM,EAAE,CAAC,KAAK,CAAC,EACf,UAAU,EAAE,IAAA,0BAAiB,EAAC,WAAW,EAAE,MAAM,CAAC,GACnD,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,oDAAoD;QACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;YAClC,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,kBAAkB;QAClB,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;AAxDD,4BAwDC"}

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

@@ -0,0 +1,6 @@
+export interface NxRemixGeneratorSchema {
+  name: string;
+  tags?: string;
+  importPath?: string;
+  js?: boolean;
+}

package/src/generators/library/schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxRemixLibrary",
+  "cli": "nx",
+  "title": "Create a Library",
+  "type": "object",
+  "examples": [
+    {
+      "command": "g lib mylib --directory=myapp",
+      "description": "Generate libs/myapp/mylib"
+    }
+  ],
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Library name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the library?",
+      "pattern": "^[a-zA-Z].*$"
+    },
+    "tags": {
+      "type": "string",
+      "description": "Add tags to the library (used for linting)"
+    },
+    "importPath": {
+      "type": "string",
+      "description": "The library name used to import it, like @myorg/my-awesome-lib"
+    },
+    "js": {
+      "type": "boolean",
+      "description": "Generate JavaScript files rather than TypeScript files",
+      "default": false
+    }
+  },
+  "required": ["name"]
+}

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
-    const name = (0, devkit_1.names)(options.project).fileName;
+    var _a;
+    const name = (0, devkit_1.names)((_a = options.project) !== null && _a !== void 0 ? _a : 'webapp').fileName;
     const projectName = name;
     const projectRoot = `packages/${name}`;
     const parsedTags = options.tags

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-remix/src/generators/preset/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAQ3C,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;IAE/B,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,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,WAAW;QACX,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAjBD,4CAiBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-remix/src/generators/preset/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AAQzC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA+B;;IAE/B,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC;IACzD,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,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,WAAW;QACX,WAAW;QACX,UAAU,IACV;AACJ,CAAC;AAjBD,4CAiBC"}

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,24 @@ 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 setup_impl_1 = require("../setup/setup.impl");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 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 workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(tree);
-        workspaceConfig.workspaceLayout = {
-            appsDir: 'packages',
-            libsDir: 'packages',
-        };
-        (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfig);
-        const task = yield (0, application_impl_1.default)(tree, {
+        const tasks = [];
+        const appGenTask = yield (0, application_impl_1.default)(tree, {
             name: options.projectName,
             tags: options.tags,
             skipFormat: true,
         });
-        tree.delete('apps');
-        tree.delete('libs');
+        tasks.push(appGenTask);
+        const setupGenTask = yield (0, setup_impl_1.default)(tree, {});
+        tasks.push(setupGenTask);
+        // No need for workspace.json in latest Nx
+        tree.delete('workspace.json');
         yield (0, devkit_1.formatFiles)(tree);
-        return task;
+        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,yCAKsB;AAGtB,+DAA2D;AAC3D,sEAAmE;AAEnE,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEjD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACzD,eAAe,CAAC,eAAe,GAAG;YAChC,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,UAAU;SACpB,CAAC;QACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAEpD,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,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,IAAI,CAAC;IACd,CAAC;CAAA;AAtBD,4BAsBC"}
+{"version":3,"file":"preset.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/preset/preset.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,+DAA2D;AAC3D,sEAAmE;AACnE,oDAAiD;AACjD,2FAAqF;AAErF,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,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,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAc,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzB,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE9B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApBD,4BAoBC"}

package/src/generators/setup/schema.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "NxRemixSetup",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "packageManager": {
+      "type": "string",
+      "description": "The package manager to setup for",
+      "enum": ["yarn", "npm", "pnpm"]
+    }
+  }
+}

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

@@ -0,0 +1,4 @@
+import { Tree } from '@nrwl/devkit';
+export default function (tree: Tree, options: {
+    packageManager?: 'yarn' | 'npm' | 'pnpm';
+}): Promise<() => void>;

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

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+function default_1(tree, options) {
+    var _a;
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const pm = (_a = options.packageManager) !== null && _a !== void 0 ? _a : (0, devkit_1.detectPackageManager)();
+        // Enable yarn/npm/pnpm workspaces for buildable libs
+        if (pm !== 'pnpm') {
+            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+                var _a;
+                if (!json.workspaces) {
+                    (_a = json.workspaces) !== null && _a !== void 0 ? _a : (json.workspaces = ['libs/*']);
+                }
+                return json;
+            });
+        }
+        else {
+            if (!tree.exists('pnpm-workspace.yaml')) {
+                tree.write('pnpm-workspace.yaml', `packages:
+  - 'libs/*`);
+            }
+        }
+        // Ignore nested project files
+        let ignoreFile = tree.read('.gitignore').toString();
+        if (ignoreFile.indexOf('/dist') !== -1) {
+            ignoreFile = ignoreFile.replace('/dist', 'dist');
+        }
+        if (ignoreFile.indexOf('/node_modules') !== -1) {
+            ignoreFile = ignoreFile.replace('/node_modules', 'node_modules');
+        }
+        if (ignoreFile.indexOf('# Remix files') === -1) {
+            ignoreFile = `${ignoreFile
+                .replace('/dist', 'dist')
+                .replace('/node_modules', 'node_modules')}
+  # Remix files
+  apps/**/build
+  apps/**/.cache
+  `;
+        }
+        tree.write('.gitignore', ignoreFile);
+        (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
+            var _a;
+            if (Array.isArray((_a = json.targetDependencies) === null || _a === void 0 ? void 0 : _a.dev)) {
+                if (!json.targetDependencies.dev.some((x) => x.target === 'build' && x.projects === 'dependencies')) {
+                    json.targetDependencies.dev.push({
+                        target: 'build',
+                        projects: 'dependencies',
+                    });
+                }
+            }
+            else {
+                json.targetDependencies = Object.assign(Object.assign({}, json.targetDependencies), { dev: [{ target: 'build', projects: 'dependencies' }] });
+            }
+            return json;
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            // Reserved for additional processing needed
+        };
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=setup.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setup.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-remix/src/generators/setup/setup.impl.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,mBACE,IAAU,EACV,OAEC;;;QAED,MAAM,EAAE,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,IAAA,6BAAoB,GAAE,CAAC;QAE5D,qDAAqD;QACrD,IAAI,EAAE,KAAK,MAAM,EAAE;YACjB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACxC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,CAAC,QAAQ,CAAC,EAAC;iBAChC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE;gBACvC,IAAI,CAAC,KAAK,CACR,qBAAqB,EACrB;YACI,CACL,CAAC;aACH;SACF;QAED,8BAA8B;QAC9B,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;QACpD,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;YACtC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SAClD;QACD,IAAI,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE;YAC9C,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;SAClE;QACD,IAAI,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE;YAC9C,UAAU,GAAG,GAAG,UAAU;iBACvB,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;iBACxB,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC;;;;GAI5C,CAAC;SACD;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAErC,IAAA,mBAAU,EAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;;YACnC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,kBAAkB,0CAAE,GAAG,CAAC,EAAE;gBAC/C,IACE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,KAAK,cAAc,CAC7D,EACD;oBACA,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC;wBAC/B,MAAM,EAAE,OAAO;wBACf,QAAQ,EAAE,cAAc;qBACzB,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,IAAI,CAAC,kBAAkB,mCAClB,IAAI,CAAC,kBAAkB,KAC1B,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,GACrD,CAAC;aACH;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,4CAA4C;QAC9C,CAAC,CAAC;;CACH;AAvED,4BAuEC"}