Upgrade to Remix v1 (#65)

* Remove .npmrc and REMIX_TOKEN from GHA * Upgrade packages, remove @remix-run/node and delete remix.env.d.ts * Re-install @remix-run/node as dev dependency * Upgrade examples Co-authored-by: Sergio Xalambrí <[email protected]>
sergiodxa · Nov 23, 2021 · 3b14683 · 3b14683
1 parent b39d922
commit 3b14683
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 80 deletions.
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
@@ -23,8 +23,6 @@ jobs:
           cache: 'npm'
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
       - name: Setup Git
         run: |
           git config user.name 'Sergio Xalambrí'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,13 +17,9 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
       - name: Build
         run: npm run build
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
   typecheck:
     name: Typechecker
@@ -39,13 +35,9 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
       - name: Typecheck
         run: npm run typecheck
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
   test:
     name: Unit and Integration Tests
@@ -61,13 +53,9 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
       - name: Test
         run: npm run test -- --ci --coverage --maxWorkers=2
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
   lint:
     name: Linter
@@ -83,15 +71,9 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
       - name: Build
         run: npm run build
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
 
       - name: Lint
-        run: npm run lint
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
+        run: npm run lint
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,12 +14,7 @@ jobs:
           node-version: 14
           registry-url: https://registry.npmjs.org/
       - run: npm install
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
       - run: npm run build
-        env:
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
       - run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-          REMIX_TOKEN: ${{ secrets.REMIX_TOKEN }}
diff --git a/.npmrc b/.npmrc
diff --git a/examples/github/app/root.tsx b/examples/github/app/root.tsx
@@ -1,9 +1,9 @@
-import { Outlet } from "react-router-dom";
 import type { LinksFunction, LoaderFunction } from "remix";
 import {
   Links,
   LiveReload,
   Meta,
+  Outlet,
   Scripts,
   useCatch,
   useLoaderData,

diff --git a/examples/github/app/routes/index.tsx b/examples/github/app/routes/index.tsx
@@ -1,6 +1,6 @@
-import { Link } from "react-router-dom";
 import {
   Form,
+  Link,
   LinksFunction,
   LoaderFunction,
   MetaFunction,

diff --git a/examples/github/package.json b/examples/github/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "build": "remix build",
-    "dev": "remix run",
+    "dev": "remix dev",
     "postinstall": "remix setup node",
     "start": "remix-serve build"
   },
@@ -15,9 +15,8 @@
     "dotenv": "^10.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.0.0-beta.8",
     "remix": "*",
-    "remix-auth": "*"
+    "remix-auth": "file:../.."
   },
   "devDependencies": {
     "@remix-run/dev": "*",

diff --git a/examples/local/app/root.tsx b/examples/local/app/root.tsx
@@ -1,9 +1,9 @@
-import { Outlet } from "react-router-dom";
 import type { LinksFunction, LoaderFunction } from "remix";
 import {
   Links,
   LiveReload,
   Meta,
+  Outlet,
   Scripts,
   useCatch,
   useLoaderData,

diff --git a/examples/local/app/routes/index.tsx b/examples/local/app/routes/index.tsx
@@ -1,6 +1,6 @@
-import { Link } from "react-router-dom";
 import {
   Form,
+  Link,
   LinksFunction,
   LoaderFunction,
   MetaFunction,

diff --git a/examples/local/package.json b/examples/local/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "build": "remix build",
-    "dev": "remix run",
+    "dev": "remix dev",
     "postinstall": "remix setup node",
     "start": "remix-serve build"
   },
@@ -14,9 +14,8 @@
     "@remix-run/serve": "*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.0.0-beta.8",
     "remix": "*",
-    "remix-auth": "*"
+    "remix-auth": "file:../.."
   },
   "devDependencies": {
     "@remix-run/dev": "*",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,17 +36,17 @@
     "README.md"
   ],
   "peerDependencies": {
-    "@remix-run/react": "^0.21.0",
-    "@remix-run/server-runtime": "^0.21.0"
+    "@remix-run/react": "^1.0.0",
+    "@remix-run/server-runtime": "^1.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.14.2",
     "@babel/preset-env": "^7.14.1",
     "@babel/preset-react": "^7.13.13",
     "@babel/preset-typescript": "^7.13.0",
-    "@remix-run/node": "^0.21.0",
-    "@remix-run/react": "^0.21.0",
-    "@remix-run/server-runtime": "^0.21.0",
+    "@remix-run/node": "^1.0.3",
+    "@remix-run/react": "^1.0.0",
+    "@remix-run/server-runtime": "^1.0.0",
     "@types/jest": "^26.0.23",
     "@types/prop-types": "^15.7.4",
     "@types/react": "^17.0.14",
@@ -68,7 +68,6 @@
     "jest-fetch-mock": "^3.0.3",
     "prettier": "^2.3.2",
     "react": "^17.0.2",
-    "react-router-dom": "^6.0.0-beta.8",
     "ts-node": "^9.1.1",
     "typescript": "^4.3.5"
   },

diff --git a/remix.env.d.ts b/remix.env.d.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,5 +12,5 @@
     "outDir": "./build"
   },
   "exclude": ["node_modules"],
-  "include": ["config/remix.env.d.ts", "src/**/*.ts", "src/**/*.tsx"]
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }