-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into brophdawg11/error-response-type
- Loading branch information
Showing
38 changed files
with
1,857 additions
and
2,178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@remix-run/serve": major | ||
| --- | ||
|
|
||
| integrate manual mode in remix-serve |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@remix-run/server-runtime": patch | ||
| --- | ||
|
|
||
| Ensure `maxAge`/`expires` options passed to `commitSession` take precedence over the original `cookie.expires` value ([#6598](https://github.com/remix-run/remix/pull/6598)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@remix-run/node": patch | ||
| --- | ||
|
|
||
| remove recursion from stream utilities |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| name: 🛠️ Build | ||
|
|
||
| on: | ||
| workflow_call: | ||
|
|
||
| env: | ||
| CI: true | ||
| CYPRESS_INSTALL_BINARY: 0 | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: 🛑 Cancel Previous Runs | ||
| uses: styfle/cancel-workflow-action@0.11.0 | ||
|
|
||
| - name: ⬇️ Checkout repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: ⎔ Setup node | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version-file: ".nvmrc" | ||
| cache: "yarn" | ||
|
|
||
| - name: Disable GitHub Actions Annotations | ||
| run: | | ||
| echo "::remove-matcher owner=tsc::" | ||
| echo "::remove-matcher owner=eslint-compact::" | ||
| echo "::remove-matcher owner=eslint-stylish::" | ||
| - name: 📥 Install deps | ||
| run: yarn --frozen-lockfile | ||
|
|
||
| - name: 🏗 Build | ||
| run: yarn build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| name: 🧪 Test (Integration) | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| os: | ||
| required: true | ||
| type: string | ||
| node_version: | ||
| required: true | ||
| # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457) | ||
| # but we want to pass an array (node_version: "[18, 20]"), | ||
| # so we'll need to manually stringify it for now | ||
| type: string | ||
| browser: | ||
| required: true | ||
| # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457) | ||
| # but we want to pass an array (browser: "['chromium', 'firefox']"), | ||
| # so we'll need to manually stringify it for now | ||
| type: string | ||
|
|
||
| env: | ||
| CI: true | ||
| CYPRESS_INSTALL_BINARY: 0 | ||
|
|
||
| jobs: | ||
| integration: | ||
| name: "${{ inputs.os }} / node@${{ matrix.node }} / ${{ matrix.browser }}" | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| node: ${{ fromJSON(inputs.node_version) }} | ||
| browser: ${{ fromJSON(inputs.browser) }} | ||
|
|
||
| runs-on: ${{ inputs.os }} | ||
| steps: | ||
| - name: 🛑 Cancel Previous Runs | ||
| uses: styfle/cancel-workflow-action@0.11.0 | ||
|
|
||
| - name: ⬇️ Checkout repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: ⎔ Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
| cache: "yarn" | ||
|
|
||
| - name: Disable GitHub Actions Annotations | ||
| run: | | ||
| echo "::remove-matcher owner=tsc::" | ||
| echo "::remove-matcher owner=eslint-compact::" | ||
| echo "::remove-matcher owner=eslint-stylish::" | ||
| - name: 📥 Install deps | ||
| run: yarn --frozen-lockfile | ||
|
|
||
| - name: 📥 Install Playwright | ||
| run: npx playwright install --with-deps ${{ matrix.browser }} | ||
|
|
||
| - name: 👀 Run Integration Tests ${{ matrix.browser }} | ||
| run: "yarn test:integration --project=${{ matrix.browser }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| name: 🧪 Test (Unit) | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| os: | ||
| required: true | ||
| type: string | ||
| node_version: | ||
| required: true | ||
| # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457) | ||
| # but we want to pass an array (node_version: "[18, 20]"), | ||
| # so we'll need to manually stringify it for now | ||
| type: string | ||
|
|
||
| env: | ||
| CI: true | ||
| CYPRESS_INSTALL_BINARY: 0 | ||
|
|
||
| jobs: | ||
| test: | ||
| name: "${{ inputs.os }} / node@${{ matrix.node }}" | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| node: ${{ fromJSON(inputs.node_version) }} | ||
| runs-on: ${{ inputs.os }} | ||
| steps: | ||
| - name: 🛑 Cancel Previous Runs | ||
| uses: styfle/cancel-workflow-action@0.11.0 | ||
|
|
||
| - name: ⬇️ Checkout repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: ⎔ Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
| cache: "yarn" | ||
|
|
||
| - name: Disable GitHub Actions Annotations | ||
| run: | | ||
| echo "::remove-matcher owner=tsc::" | ||
| echo "::remove-matcher owner=eslint-compact::" | ||
| echo "::remove-matcher owner=eslint-stylish::" | ||
| - name: 📥 Install deps | ||
| run: yarn --frozen-lockfile | ||
|
|
||
| # It's faster to use the built `cli.js` in tests if its available and up-to-date | ||
| - name: 🏗 Build | ||
| run: yarn build | ||
|
|
||
| - name: 🧪 Run Primary Tests | ||
| run: "yarn test:primary" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| name: Branch | ||
|
|
||
| # main/dev branches will get the full run across all OS/browsers | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| - dev | ||
| paths-ignore: | ||
| - "docs/**" | ||
| - "scripts/**" | ||
| - "contributors.yml" | ||
| - "**/*.md" | ||
|
|
||
| jobs: | ||
| build: | ||
| name: "⚙️ Build" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-build.yml | ||
|
|
||
| unit-ubuntu: | ||
| name: "🧪 Unit Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-unit.yml | ||
| with: | ||
| os: "ubuntu-latest" | ||
| node_version: '["latest"]' | ||
|
|
||
| unit-windows: | ||
| name: "🧪 Unit Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-unit.yml | ||
| with: | ||
| os: "windows-latest" | ||
| node_version: '["latest"]' | ||
|
|
||
| integration-ubuntu: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "ubuntu-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["chromium", "firefox"]' | ||
|
|
||
| integration-windows: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "windows-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["msedge"]' | ||
|
|
||
| integration-macos: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "macos-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["webkit"]' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| name: PR (Base) | ||
|
|
||
| # All PRs touching code will run tests on ubuntu/node/chromium | ||
|
|
||
| on: | ||
| pull_request: | ||
| paths-ignore: | ||
| - "docs/**" | ||
| - "scripts/**" | ||
| - "contributors.yml" | ||
| - "**/*.md" | ||
|
|
||
| jobs: | ||
| build: | ||
| name: "⚙️ Build" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-build.yml | ||
|
|
||
| unit-ubuntu: | ||
| name: "🧪 Unit Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-unit.yml | ||
| with: | ||
| os: "ubuntu-latest" | ||
| node_version: '["latest"]' | ||
|
|
||
| integration-chromium: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "ubuntu-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["chromium"]' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: PR (Full) | ||
|
|
||
| # PRs touching create-remix/remix-dev will also run on Windows and OSX | ||
|
|
||
| on: | ||
| pull_request: | ||
| paths: | ||
| - "packages/create-remix/**" | ||
| - "packages/remix-dev/**" | ||
| - "!**/*.md" | ||
|
|
||
| jobs: | ||
| unit-windows: | ||
| name: "🧪 Unit Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-unit.yml | ||
| with: | ||
| os: "windows-latest" | ||
| node_version: '["latest"]' | ||
|
|
||
| integration-firefox: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "ubuntu-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["firefox"]' | ||
|
|
||
| integration-msedge: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "windows-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["msedge"]' | ||
|
|
||
| integration-webkit: | ||
| name: "👀 Integration Test" | ||
| if: github.repository == 'remix-run/remix' | ||
| uses: ./.github/workflows/shared-test-integration.yml | ||
| with: | ||
| os: "macos-latest" | ||
| node_version: '["latest"]' | ||
| browser: '["webkit"]' |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.