@nrwl/remix 14.4.2 → 14.7.0

package/migrations.json

@@ -0,0 +1,54 @@
+{
+  "schematics": {
+    "update-tsconfig-and-remix-config-for-1-6-8": {
+      "version": "14.5.4",
+      "cli": "nx",
+      "description": "Update tsconfig.json and tsconfig.json to enable import of workspace libs",
+      "factory": "./src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8"
+    }
+
+  },
+  "packageJsonUpdates": {
+    "14.5.4": {
+      "version": "14.5.4",
+      "packages": {
+        "@remix-run/react": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/node": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/serve": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/dev": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/eslint-config": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "react": {
+          "version": "^18.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "react-dom": {
+          "version": "^18.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@types/react-dom": {
+          "version": "^18.0.6",
+          "alwaysAddToPackageJson": true
+        },
+        "@types/react": {
+          "version": "^18.0.15",
+          "alwaysAddToPackageJson": true
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@nrwl/remix",
-  "version": "14.4.2",
+  "version": "14.7.0",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {
-    "@nrwl/devkit": "^14.4.2",
-    "@nrwl/js": "^14.4.2",
-    "@nrwl/react": "^14.4.2",
+    "@nrwl/devkit": "^14.5.0",
+    "@nrwl/js": "^14.5.0",
+    "@nrwl/react": "^14.5.0",
     "tslib": "^2.3.1"
   },
+  "ng-update": {
+    "requirements": {},
+    "migrations": "./migrations.json"
+  },
   "typings": "./src/index.d.ts"
-}
+}

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

@@ -16,19 +16,21 @@ function default_1(tree, _options) {
             tags: options.parsedTags,
         });
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@remix-run/react': '^1.0.6',
-            react: '^17.0.2',
-            'react-dom': '^17.0.2',
-            remix: '^1.0.6',
-            '@remix-run/serve': '^1.0.6',
+            '@remix-run/react': '^1.6.8',
+            '@remix-run/node': '^1.6.8',
+            react: '^18.2.0',
+            'react-dom': '^18.2.0',
+            '@remix-run/serve': '^1.6.8',
         }, {
-            '@remix-run/dev': '^1.0.6',
-            '@types/react': '^17.0.24',
-            '@types/react-dom': '^17.0.9',
-            typescript: '~4.4.3',
+            '@remix-run/dev': '^1.6.8',
+            '@remix-run/eslint-config': '^1.6.8',
+            '@types/react': '^18.0.15',
+            '@types/react-dom': '^18.0.6',
+            eslint: '^8.20.0',
+            typescript: '^4.7.4',
         });
         tasks.push(installTask);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
+        (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 remixSetupCommand = 'remix setup node';
         // update package json with postinstall command
         (0, devkit_1.updateJson)(tree, 'package.json', (pkgJson) => {

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;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,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;QAE7C,+CAA+C;QAC/C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;YAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;aACjD;iBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;gBACnE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,iBAAiB,EAAE,CAAC;aACxF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,OAAO,iBAAiB,EAAE,EAAE;gBACnC,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;AAhED,4BAgEC"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;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,iBAAiB,EAAE,QAAQ;YAC3B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;YACtB,kBAAkB,EAAE,QAAQ;SAC7B,EACD;YACE,gBAAgB,EAAE,QAAQ;YAC1B,0BAA0B,EAAE,QAAQ;YACpC,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,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;QAE7C,+CAA+C;QAC/C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;YAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;aACjD;iBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;gBACnE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,iBAAiB,EAAE,CAAC;aACxF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,OAAO,iBAAiB,EAAE,EAAE;gBACnC,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;AAnED,4BAmEC"}

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

@@ -10,14 +10,13 @@
     "start": "npx remix-serve build"
   },
   "dependencies": {
-    "@remix-run/react": "^1.0.6",
+    "@remix-run/react": "^1.6.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "remix": "^1.0.6",
-    "@remix-run/serve": "^1.0.6"
+    "@remix-run/serve": "^1.6.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.0.6",
+    "@remix-run/dev": "^1.6.0",
     "@types/react": "^17.0.24",
     "@types/react-dom": "^17.0.9",
     "typescript": "^4.6.4"

package/src/generators/application/files/remix.config.js__tmpl__

@@ -7,4 +7,5 @@ module.exports = {
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
+  watchPaths: ["<%= offsetFromRoot %>libs"]
 };

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

@@ -1,4 +1,5 @@
 {
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2019"],
@@ -11,11 +12,6 @@
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["./app/*"]
-    },
-
     // Remix takes care of building everything in `remix build`.
     "noEmit": true
   }

package/src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nrwl/devkit';
+/**
+ * Update tsconfig.json and remix.config.js to support importing workspaces libraries
+ * @param tree
+ */
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+/**
+ * Update tsconfig.json and remix.config.js to support importing workspaces libraries
+ * @param tree
+ */
+function update(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        const remixProjects = Array.from(projects.values()).filter((project) => {
+            const remixConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'remix.config.js');
+            // if the project doesn't have a remix.config.js, it's not a Remix project so we can skip it
+            return tree.exists(remixConfigPath);
+        });
+        if (remixProjects.length === 0)
+            return;
+        remixProjects.forEach((project) => {
+            const remixConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'remix.config.js');
+            try {
+                const remixConfigContent = tree.read(remixConfigPath, 'utf-8');
+                // if watchPaths is already there, we assume this project has been updated before
+                if (remixConfigContent.includes('watchPaths'))
+                    return;
+                const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(project.root);
+                const layout = (0, devkit_1.getWorkspaceLayout)(tree);
+                tree.write(remixConfigPath, remixConfigContent.replace('module.exports = {\n', `module.exports = {  watchPaths: ['${(0, devkit_1.joinPathFragments)(projectOffsetFromRoot, layout.libsDir)}'],\n`));
+                const tsConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json');
+                const tsConfigContent = (0, devkit_1.readJson)(tree, tsConfigPath);
+                const newTsConfigContent = Object.assign(Object.assign({}, tsConfigContent), { extends: `${projectOffsetFromRoot}tsconfig.base.json` });
+                delete newTsConfigContent.compilerOptions.baseUrl;
+                devkit_1.logger.info(`Remix apps now support importing from non-buildable libs. However, you must remove the \`paths\` configuration from the project's \`tsconfig.json\`.\n\nMigrate any import paths using \`~\` to relative path imports and then delete the \`paths\` property from \`${tsConfigPath}\``);
+                (0, devkit_1.writeJson)(tree, tsConfigPath, newTsConfigContent);
+            }
+            catch (err) {
+                devkit_1.logger.error(err);
+                devkit_1.logger.error(`Unable to update ${remixConfigPath} for project ${project.root}.`);
+            }
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = update;
+//# sourceMappingURL=update-tsconfig-and-remix-config-for-1-6-8.js.map

package/src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-tsconfig-and-remix-config-for-1-6-8.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AAEtB;;;GAGG;AACH,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YACrE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC3E,4FAA4F;YAC5F,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEvC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE3E,IAAI;gBACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBAC/D,iFAAiF;gBACjF,IAAI,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAAE,OAAO;gBAEtD,MAAM,qBAAqB,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,CAAC,KAAK,CACR,eAAe,EACf,kBAAkB,CAAC,OAAO,CACxB,sBAAsB,EACtB,qCAAqC,IAAA,0BAAiB,EACpD,qBAAqB,EACrB,MAAM,CAAC,OAAO,CACf,OAAO,CACT,CACF,CAAC;gBAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBACtE,MAAM,eAAe,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAErD,MAAM,kBAAkB,mCACnB,eAAe,KAClB,OAAO,EAAE,GAAG,qBAAqB,oBAAoB,GACtD,CAAC;gBAEF,OAAO,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC;gBAElD,eAAM,CAAC,IAAI,CACT,uQAAuQ,YAAY,IAAI,CACxR,CAAC;gBAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;aACnD;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClB,eAAM,CAAC,KAAK,CACV,oBAAoB,eAAe,gBAAgB,OAAO,CAAC,IAAI,GAAG,CACnE,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvDD,yBAuDC"}