Skip to content

Commit

Permalink
Merge branch 'dev' into show-deprecation-message-for-serverBuildDirec…
Browse files Browse the repository at this point in the history 
…tory-config
  • Loading branch information
@jacob-ebey
jacob-ebey committed Mar 15, 2023
2 parents b2d98ff + 4055c84 commit f942f81
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 54 deletions.
6 changes: 6 additions & 0 deletions .changeset/fluffy-dragons-reflect.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"remix": patch
"@remix-run/dev": patch
---

resolves an issue when resolving react-refresh for pnpm users
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"rollup": "^2.36.1",
"rollup-plugin-copy": "^3.3.0",
"semver": "^7.3.7",
"simple-git": "^3.2.4",
"simple-git": "^3.16.0",
"sort-package-json": "^1.55.0",
"strip-indent": "^3.0.0",
"tailwindcss": "^3.1.8",
Expand Down
14 changes: 7 additions & 7 deletions packages/remix-dev/compiler/compileBrowser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ const createEsbuildConfig = (
if (mode === "development" && config.future.unstable_dev) {
// TODO prebundle deps instead of chunking just these ones
let isolateChunks = [
"react",
"react/jsx-dev-runtime",
"react/jsx-runtime",
"react-dom",
"react-dom/client",
"react-refresh/runtime",
"@remix-run/react",
require.resolve("react"),
require.resolve("react/jsx-dev-runtime"),
require.resolve("react/jsx-runtime"),
require.resolve("react-dom"),
require.resolve("react-dom/client"),
require.resolve("react-refresh/runtime"),
require.resolve("@remix-run/react"),
"remix:hmr",
];
entryPoints = {
Expand Down
5 changes: 4 additions & 1 deletion packages/remix-dev/compiler/plugins/hmrPlugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ export let hmrPlugin = ({
};
});
build.onLoad({ filter: /.*/, namespace: "hmr-runtime" }, () => {
let reactRefreshRuntime = require
.resolve("react-refresh/runtime")
.replace(/\\/g, "/");
let contents = `
import RefreshRuntime from "react-refresh/runtime";
import RefreshRuntime from "${reactRefreshRuntime}";
declare global {
interface Window {
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-dev/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"gunzip-maybe": "^1.4.2",
"inquirer": "^8.2.1",
"jsesc": "3.0.2",
"json5": "^2.2.1",
"json5": "^2.2.2",
"lodash": "^4.17.21",
"lodash.debounce": "^4.0.8",
"lru-cache": "^7.14.1",
"minimatch": "^3.0.4",
"minimatch": "^3.0.5",
"node-fetch": "^2.6.7",
"ora": "^5.4.1",
"postcss": "^8.4.19",
Expand Down
79 changes: 36 additions & 43 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3581,9 +3581,9 @@
integrity sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==

"@xmldom/xmldom@^0.7.5":
version "0.7.5"
resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"
integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==
version "0.7.9"
resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.9.tgz#7f9278a50e737920e21b297b8a35286e9942c056"
integrity sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA==

"@yarnpkg/lockfile@^1.1.0":
version "1.1.0"
Expand Down Expand Up @@ -3915,13 +3915,13 @@ ansi-red@^0.1.1:
ansi-wrap "0.1.0"

ansi-regex@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
version "3.0.1"
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==

ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==

ansi-reset@^0.1.1:
Expand Down Expand Up @@ -5299,10 +5299,10 @@ debug@2.6.9, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
dependencies:
ms "2.0.0"

debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
version "4.3.3"
resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"
integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"

Expand All @@ -5313,13 +5313,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
dependencies:
ms "^2.1.1"

debug@^4.3.4:
version "4.3.4"
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"

decamelize-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"
Expand Down Expand Up @@ -7241,9 +7234,9 @@ htmlparser2@^6.1.0:
entities "^2.0.0"

http-cache-semantics@^4.0.0:
version "4.1.0"
resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
version "4.1.1"
resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==

http-errors@1.8.1:
version "1.8.1"
Expand Down Expand Up @@ -8552,15 +8545,15 @@ json5@^1.0.1:
minimist "^1.2.0"

json5@^2.1.2, json5@^2.2.1:
version "2.2.1"
resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==

json5@^2.2.2:
version "2.2.3"
resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==

json5@^2.2.2:
version "2.2.2"
resolved "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==

jsonc-parser@^3.2.0:
version "3.2.0"
resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
Expand Down Expand Up @@ -8773,17 +8766,17 @@ load-yaml-file@^0.2.0:
strip-bom "^3.0.0"

loader-utils@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
version "2.0.4"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
dependencies:
big.js "^5.2.2"
emojis-list "^3.0.0"
json5 "^2.1.2"

loader-utils@^3.2.0:
version "3.2.1"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==

locate-path@^5.0.0:
Expand Down Expand Up @@ -9676,20 +9669,20 @@ min-indent@^1.0.0:
resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==

minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"

minimatch@^3.1.2:
minimatch@^3.0.4, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"

minimatch@^3.0.5:
version "3.0.5"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
dependencies:
brace-expansion "^1.1.7"

minimatch@^5.0.1:
version "5.1.0"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"
Expand Down Expand Up @@ -11662,14 +11655,14 @@ signal-exit@^3.0.2, signal-exit@^3.0.3:
resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==

simple-git@^3.2.4:
version "3.2.4"
resolved "https://registry.npmjs.org/simple-git/-/simple-git-3.2.4.tgz"
integrity sha512-hkn1LgXW9bYqvAbge60m7W9iGljSTe2F66II03eNc4s+/czwHSUWEHe7UQlmWCfBxl6DiusD+6g0ifHbJlG8Xg==
simple-git@^3.16.0:
version "3.16.0"
resolved "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz#421773e24680f5716999cc4a1d60127b4b6a9dec"
integrity sha512-zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw==
dependencies:
"@kwsites/file-exists" "^1.1.1"
"@kwsites/promise-deferred" "^1.1.1"
debug "^4.3.3"
debug "^4.3.4"

simple-update-notifier@^1.0.7:
version "1.1.0"
Expand Down

0 comments on commit f942f81

Please sign in to comment.