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

[FIX] Too many watchers in dev environment. #25930

Merged
merged 7 commits into from
Jun 29, 2022
Merged

[FIX] Too many watchers in dev environment. #25930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8b8e74
Use a single watcher
gabriellsh Jun 20, 2022
ac94a38
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh Jun 20, 2022
482a705
remove `composite` from meteor packages
gabriellsh Jun 20, 2022
5408ebe
Fix composite placement and templates
gabriellsh Jun 20, 2022
4f4a02a
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh Jun 27, 2022
4ab9ec6
Merge branch 'develop' into fix/turbo
ggazzo Jun 28, 2022
e3d86d5
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh Jun 29, 2022
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ yarn-error.log*

.nvmrc
.idea/

*.tsbuildinfo
3 changes: 2 additions & 1 deletion _templates/package/new/tsconfig.json.ejs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ to: packages/<%= name %>/tsconfig.json
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
"outDir": "./dist",
"composite": true
},
"include": ["./src/**/*"]
}
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"build:services": "turbo run build --filter=rocketchat-services...",
"build:ci": "turbo run build:ci",
"testunit": "turbo run testunit",
"dev": "turbo run dev --parallel --filter=@rocket.chat/meteor...",
"dev:root": "tsc -b --watch --preserveWatchOutput",
"dev": "turbo run //#dev:root dev --parallel --filter=@rocket.chat/meteor...",
"dsv": "turbo run dsv --filter=@rocket.chat/meteor...",
"lint": "turbo run lint",
"storybook": "yarn workspace @rocket.chat/meteor run storybook"
Expand All @@ -19,7 +20,8 @@
"@types/chart.js": "^2.9.37",
"@types/js-yaml": "^4.0.5",
"husky": "^7.0.4",
"turbo": "1.2.5"
"turbo": "^1.2.16",
"typescript": "~4.3.4"
},
"workspaces": [
"apps/*",
Expand Down
3 changes: 1 addition & 2 deletions packages/api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"build": "tsc -p tsconfig.json",
"dev": "tsc --watch --preserveWatchOutput -p tsconfig.json"
"build": "tsc -p tsconfig.json"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/api-client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
1 change: 0 additions & 1 deletion packages/core-typings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"test": "echo \"Error: no test specified\" && exit 1",
"dev": "tsc --watch --preserveWatchOutput -p tsconfig.json",
"build": "rm -rf dist && tsc -p tsconfig.json"
},
"main": "./dist/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/core-typings/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
1 change: 0 additions & 1 deletion packages/rest-typings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"dev": "tsc --watch --preserveWatchOutput -p tsconfig.json",
"build": "rm -rf dist && tsc -p tsconfig.json"
},
"main": "./dist/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/rest-typings/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
1 change: 0 additions & 1 deletion packages/ui-contexts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"dev": "tsc --watch --preserveWatchOutput -p tsconfig.json",
"build": "rm -rf dist && tsc -p tsconfig.json"
},
"main": "./dist/index.js",
Expand Down
3 changes: 2 additions & 1 deletion packages/ui-contexts/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"rootDir": "./src",
"outDir": "./dist",
"resolveJsonModule": true,
"composite": true,
"esModuleInterop": true,
},
"include": ["./src/**/*"]
"include": ["./src/**/*", "./src/en.json"]
}
2 changes: 1 addition & 1 deletion tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"jsx": "react-jsx",
"importsNotUsedAsValues": "error"
"importsNotUsedAsValues": "error",
},
"exclude": ["node_modules", "**/*.spec.ts"]
}
15 changes: 15 additions & 0 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
"skipLibCheck": true
},
"exclude": ["*/**"],
"references": [
{ "path": "./packages/core-typings" },
{ "path": "./packages/rest-typings" },
{ "path": "./packages/api-client" },
{ "path": "./packages/ui-client" },
{ "path": "./packages/ui-contexts" },
// { "path": "./packages/livechat" },
]
}
3 changes: 3 additions & 0 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"dependsOn": ["build"],
"outputs": []
},
"//#dev:root": {
"cache": false
},
"dev": {
"dependsOn": ["^dev"],
"cache": false
Expand Down
119 changes: 65 additions & 54 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28898,7 +28898,8 @@ __metadata:
"@types/chart.js": ^2.9.37
"@types/js-yaml": ^4.0.5
husky: ^7.0.4
turbo: 1.2.5
turbo: ^1.2.16
typescript: ~4.3.4
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -31980,106 +31981,114 @@ __metadata:
languageName: node
linkType: hard

"turbo-darwin-64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-darwin-64@npm:1.2.5"
"turbo-darwin-64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-darwin-64@npm:1.2.16"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"turbo-darwin-arm64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-darwin-arm64@npm:1.2.5"
"turbo-darwin-arm64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-darwin-arm64@npm:1.2.16"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"turbo-freebsd-64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-freebsd-64@npm:1.2.5"
"turbo-freebsd-64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-freebsd-64@npm:1.2.16"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"turbo-freebsd-arm64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-freebsd-arm64@npm:1.2.5"
"turbo-freebsd-arm64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-freebsd-arm64@npm:1.2.16"
conditions: os=freebsd & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-32@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-32@npm:1.2.5"
"turbo-linux-32@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-32@npm:1.2.16"
conditions: os=linux & cpu=ia32
languageName: node
linkType: hard

"turbo-linux-64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-64@npm:1.2.5"
"turbo-linux-64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-64@npm:1.2.16"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"turbo-linux-arm64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-arm64@npm:1.2.5"
"turbo-linux-arm64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-arm64@npm:1.2.16"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-arm@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-arm@npm:1.2.5"
"turbo-linux-arm@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-arm@npm:1.2.16"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"turbo-linux-mips64le@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-mips64le@npm:1.2.5"
"turbo-linux-mips64le@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-mips64le@npm:1.2.16"
conditions: os=linux & cpu=mips64el
languageName: node
linkType: hard

"turbo-linux-ppc64le@npm:1.2.5":
version: 1.2.5
resolution: "turbo-linux-ppc64le@npm:1.2.5"
"turbo-linux-ppc64le@npm:1.2.16":
version: 1.2.16
resolution: "turbo-linux-ppc64le@npm:1.2.16"
conditions: os=linux & cpu=ppc64
languageName: node
linkType: hard

"turbo-windows-32@npm:1.2.5":
version: 1.2.5
resolution: "turbo-windows-32@npm:1.2.5"
"turbo-windows-32@npm:1.2.16":
version: 1.2.16
resolution: "turbo-windows-32@npm:1.2.16"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"turbo-windows-64@npm:1.2.5":
version: 1.2.5
resolution: "turbo-windows-64@npm:1.2.5"
"turbo-windows-64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-windows-64@npm:1.2.16"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"turbo@npm:1.2.5":
version: 1.2.5
resolution: "turbo@npm:1.2.5"
dependencies:
turbo-darwin-64: 1.2.5
turbo-darwin-arm64: 1.2.5
turbo-freebsd-64: 1.2.5
turbo-freebsd-arm64: 1.2.5
turbo-linux-32: 1.2.5
turbo-linux-64: 1.2.5
turbo-linux-arm: 1.2.5
turbo-linux-arm64: 1.2.5
turbo-linux-mips64le: 1.2.5
turbo-linux-ppc64le: 1.2.5
turbo-windows-32: 1.2.5
turbo-windows-64: 1.2.5
"turbo-windows-arm64@npm:1.2.16":
version: 1.2.16
resolution: "turbo-windows-arm64@npm:1.2.16"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"turbo@npm:^1.2.16":
version: 1.2.16
resolution: "turbo@npm:1.2.16"
dependencies:
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
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand All @@ -32105,9 +32114,11 @@ __metadata:
optional: true
turbo-windows-64:
optional: true
turbo-windows-arm64:
optional: true
bin:
turbo: bin/turbo
checksum: cba41a5c0e586f47f30e37424a112923fab5b29fda84bf6e28dfd56e981babc3787b3c1ce487bcff1feb828045ea0369f9ec5b32b495778285aa0983d417693c
checksum: 245b1b28af153edd14ab35a4812a8651b1e7cbae44ce3f15b53e0a73a3cc9c4ea39734f18c966403496c37876dd57053070b5b7eb736a14f1bc7e1bfd36566f3
languageName: node
linkType: hard

Expand Down