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.

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

Chore: Revert yarn dev implementation #26075

Merged
merged 1 commit into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,3 @@ yarn-error.log*

.nvmrc
.idea/

*.tsbuildinfo
1 change: 1 addition & 0 deletions _templates/package/new/package.json.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ to: packages/<%= name %>/package.json
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"build": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
3 changes: 1 addition & 2 deletions _templates/package/new/tsconfig.json.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ to: packages/<%= name %>/tsconfig.json
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"composite": true
"outDir": "./dist"
},
"include": ["./src/**/*"]
}
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"build:services": "turbo run build --filter=rocketchat-services...",
"build:ci": "turbo run build:ci",
"testunit": "turbo run testunit",
"dev:root": "tsc -b --watch --preserveWatchOutput",
"dev": "turbo run //#dev:root dev --parallel [email protected]/meteor...",
"dev": "turbo run dev --parallel [email protected]/meteor...",
"dsv": "turbo run dsv [email protected]/meteor...",
"lint": "turbo run lint",
"storybook": "yarn workspace @rocket.chat/meteor run storybook"
Expand All @@ -20,8 +19,7 @@
"@types/chart.js": "^2.9.37",
"@types/js-yaml": "^4.0.5",
"husky": "^7.0.4",
"turbo": "^1.2.16",
"typescript": "~4.3.4"
"turbo": "1.2.5"
},
"workspaces": [
"apps/*",
Expand Down
3 changes: 2 additions & 1 deletion packages/api-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"build": "tsc -p tsconfig.json"
"build": "tsc -p tsconfig.json",
"dev": "tsc --watch --preserveWatchOutput -p tsconfig.json"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
1 change: 0 additions & 1 deletion packages/api-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
1 change: 1 addition & 0 deletions packages/core-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"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: 0 additions & 1 deletion packages/core-typings/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
3 changes: 2 additions & 1 deletion packages/favicon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"scripts": {
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"build": "rm -rf dist && tsc -p tsconfig.json"
"build": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
1 change: 0 additions & 1 deletion packages/favicon/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"rootDir": "./src",
"outDir": "./dist",
"lib": ["DOM"],
"composite": true
},
"include": ["./src/**/*"]
}
1 change: 1 addition & 0 deletions packages/gazzodown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"test": "jest",
"build": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
"typecheck": "tsc -p tsconfig.json --noEmit",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook"
Expand Down
3 changes: 1 addition & 2 deletions packages/gazzodown/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"composite": true
"outDir": "./dist"
},
"include": ["./src/**/*"]
}
3 changes: 1 addition & 2 deletions packages/model-typings/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"composite": true
"outDir": "./dist"
},
"include": ["./src/**/*"]
}
1 change: 0 additions & 1 deletion packages/models/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"outDir": "./dist",
"resolveJsonModule": true,
"esModuleInterop": true,
"composite": true
},
"include": ["./src/**/*"]
}
1 change: 1 addition & 0 deletions packages/rest-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"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: 0 additions & 1 deletion packages/rest-typings/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"composite": true,
"outDir": "./dist"
},
"include": ["./src/**/*"]
Expand Down
3 changes: 2 additions & 1 deletion packages/ui-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"jest": "jest",
"build": "rm -rf dist && tsc -p tsconfig.json",
"storybook": "start-storybook -p 6006"
"storybook": "start-storybook -p 6006",
"dev": "tsc -p --watch --preserveWatchOutput tsconfig.json"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
3 changes: 1 addition & 2 deletions packages/ui-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"importsNotUsedAsValues": "preserve",
"composite": true
"importsNotUsedAsValues": "preserve"
},
"include": ["./src/**/*"],
"exclude": ["**/*.stories.tsx", "**/*.stories.js"]
Expand Down
1 change: 1 addition & 0 deletions packages/ui-contexts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"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: 1 addition & 2 deletions packages/ui-contexts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"rootDir": "./src",
"outDir": "./dist",
"resolveJsonModule": true,
"composite": true,
"esModuleInterop": true,
},
"include": ["./src/**/*", "./src/en.json"]
"include": ["./src/**/*"]
}
2 changes: 1 addition & 1 deletion tsconfig.base.json
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"]
}
20 changes: 0 additions & 20 deletions tsconfig.json

This file was deleted.

3 changes: 0 additions & 3 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
"dependsOn": ["build"],
"outputs": []
},
"//#dev:root": {
"cache": false
},
"dev": {
"dependsOn": ["^dev"],
"cache": false
Expand Down
Loading