Skip to content

Commit

Permalink
Merge branch 'dev' into fix-import-svg-from-node-modules
Browse files Browse the repository at this point in the history
  • Loading branch information
pcattori authored Aug 8, 2023
2 parents 61dc58a + ba992fa commit 7b51abe
Show file tree
Hide file tree
Showing 32 changed files with 203 additions and 1,884 deletions.
5 changes: 5 additions & 0 deletions .changeset/fix-stub-route-object-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/testing": patch
---

Fix types for `StubRouteObject` `children` property
44 changes: 44 additions & 0 deletions .github/workflows/deduplicate-yarn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: ⚙️ Deduplicate yarn.lock

on:
push:
branches:
- dev
paths:
- ./yarn.lock

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
format:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest

steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v3

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version-file: ".nvmrc"
cache: "yarn"

- name: ️️⚙️ Dedupe yarn.lock
run: npx yarn-deduplicate && rm -rf ./node_modules && yarn

- name: 💪 Commit
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git add .
if [ -z "$(git status --porcelain)" ]; then
echo "💿 no deduplication needed"
exit 0
fi
git commit -m "chore: deduplicate `yarn.lock`"
git push
echo "💿 https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
7 changes: 2 additions & 5 deletions docs/guides/envvars.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@ Then, you can pass those through via `getLoadContext` in your server file:
```ts
export const onRequest = createPagesFunctionHandler({
build,
getLoadContext(context) {
// Hand-off Cloudflare ENV vars to the Remix `context` object
return { env: context.env };
},
mode: process.env.NODE_ENV,
getLoadContext: (context) => ({ env: context.env }), // Hand-off Cloudflare ENV vars to the Remix `context` object
mode: build.mode,
});
```

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/manual-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ app.all(
? createDevRequestHandler(build)
: createRequestHandler({
build,
mode: process.env.NODE_ENV,
mode: build.mode,
})
);
```
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/styling.md
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ export const links: LinksFunction = () => [

With this setup in place, you can also use [Tailwind's functions and directives][tailwind-functions-and-directives] anywhere in your CSS. Note that Tailwind will warn that no utility classes were detected in your source files if you never used it before.

If you're also using Remix's [built-in PostCSS support][built-in-post-css-support], the Tailwind PostCSS plugin will be automatically included if it's missing, but you can also choose to manually include the Tailwind plugin in your PostCSS config instead if you prefer.
Tailwind doesn't compile CSS for older browsers by default, so if you'd like to achieve this using a PostCSS-based tool like [Autoprefixer][autoprefixer], you'll need to leverage Remix's [built-in PostCSS support][built-in-post-css-support]. When using both PostCSS and Tailwind, the Tailwind plugin will be automatically included if it's missing, but you can also choose to manually include the Tailwind plugin in your PostCSS config instead if you prefer.

If you're using VS Code, it's recommended you install the [Tailwind IntelliSense extension][tailwind-intelli-sense-extension] for the best developer experience.

Expand Down
Loading

0 comments on commit 7b51abe

Please sign in to comment.