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

package/generators.json

@@ -5,35 +5,40 @@
   "extends": ["@nrwl/react"],
   "generators": {
     "preset": {
-      "factory": "./src/generators/preset/preset.impl",
+      "implementation": "./src/generators/preset/preset.impl",
       "schema": "./src/generators/preset/schema.json",
       "description": "Generate a new Remix workspace",
       "hidden": true
     },
     "setup": {
-      "factory": "./src/generators/setup/setup.impl",
+      "implementation": "./src/generators/setup/setup.impl",
       "schema": "./src/generators/setup/schema.json",
       "description": "Setup a Remix in an existing workspace",
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application.impl",
+      "implementation": "./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",
+      "implementation": "./src/generators/library/library.impl",
       "schema": "./src/generators/library/schema.json",
       "description": "Generate a new library",
       "aliases": ["lib"],
       "x-type": "library"
     },
     "route": {
-      "factory": "./src/generators/route/route.impl",
+      "implementation": "./src/generators/route/route.impl",
       "schema": "./src/generators/route/schema.json",
       "description": "Generate a new route"
+    },
+    "cypress": {
+      "implementation": "./src/generators/cypress/cypress.impl",
+      "schema": "./src/generators/cypress/schema.json",
+      "description": "Generate a project for testing Remix apps using Cypress"
     }
   }
 }

package/package.json

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

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

@@ -4,10 +4,10 @@
   "description": "",
   "license": "",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev",
-    "postinstall": "remix setup node",
-    "start": "remix-serve build"
+    "build": "npx remix build",
+    "dev": "npx remix dev",
+    "postinstall": "npx remix setup node",
+    "start": "npx remix-serve build"
   },
   "dependencies": {
     "@remix-run/react": "^1.0.6",

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export default function (tree: Tree, options: any): Promise<() => void>;

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const cypress_1 = require("@nrwl/cypress");
+function default_1(tree, options) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const res = (0, cypress_1.cypressProjectGenerator)(tree, Object.assign(Object.assign({}, options), { standaloneConfig: true }));
+        const config = (0, devkit_1.readProjectConfiguration)(tree, `${options.name}-e2e`);
+        tree.delete((0, devkit_1.joinPathFragments)(config.sourceRoot, "support", "app.po.ts"));
+        tree.write((0, devkit_1.joinPathFragments)(config.sourceRoot, "integration", "app.spec.ts"), `describe('webapp', () => {
+  beforeEach(() => cy.visit('/'));
+
+  it('should display welcome message', () => {
+    cy.get('h2').contains('Welcome to Remix!');
+  });
+});`);
+        // returning this in case the cypress generator has any side effects
+        return res;
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=cypress.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAEhF,2CAAqD;AAErD,mBACE,IAAU,EACV,OAAY;;QAEZ,MAAM,GAAG,GAAG,IAAA,iCAAuB,EAAC,IAAI,kCAAM,OAAO,KAAE,gBAAgB,EAAE,IAAI,IAAE,CAAA;QAC/E,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC,CAAA;QACpE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE;;;;;;IAM7E,CAAC,CAAA;QACH,oEAAoE;QACpE,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAhBD,4BAgBC"}

package/src/generators/cypress/schema.json

@@ -0,0 +1,56 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "NxRemixCypress",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the frontend project to test.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "baseUrl": {
+      "type": "string",
+      "description": "URL to access the application on",
+      "default": "http://localhost:3000"
+    },
+    "name": {
+      "type": "string",
+      "description": "Name of the E2E Project",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the e2e project?"
+    },
+    "directory": {
+      "type": "string",
+      "description": "A directory where the project is placed"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint"
+    },
+    "js": {
+      "description": "Generate JavaScript files rather than TypeScript files",
+      "type": "boolean",
+      "default": false
+    },
+    "skipFormat": {
+      "description": "Skip formatting files",
+      "type": "boolean",
+      "default": false
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
+      "default": false
+    }
+  },
+  "required": ["name"]
+}

package/src/generators/route/route.impl.js

@@ -7,9 +7,10 @@ function default_1(tree, options) {
         const { fileName: routePath, className: componentName } = (0, devkit_1.names)(options.path.replace(/^\//, '').replace(/\/$/, ''));
         const projects = (0, devkit_1.getProjects)(tree);
         const project = projects.get(options.project);
+        const normalizedRoutePath = normalizeRoutePath(routePath, project.root);
         if (!project)
             throw new Error(`Project does not exist: ${options.project}`);
-        const componentPath = (0, devkit_1.joinPathFragments)(project.root, 'app/routes', `${routePath}.tsx`);
+        const componentPath = (0, devkit_1.joinPathFragments)(project.root, 'app/routes', `${normalizedRoutePath}.tsx`);
         if (tree.exists(componentPath))
             throw new Error(`Path already exists: ${options.path}`);
         tree.write(componentPath, (0, devkit_1.stripIndents) `
@@ -21,7 +22,7 @@ function default_1(tree, options) {
     import { useActionData, useLoaderData, redirect } from 'remix';
 
     ${options.style === 'css'
-            ? `import stylesUrl from '~/styles/${routePath}.css';`
+            ? `import stylesUrl from '~/styles/${normalizedRoutePath}.css';`
             : ''}
 
 
@@ -59,7 +60,7 @@ function default_1(tree, options) {
     }
   `);
         if (options.style === 'css') {
-            const stylesheetPath = (0, devkit_1.joinPathFragments)(project.root, 'app/styles', `${routePath}.css`);
+            const stylesheetPath = (0, devkit_1.joinPathFragments)(project.root, 'app/styles', `${normalizedRoutePath}.css`);
             tree.write(stylesheetPath, (0, devkit_1.stripIndents) `
       :root {
         --color-foreground: #fff;
@@ -75,4 +76,11 @@ function default_1(tree, options) {
     });
 }
 exports.default = default_1;
+function normalizeRoutePath(path, projectRoot) {
+    if (path.indexOf(projectRoot) === -1)
+        return path;
+    if (path.indexOf('/routes/') > -1)
+        return path.substring(path.indexOf('/routes/') + 8);
+    return path.substring(projectRoot.length + 1);
+}
 //# sourceMappingURL=route.impl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"route.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/route/route.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,mBAA+B,IAAU,EAAE,OAAyB;;QAClE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,IAAA,cAAK,EAC7D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACnD,CAAC;QACF,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,SAAS,MAAM,CACnB,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,KAAK,CACR,aAAa,EACb,IAAA,qBAAY,EAAA;;MAGV,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC;OACH;YACC,CAAC,CAAC,4DACN;;;MAIE,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,mCAAmC,SAAS,QAAQ;YACtD,CAAC,CAAC,EACN;;;;;;yBAMqB,aAAa;;;MAIhC,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;;;SAMb;YACD,CAAC,CAAC,EACN;;;;;;;;;;8BAU0B,aAAa;;;;;;;;GAQxC,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC3B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,SAAS,MAAM,CACnB,CAAC;YACF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAA,qBAAY,EAAA;;;;;;;;;KASb,CACA,CAAC;SACH;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAhGD,4BAgGC"}
+{"version":3,"file":"route.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/route/route.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,mBAA+B,IAAU,EAAE,OAAyB;;QAClE,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAC,GAAG,IAAA,cAAK,EAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACnD,CAAC;QAGF,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE9C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAEvE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,mBAAmB,MAAM,CAC7B,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,KAAK,CACR,aAAa,EACb,IAAA,qBAAY,EAAA;;MAGV,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC;OACH;YACC,CAAC,CAAC,4DACN;;;MAIE,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,mCAAmC,mBAAmB,QAAQ;YAChE,CAAC,CAAC,EACN;;;;;;yBAMqB,aAAa;;;MAIhC,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;;;SAMb;YACD,CAAC,CAAC,EACN;;;;;;;;;;8BAU0B,aAAa;;;;;;;;GAQxC,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC3B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,mBAAmB,MAAM,CAC7B,CAAC;YACF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAA,qBAAY,EAAA;;;;;;;;;KASb,CACA,CAAC;SACH;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApGD,4BAoGC;AAED,SAAS,kBAAkB,CAAC,IAAY,EAAE,WAAmB;IAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IACjD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IACtF,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC/C,CAAC"}