Merge branch 'release/v1.1.0'

.eslintrc.js

@@ -1,12 +1,8 @@
 module.exports = {
-  extends: ["react-app", "plugin:import/typescript"],
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "import"],
-  settings: {
-    "import/resolver": {
-      typescript: {}
-    }
-  },
+  extends: [
+    require.resolve("./packages/remix-eslint-config/index.js"),
+    require.resolve("./packages/remix-eslint-config/jest.js")
+  ],
   overrides: [
     {
       files: [
@@ -16,11 +12,16 @@ module.exports = {
       rules: {
         "no-restricted-globals": "off"
       }
+    },
+    {
+      files: ["fixtures/gists-app/jest/**/*.js"],
+      env: {
+        "jest/globals": true
+      }
     }
   ],
   rules: {
     "@typescript-eslint/consistent-type-imports": "error",
-
     "import/order": [
       "error",
       {

.github/workflows/format.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
 
 jobs:
   format:

.github/workflows/test.yml

@@ -9,6 +9,7 @@ on:
     paths-ignore:
       - "docs/**"
       - "**/README.md"
+  pull_request: {}
 
 jobs:
   build:

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .vscode
 .DS_Store
 
@@ -9,6 +10,7 @@ yarn-error.log
 /fixtures/cloudflare
 /fixtures/test
 /fixtures/my-remix-app
+/fixtures/deno-app
 
 .eslintcache
 /.idea/

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

contributors.yml

@@ -1,15 +1,18 @@
 - abereghici
+- ahbruns
 - ahmedeldessouki
 - Alarid
 - alexuxui
 - arange
 - arganaphangquestian
+- ascorbic
 - ashleyryan
 - ashocean
 - BasixKOR
 - bmontalvo
 - bogas04
 - bruno-oliveira
+- bsharrow
 - CanRau
 - chaance
 - chenc041
@@ -21,10 +24,13 @@
 - crismali
 - davecalnan
 - derekr
+- developit
 - dhargitai
 - dokeet
 - dokeet
+- donavon
 - dunglas
+- dwt47
 - edgesoft
 - emzoumpo
 - eps1lon
@@ -37,11 +43,13 @@
 - goncy
 - gonzoscript
 - graham42
+- GregBrimble
 - hardingmatt
 - HenryVogt
 - hkan
 - Holben888
 - Hopsken
+- IAmLuisJ
 - ianduvall
 - imzshh
 - jacob-ebey
@@ -63,6 +71,7 @@
 - leo
 - levippaul
 - lswest
+- luispagarcia
 - luistorres
 - m0nica
 - manzoorwanijk
@@ -77,8 +86,10 @@
 - mochi-sann
 - mohammadhosseinbagheri
 - morinokami
+- mskoroglu
 - msutkowski
 - nareshbhatia
+- niconiahi
 - nielsdb97
 - nobeeakon
 - nurul3101
@@ -94,6 +105,7 @@
 - RossMcMillan92
 - ryanflorence
 - sean-roberts
+- sergiodxa
 - shumuu
 - sidkh
 - silvenon
@@ -107,8 +119,12 @@
 - tombyrer
 - tvanantwerp
 - twhitbeck
+- tylerbrostrom
 - unhackit
+- UsamaHameed
 - veritem
 - VictorPeralta
+- weavdale
+- yesmeck
 - zachdtaylor
 - zainfathoni

docs/api/conventions.md

@@ -14,7 +14,7 @@ This file has a few build and development configuration options, but does not ac
 ```tsx filename=remix.config.js
 module.exports = {
   appDirectory: "app",
-  browserBuildDirectory: "public/build",
+  assetsBuildDirectory: "public/build",
   devServerPort: 8002,
   publicPath: "/build/",
   serverBuildDirectory: "build",
@@ -65,7 +65,7 @@ exports.routes = async (defineRoutes) => {
 }
 ```
 
-### browserBuildDirectory
+### assetsBuildDirectory
 
 The path to the browser build, relative to remix.config.js. Defaults to "public/build". Should be deployed to static hosting.