Skip to content

Commit

Permalink
Merge branch 'canary' into sokra/filter-entry-css-files
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra authored Sep 20, 2023
2 parents 184f511 + 0afffdd commit b84f520
Show file tree
Hide file tree
Showing 124 changed files with 13,521 additions and 4,694 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,18 @@ jobs:
afterBuild: rustup target add wasm32-unknown-unknown && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && node ./scripts/normalize-version-bump.js && turbo run build-wasm -- --target nodejs --features tracing/release_max_level_info && git checkout . && mv packages/next-swc/crates/wasm/pkg packages/next-swc/crates/wasm/pkg-nodejs && node ./scripts/setup-wasm.mjs && NEXT_TEST_MODE=start TEST_WASM=true node run-tests.js test/integration/production/test/index.test.js test/e2e/streaming-ssr/index.test.ts
secrets: inherit

test-unit:
name: test unit
strategy:
fail-fast: false

uses: ./.github/workflows/build_reusable.yml
with:
skipForDocsOnly: 'yes'
afterBuild: node run-tests.js -c ${TEST_CONCURRENCY} --type unit

secrets: inherit

test-dev:
name: test dev
needs: ['build-native', 'build-next']
Expand Down Expand Up @@ -215,7 +227,7 @@ jobs:
secrets: inherit

report-test-results:
needs: ['test-dev', 'test-prod', 'test-integration']
needs: ['test-unit', 'test-dev', 'test-prod', 'test-integration']
uses: ./.github/workflows/build_reusable.yml
with:
skipForDocsOnly: 'yes'
Expand All @@ -230,6 +242,7 @@ jobs:
'lint',
'validate-docs-links',
'check-types-precompiled',
'test-unit',
'test-dev',
'test-prod',
'test-integration',
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/issue_validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Nissuer
uses: balazsorban44/nissuer@1.3.5
uses: balazsorban44/nissuer@1.4.0
with:
label-area-prefix: 'area:'
label-area-section: 'Which area\(s\) are affected\? \(Select all that apply\)(.*)### Additional context'
Expand All @@ -32,3 +32,4 @@ jobs:
reproduction-hosts: 'github.com,codesandbox.io'
reproduction-link-section: '### Link to the code that reproduces this issue(.*)### To Reproduce'
reproduction-invalid-label: 'invalid link'
reproduction-issue-labels: 'template: bug'
74 changes: 37 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ swc_core = { version = "0.83.12", features = [
testing = { version = "0.34.1" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230917.1" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230918.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230917.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230918.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230917.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230918.2" }

# General Deps

Expand Down
Loading

0 comments on commit b84f520

Please sign in to comment.