fix pnpm filters for 7.x (#1927)

* fix pnpm filters for 7.x

* update ci to use pnpm 7

* try a thing

* reinstall types

* usin pnpm dlx instead of pnpx

* usin pnpm dlx instead of pnpx

* explicitly add playwright as dependency

* update lockfile

* update ci

* update ci

* install same version of @playwright/test and playwright

* fix browser downloads
This commit is contained in:
pngwn 2022-08-02 12:02:06 -07:00 committed by GitHub
parent 653b54d3c0
commit a039810e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 106 additions and 988 deletions

View File

@ -30,7 +30,7 @@ jobs:
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v2.2.2 uses: pnpm/action-setup@v2.2.2
with: with:
version: 6.32.11 version: 7
- name: Install pip - name: Install pip
run: python -m pip install pip wheel run: python -m pip install pip wheel
- name: Build pypi package - name: Build pypi package

View File

@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.1 - uses: pnpm/action-setup@v2.2.1
with: with:
version: 6 version: 7
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 16
@ -47,14 +47,14 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.1 - uses: pnpm/action-setup@v2.2.1
with: with:
version: 6 version: 7
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 16
cache: pnpm cache: pnpm
cache-dependency-path: ui/pnpm-lock.yaml cache-dependency-path: ui/pnpm-lock.yaml
- run: pnpm install --frozen-lockfile - run: pnpm install --frozen-lockfile
- run: pnpx playwright install chromium - run: pnpm exec playwright install chromium
- run: pnpm build - run: pnpm build
- run: pnpm test:browser - run: pnpm test:browser
- name: Upload failed tests screenshots - name: Upload failed tests screenshots

1
ui/.npmrc Normal file
View File

@ -0,0 +1 @@
strict-peer-dependencies=false

View File

@ -3,23 +3,23 @@
"version": "0.0.1", "version": "0.0.1",
"description": "Gradio UI packages", "description": "Gradio UI packages",
"scripts": { "scripts": {
"workbench": "pnpm dev --filter @gradio/workbench", "workbench": "pnpm --filter @gradio/workbench dev",
"dev": "pnpm dev --filter @gradio/app", "dev": "pnpm --filter @gradio/app dev",
"build": "pnpm build:local --filter @gradio/app --emptyOutDir", "build": "pnpm --filter @gradio/app build:local --emptyOutDir",
"build:cdn": "pnpm build:cdn --filter @gradio/app --emptyOutDir", "build:cdn": "pnpm --filter @gradio/app build:cdn --emptyOutDir",
"build:website": "pnpm build:website --filter @gradio/app --emptyOutDir", "build:website": "pnpm --filter @gradio/app build:website --emptyOutDir",
"build:cdn-local": "TEST_CDN=TRUE pnpm build:cdn", "build:cdn-local": "TEST_CDN=TRUE pnpm build:cdn",
"preview:cdn-server": "sirv ../gradio/templates/cdn --single --port=4321 --cors", "preview:cdn-server": "sirv ../gradio/templates/cdn --single --port=4321 --cors",
"preview:cdn-app": "pnpm dev --filter @gradio/cdn-test", "preview:cdn-app": "pnpm --filter @gradio/cdn-test dev",
"preview:cdn-local": "run-p preview:cdn-server preview:cdn-app", "preview:cdn-local": "run-p preview:cdn-server preview:cdn-app",
"format:check": "prettier --check --plugin-search-dir=. .", "format:check": "prettier --check --plugin-search-dir=. .",
"format:write": "prettier --write --plugin-search-dir=. .", "format:write": "prettier --write --plugin-search-dir=. .",
"ts:check": "svelte-check --tsconfig tsconfig.json", "ts:check": "svelte-check --tsconfig tsconfig.json",
"test": "vitest dev", "test": "vitest dev",
"test:run": "vitest run", "test:run": "vitest run",
"test:browser": "pnpm test:browser --filter @gradio/app", "test:browser": "pnpm --filter @gradio/app test:browser",
"test:browser:full": "run-s build test:browser", "test:browser:full": "run-s build test:browser",
"test:browser:debug": "pnpm test:browser:debug --filter @gradio/app" "test:browser:debug": "pnpm --filter @gradio/app test:browser:debug"
}, },
"type": "module", "type": "module",
"author": "", "author": "",
@ -27,7 +27,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@gradio/tootils": "workspace:^0.0.1", "@gradio/tootils": "workspace:^0.0.1",
"@playwright/test": "^1.20.0", "@playwright/test": "^1.24.2",
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.44", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.44",
"@tailwindcss/forms": "^0.5.0", "@tailwindcss/forms": "^0.5.0",
"@testing-library/dom": "^8.11.3", "@testing-library/dom": "^8.11.3",
@ -39,6 +39,7 @@
"happy-dom": "^2.49.0", "happy-dom": "^2.49.0",
"node-html-parser": "^5.3.3", "node-html-parser": "^5.3.3",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"playwright": "^1.24.2",
"plotly.js-dist-min": "^2.10.1", "plotly.js-dist-min": "^2.10.1",
"polka": "^1.0.0-next.22", "polka": "^1.0.0-next.22",
"postcss": "^8.4.5", "postcss": "^8.4.5",
@ -58,7 +59,6 @@
"vitest": "^0.12.7" "vitest": "^0.12.7"
}, },
"devDependencies": { "devDependencies": {
"@types/tailwindcss": "^3.1.0",
"@types/three": "^0.138.0" "@types/three": "^0.138.0"
} }
} }

View File

@ -8,8 +8,8 @@
"build:website": "vite build --mode production:website --emptyOutDir", "build:website": "vite build --mode production:website --emptyOutDir",
"build:local": "vite build --mode production:local --emptyOutDir", "build:local": "vite build --mode production:local --emptyOutDir",
"preview": "vite preview", "preview": "vite preview",
"test:browser": "pnpx playwright test test/ --config=../../playwright.config.js", "test:browser": "pnpm exec playwright test test/ --config=../../playwright.config.js",
"test:browser:debug": "pnpx playwright test test/ --debug --config=../../playwright.config.js" "test:browser:debug": "pnpm exec playwright test test/ --debug --config=../../playwright.config.js"
}, },
"dependencies": { "dependencies": {
"@gradio/atoms": "workspace:^0.0.1", "@gradio/atoms": "workspace:^0.0.1",

View File

@ -10,6 +10,7 @@
"dependencies": { "dependencies": {
"@gradio/upload": "workspace:^0.0.1", "@gradio/upload": "workspace:^0.0.1",
"@gradio/utils": "workspace:^0.0.1", "@gradio/utils": "workspace:^0.0.1",
"@types/d3-dsv": "^3.0.0",
"d3-dsv": "^3.0.1", "d3-dsv": "^3.0.1",
"dequal": "^2.0.2" "dequal": "^2.0.2"
} }

File diff suppressed because it is too large Load Diff