Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Fix yarn dev #1501

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Chore: Fix yarn dev #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48ea48a
Chore: upgrade turbo & fix yarn dev
Juice10 Jun 10, 2024
cb3f53e
add empty changeset
Juice10 Jun 10, 2024
b42aec9
chore: add PUPPETEER_HEADLESS to passThroughEnv in test command
Juice10 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/eleven-toys-vanish.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "@rrweb/_monorepo",
"description": "record and replay the web",
"repository": {
"type": "git",
Expand All @@ -22,6 +23,7 @@
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.1",
"@monorepo-utils/workspaces-to-typescript-project-references": "^2.8.2",
"@types/prettier": "2.7.3",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"browserslist": "^4.22.1",
Expand All @@ -34,7 +36,7 @@
"markdownlint": "^0.25.1",
"markdownlint-cli": "^0.31.1",
"prettier": "2.8.4",
"turbo": "^1.2.4",
"turbo": "^2.0.3",
"typescript": "^4.9.5"
},
"scripts": {
Expand All @@ -45,7 +47,7 @@
"check-types": "yarn turbo run check-types --continue",
"format": "yarn prettier --write '**/*.{ts,md}'",
"format:head": "git diff --name-only HEAD^ |grep '\\.ts$\\|\\.md$' |xargs yarn prettier --write",
"dev": "yarn turbo run dev",
"dev": "CLEAR_DIST_DIR=false yarn turbo run dev --concurrency=17",
"repl": "cd packages/rrweb && npm run repl",
"live-stream": "cd packages/rrweb && yarn live-stream",
"lint": "yarn run concurrently --success=all -r -m=1 'yarn run markdownlint docs' 'yarn eslint packages/*/src --ext .ts,.tsx,.js,.jsx,.svelte'",
Expand All @@ -59,5 +61,6 @@
"browserslist": [
"defaults",
"not op_mini all"
]
],
"packageManager": "[email protected]"
}
37 changes: 29 additions & 8 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
{
"$schema": "https://turborepo.org/schema.json",
"baseBranch": "origin/master",
"pipeline": {
// These root workspace files are reused in workspaces and may affect their build output
"globalDependencies": [
".eslintrc.js",
".prettierrc",
"lerna.json",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Juice10 Do you think it's OK to remove lerna config since we are not using it anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I've created a PR for it here: #1506

"vite.config.defaults.ts",
"tsconfig.json"
],
"tasks": {
"prepublish": {
"dependsOn": ["^prepublish"],
"outputs": ["lib/**", "es/**", "dist/**", "typings/**"]
"outputs": [
"lib/**",
"es/**",
"dist/**",
"typings/**",
".svelte-kit/**",
"types/**"
]
},
"test": {
"dependsOn": ["^prepublish"]
"dependsOn": ["^prepublish"],
"passThroughEnv": ["PUPPETEER_HEADLESS"]
},
"test:watch": {
"persistent": true
"persistent": true,
"passThroughEnv": ["PUPPETEER_HEADLESS"]
},
"test:update": {},
"dev": {
"test:update": {
"dependsOn": ["^prepublish"],
"persistent": true
"passThroughEnv": ["PUPPETEER_HEADLESS"]
},
"dev": {
// "dependsOn": ["^prepublish"],
"persistent": true,
"cache": false,
"passThroughEnv": ["CLEAR_DIST_DIR"]
},
"lint": {},
"check-types": {}
Expand Down
9 changes: 6 additions & 3 deletions vite.config.default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import glob from 'fast-glob';
import { build, Format } from 'esbuild';
import { resolve } from 'path';
import { umdWrapper } from 'esbuild-plugin-umd-wrapper';

const emptyOutDir = process.env.CLEAR_DIST_DIR !== 'false';

function minifyAndUMDPlugin({
name,
outDir,
Expand Down Expand Up @@ -107,7 +110,7 @@ export default function (

let formats: LibraryFormats[] = ['es', 'cjs'];

return defineConfig({
return defineConfig(() => ({
build: {
// See https://vitejs.dev/guide/build.html#library-mode
lib: {
Expand All @@ -122,7 +125,7 @@ export default function (

outDir,

emptyOutDir: true,
emptyOutDir,

// Leaving this unminified so you can see what exactly gets included in
// the bundles
Expand Down Expand Up @@ -155,5 +158,5 @@ export default function (
minifyAndUMDPlugin({ name, outDir }),
...plugins,
],
});
}));
}
115 changes: 39 additions & 76 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3079,6 +3079,11 @@
dependencies:
"@types/node" "*"

"@types/[email protected]":
version "2.7.3"
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==

"@types/prettier@^2.1.5":
version "2.4.1"
resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz"
Expand Down Expand Up @@ -10764,89 +10769,47 @@ tty-table@^4.1.5:
wcwidth "^1.0.1"
yargs "^17.1.1"

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.2.16.tgz#1586fd6e52ffb5ad5e1e3ec8afe1c873f7fd98d9"
integrity sha512-dyitLQJdH3uLVdlH9jAkP4LqEO/K+wOXjUqOzjTciRLjQPzmsNY60/bmFHODADK4eBBl1nxbtn7tmmoT4vS1qA==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.2.16.tgz#3faf9c657fa5feb16465316ac8d47c4a2790c2f1"
integrity sha512-Ex6uM4HU7rGXdhvJMpzNpp6qxglJ98nWeIi5qR/lBXHLjK3UCvSW8BEALArUJYJTXS9FZBq1a5LowFqXYsfDcA==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-freebsd-64/-/turbo-freebsd-64-1.2.16.tgz#2674c2078eaa79200a3b91639e530b287a735cb4"
integrity sha512-onRGKMvog8B3XDssSBIAg+FrEq9pcBoAybP7bpi/uYIH1L/WQ7YMmLn88X9JX19ehYuVOVZrjap4jWH2GIkU8A==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-freebsd-arm64/-/turbo-freebsd-arm64-1.2.16.tgz#88cc25733b19880b4a14a9d4f34770da9e898a92"
integrity sha512-S0EqPqxwnJuVNNXRgcHB0r8ai8LSrpHdihVJKRM7WYmIR7isccBEf/G9agrt73sCXwjvenxFs4HDR7cSvGt14Q==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-32/-/turbo-linux-32-1.2.16.tgz#7c60a19acd32862085566da0f9389d2db36a7aee"
integrity sha512-ecbqmGOxgTWePGrowtwyvZGfvwaLxFWmPK21cU0PS+fzoZBaVmzYmniTdd/2EkGCw7TOPhtiT22v96fWcnRycA==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.2.16.tgz#d589bf73bbfa38fa73ad8ec786c0b89b678e7af8"
integrity sha512-q6gtdMWCzM0Sktkd73zcaQjNoeM1MjtrbwQBctWN/Sgj0eiPBPnzpIvokvx98x7RLf4qyI99/mlme0Dn5fx21A==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.2.16.tgz#9eaaee4094f71a266553248dfaadc59756696242"
integrity sha512-gUf67tYJ/N09WAZTTmtUWYrqm381tZxiulnRGAIM+iRsaTrweyUKZaYXwJvlPpI/cQOw25wCG9/IyvxLeagL8A==

[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-arm/-/turbo-linux-arm-1.2.16.tgz#54774c7e6e4f91ebdb211fa48b1b2a46b1e3c61c"
integrity sha512-du7uvExELNb89V3g7iM0XP21fR1Yl3EoHRcOfQz32oUqnS7idCKvbEowM9LtiluQl1dKcOIJjn1nlvvsqzkhOg==
[email protected]:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-2.0.3.tgz#52c5f79b4027dfd0184fb963da41bf989be4a00d"
integrity sha512-v7ztJ8sxdHw3SLfO2MhGFeeU4LQhFii1hIGs9uBiXns/0YTGOvxLeifnfGqhfSrAIIhrCoByXO7nR9wlm10n3Q==

turbo-[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-mips64le/-/turbo-linux-mips64le-1.2.16.tgz#fa49b858f8ed399b44cdce285a0feb67c30ee99b"
integrity sha512-U5BM+Ql3z13uRtwMmKH/8eL+9DdTgyijC2gaX4xP0RTlcN7WfAstg8Fg/Tn2Vw9vtpVDdxwpw7dvX4kw2ghhpA==
turbo-[email protected]:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-2.0.3.tgz#46fa54d0cd95782ac38015e3396d59cdbdeb1eb8"
integrity sha512-LUcqvkV9Bxtng6QHbevp8IK8zzwbIxM6HMjCE7FEW6yJBN1KwvTtRtsGBwwmTxaaLO0wD1Jgl3vgkXAmQ4fqUw==

turbo-linux-[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-linux-ppc64le/-/turbo-linux-ppc64le-1.2.16.tgz#0a419310b938ef5eace46cb6c53b18099caae60c"
integrity sha512-HQWSCmVZyc5chw7Ie2ZcfZPfmM06mbEEu0Wl11Y5QWh1ZzhPNQHs/TsF4I9r146wHi62XgcrKFjkw4ARZiWsLA==
turbo-linux-[email protected]:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-2.0.3.tgz#17d6714b32381d474ef2ee5613343165f9bd75bc"
integrity sha512-xpdY1suXoEbsQsu0kPep2zrB8ijv/S5aKKrntGuQ62hCiwDFoDcA/Z7FZ8IHQ2u+dpJARa7yfiByHmizFE0r5Q==

turbo-[email protected]:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-windows-32/-/turbo-windows-32-1.2.16.tgz#8307dea3fab91be4e3e46aa37d76ce8e7ce3fdcb"
integrity sha512-0ZtPz5FK2qZjznMG4vvRyaabrhO8BgbN+tBx1wjXSuoICTAjYi5TwRVVRh59c3x7qQmR21Cv33CrhLBPRfeAlg==
turbo-[email protected]:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-2.0.3.tgz#4f1bfe421dcecf2fb1164a1e223ba310d6e28b6f"
integrity sha512-MBACTcSR874L1FtLL7gkgbI4yYJWBUCqeBN/iE29D+8EFe0d3fAyviFlbQP4K/HaDYet1i26xkkOiWr0z7/V9A==

turbo-windows-64@1.2.16:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.2.16.tgz#9f5f725d6ab829d3cf7944ba92714e9e5bdd09d0"
integrity sha512-j8iAIixq/rGfBpHNbYOosxMasZrGuMzLILEuQGDxZgKNpYgobJ15QFHQlGR9sit1b8qPU5zZX4CtByRtkgH1Bw==
turbo-windows-64@2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-2.0.3.tgz#9d1b99aff361bcbf4e065029e9dfa6682a0c0b2d"
integrity sha512-zi3YuKPkM9JxMTshZo3excPk37hUrj5WfnCqh4FjI26ux6j/LJK+Dh3SebMHd9mR7wP9CMam4GhmLCT+gDfM+w==

turbo-windows-arm64@1.2.16:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.2.16.tgz#75894186e9f1d6340a30c436d563c34999e5b87c"
integrity sha512-4GpcJG3B8R9WDhwfT8fu6ZmOOfseCg6Q1cy/G8/zpJQk769yYcSnD8MgQhYgHB58aVFxZcMxBvLL6UA0UrpgWA==
turbo-windows-arm64@2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-2.0.3.tgz#0e0641acda3325a4a3d28123ef21017a7aae8f38"
integrity sha512-wmed4kkenLvRbidi7gISB4PU77ujBuZfgVGDZ4DXTFslE/kYpINulwzkVwJIvNXsJtHqyOq0n6jL8Zwl3BrwDg==

turbo@^1.2.4:
version "1.2.16"
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.2.16.tgz#324c2d586f6fa77aa9173274f3b9d9efbe0735e4"
integrity sha512-PPUa2COKgFkyb6N3uF9AnIY3l9FZkF15QQ3U1K2wpI01D3gyGKQO0Q3DUQ4ipmciP0teBfL7H+l/QTrUA9IVvQ==
turbo@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/turbo/-/turbo-2.0.3.tgz#789f64666d15dbc6fc85ce507a6c6888d70df88f"
integrity sha512-jF1K0tTUyryEWmgqk1V0ALbSz3VdeZ8FXUo6B64WsPksCMCE48N5jUezGOH2MN0+epdaRMH8/WcPU0QQaVfeLA==
optionalDependencies:
turbo-darwin-64 "1.2.16"
turbo-darwin-arm64 "1.2.16"
turbo-freebsd-64 "1.2.16"
turbo-freebsd-arm64 "1.2.16"
turbo-linux-32 "1.2.16"
turbo-linux-64 "1.2.16"
turbo-linux-arm "1.2.16"
turbo-linux-arm64 "1.2.16"
turbo-linux-mips64le "1.2.16"
turbo-linux-ppc64le "1.2.16"
turbo-windows-32 "1.2.16"
turbo-windows-64 "1.2.16"
turbo-windows-arm64 "1.2.16"
turbo-darwin-64 "2.0.3"
turbo-darwin-arm64 "2.0.3"
turbo-linux-64 "2.0.3"
turbo-linux-arm64 "2.0.3"
turbo-windows-64 "2.0.3"
turbo-windows-arm64 "2.0.3"

type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
Expand Down
Loading