Skip to content

Commit

Permalink
Merge branch 'main' into id
Browse files Browse the repository at this point in the history
  • Loading branch information
Timeless0911 authored Nov 18, 2024
2 parents 38737d4 + 190ca7c commit 1d241e2
Show file tree
Hide file tree
Showing 38 changed files with 1,272 additions and 1,100 deletions.
131 changes: 0 additions & 131 deletions .github/workflows/test-windows.yml

This file was deleted.

42 changes: 31 additions & 11 deletions .github/workflows/test-ubuntu.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test (Ubuntu)
name: Test

# Controls when the action will run.
on:
Expand Down Expand Up @@ -47,13 +47,17 @@ jobs:
- "!**/dictionary.txt"
# ======== ut ========
ut-ubuntu:
runs-on: ubuntu-latest
ut:
runs-on: ${{ matrix.os }}
needs: changes
if: ${{ needs.changes.outputs.changed == 'true' }}
strategy:
matrix:
os: [ubuntu-latest]
node-version: [18, 20, 22]
include:
- node-version: 18
os: windows-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -62,6 +66,12 @@ jobs:
with:
fetch-depth: 10

- name: Git config
if: ${{ matrix.os == 'windows-latest' }}
shell: bash
run: |
git config --system core.longpaths true
- name: Install Pnpm
run: corepack enable

Expand All @@ -78,16 +88,26 @@ jobs:
run: pnpm run test:unit

# ======== integration && e2e ========
integration-e2e-ubuntu:
runs-on: ubuntu-latest
integration-e2e:
runs-on: ${{ matrix.os }}
needs: changes
if: ${{ needs.changes.outputs.changed == 'true' }}
strategy:
matrix:
os: [ubuntu-latest]
node-version: [18, 20, 22]
include:
- node-version: 18
os: windows-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Git config
if: ${{ matrix.os == 'windows-latest' }}
shell: bash
run: |
git config --system core.longpaths true
- name: Checkout
uses: actions/checkout@v4
with:
Expand All @@ -103,7 +123,7 @@ jobs:
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install && cd ./tests && npx playwright install
run: pnpm install && cd ./tests && pnpx playwright install chromium

- name: Integration Test (Vitest)
run: pnpm run test:integration
Expand All @@ -112,11 +132,11 @@ jobs:
run: pnpm run test:e2e

# ======== benchmark ========
benchmark-ubuntu:
benchmark:
# Only Ubuntu 20.04 and 22.04 are supported at the moment.
# See https://github.com/CodSpeedHQ/action/blob/016456b513677f9d4a1c509c7f8a38d8dd55b2b0/.github/workflows/ci.yml#L19.
runs-on: ubuntu-22.04
needs: [integration-e2e-ubuntu]
needs: [integration-e2e]
strategy:
matrix:
node-version: [20]
Expand Down Expand Up @@ -151,8 +171,8 @@ jobs:
# ======== exit ========
pr-check-required:
if: (!cancelled() && !failure())
needs: [ut-ubuntu, integration-e2e-ubuntu, benchmark-ubuntu]
needs: [ut, integration-e2e, benchmark]
runs-on: ubuntu-latest
name: Test passed or skipped (Ubuntu)
name: Test passed or skipped
steps:
- run: echo "All tests passed or skipped (Ubuntu)."
- run: echo "All tests passed or skipped."
4 changes: 2 additions & 2 deletions examples/module-federation/mf-host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@module-federation/rsbuild-plugin": "^0.7.1",
"@rsbuild/core": "~1.1.0",
"@module-federation/rsbuild-plugin": "^0.7.5",
"@rsbuild/core": "~1.1.3",
"@rsbuild/plugin-react": "^1.0.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
Expand Down
8 changes: 4 additions & 4 deletions examples/module-federation/mf-react-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"storybook": "storybook dev -p 6006"
},
"devDependencies": {
"@module-federation/enhanced": "^0.7.1",
"@module-federation/rsbuild-plugin": "^0.7.1",
"@module-federation/storybook-addon": "^3.0.5",
"@module-federation/enhanced": "^0.7.5",
"@module-federation/rsbuild-plugin": "^0.7.5",
"@module-federation/storybook-addon": "^3.0.8",
"@rsbuild/plugin-react": "^1.0.7",
"@rslib/core": "workspace:*",
"@types/react": "^18.3.12",
"http-server": "^14.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"storybook": "^8.3.6",
"storybook": "^8.4.4",
"storybook-addon-rslib": "^0.1.4",
"storybook-react-rsbuild": "^0.1.4"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/module-federation/mf-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@module-federation/rsbuild-plugin": "^0.7.1",
"@rsbuild/core": "~1.1.0",
"@module-federation/rsbuild-plugin": "^0.7.5",
"@rsbuild/core": "~1.1.3",
"@rsbuild/plugin-react": "^1.0.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/react-component-bundle-false/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@rsbuild/plugin-react": "^1.0.7",
"@rsbuild/plugin-sass": "^1.1.0",
"@rsbuild/plugin-sass": "^1.1.1",
"@rslib/core": "workspace:*",
"@types/react": "^18.3.12",
"react": "^18.3.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/react-component-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@rsbuild/plugin-react": "^1.0.7",
"@rsbuild/plugin-sass": "^1.1.0",
"@rsbuild/plugin-sass": "^1.1.1",
"@rslib/core": "workspace:*",
"@types/react": "^18.3.12",
"react": "^18.3.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/react-component-umd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"@rsbuild/plugin-react": "^1.0.7",
"@rsbuild/plugin-sass": "^1.1.0",
"@rsbuild/plugin-sass": "^1.1.1",
"@rslib/core": "workspace:*",
"@types/react": "^18.3.12",
"react": "^18.3.1"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "rslib-monorepo",
"private": true,
"scripts": {
"build": "cross-env NX_DAEMON=false nx run-many -t build --exclude @examples/* --parallel=10",
"build": "cross-env NX_DAEMON=false nx run-many -t build --exclude @examples/* rslib-website --parallel=10",
"build:examples": "cross-env NX_DAEMON=false nx run-many -t build --projects @examples/* --parallel=10",
"change": "changeset",
"changeset": "changeset",
Expand Down Expand Up @@ -49,13 +49,13 @@
"cspell-ban-words": "^0.0.4",
"fs-extra": "^11.2.0",
"nano-staged": "^0.8.0",
"nx": "^20.0.12",
"nx": "^20.1.2",
"prettier": "^3.3.3",
"prettier-plugin-packagejson": "^2.5.3",
"simple-git-hooks": "^2.11.1",
"typescript": "^5.6.3",
"vitest": "^2.1.4",
"zx": "^8.2.1"
"vitest": "^2.1.5",
"zx": "^8.2.2"
},
"packageManager": "pnpm@9.12.1",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"prebundle": "prebundle"
},
"dependencies": {
"@rsbuild/core": "~1.1.0",
"@rsbuild/core": "~1.1.3",
"rsbuild-plugin-dts": "workspace:*",
"tinyglobby": "^0.2.10"
},
Expand All @@ -49,7 +49,7 @@
"memfs": "^4.14.0",
"picocolors": "1.1.1",
"prebundle": "1.2.5",
"rslib": "npm:@rslib/core@0.0.17",
"rslib": "npm:@rslib/core@0.0.18",
"rslog": "^1.2.3",
"tsconfck": "3.1.4",
"typescript": "^5.6.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"storybook": "storybook dev"
},
"devDependencies": {
"@rsbuild/core": "~1.1.0",
"@storybook/addon-essentials": "^8.4.2",
"@storybook/addon-interactions": "^8.4.2",
"@storybook/addon-links": "^8.4.2",
"@storybook/addon-onboarding": "^8.4.2",
"@storybook/blocks": "^8.4.2",
"@storybook/react": "^8.4.2",
"@storybook/test": "^8.4.2",
"storybook": "^8.4.2",
"storybook-addon-rslib": "^0.1.3",
"storybook-react-rsbuild": "^0.1.3"
"@rsbuild/core": "~1.1.3",
"@storybook/addon-essentials": "^8.4.4",
"@storybook/addon-interactions": "^8.4.4",
"@storybook/addon-links": "^8.4.4",
"@storybook/addon-onboarding": "^8.4.4",
"@storybook/blocks": "^8.4.4",
"@storybook/react": "^8.4.4",
"@storybook/test": "^8.4.4",
"storybook": "^8.4.4",
"storybook-addon-rslib": "^0.1.4",
"storybook-react-rsbuild": "^0.1.4"
}
}
Loading

0 comments on commit 1d241e2

Please sign in to comment.