Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fece185
chore: update tsconfig.spec.json files for workspace migration
layershifter Mar 5, 2026
2f61996
chore: add workspaces, exports, and types fields to package.json files
layershifter Mar 5, 2026
732ebd9
chore: update storybook tsconfig outDir to local ./out-tsc/storybook
layershifter Mar 5, 2026
b323586
checkpoint
layershifter Mar 5, 2026
83593be
chore: migrate from TS path aliases to workspaces + project references
layershifter Mar 5, 2026
15bde96
fix: correct apps/website/tsconfig.json after rebase
layershifter Mar 6, 2026
731dc44
chore: use versioned ranges instead of workspace:* protocol
layershifter Mar 6, 2026
317e8d8
chore: update yarn.lock
layershifter Mar 6, 2026
13e3411
chore: move @griffel/core to devDependencies in devtools
layershifter Mar 6, 2026
ae9a516
chore: remove explicit rollup executor from react project.json
layershifter Mar 6, 2026
bab6fd2
chore: add rollup.config.cjs to shadow-dom, remove explicit executor
layershifter Mar 6, 2026
9d1f8c7
chore: exclude stories from react tsconfig.lib.json
layershifter Mar 6, 2026
3fcbb97
chore: remove dead tsconfig.build.json from tag-processor
layershifter Mar 6, 2026
46c3a22
fix: point vite-plugin types export to dist/index.d.ts
layershifter Mar 6, 2026
79b6477
fix: point vite-plugin exports to built files in dist/
layershifter Mar 6, 2026
de297c2
chore: remove exports and types from devtools package.json
layershifter Mar 6, 2026
ced1813
fix: point vite-plugin top-level types to dist/index.d.ts
layershifter Mar 6, 2026
8b9b6ec
chore: remove aliases from monosize config, dedupe yarn.lock, add cha…
layershifter Mar 6, 2026
21cb4c4
chore: remove beachball patch for old dist path layout
layershifter Mar 6, 2026
7b22edf
fix: shadow-dom exports to dist, bump babel-preset version in postcss…
layershifter Mar 6, 2026
1c6a7be
fix(e2e): update packLocalPackage for new dist layout
layershifter Mar 6, 2026
fa5a150
fix: update exports, fix rollup/tsc declaration conflict, dedupe tsco…
layershifter Mar 6, 2026
e92975d
fix: add files field, fix types paths, emit CJS for Node.js packages
layershifter Mar 6, 2026
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
/packages/*/dist
out-tsc
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
{
"files": [
"**/__fixtures__/**/*",
"**/bundle-size/**",
"**/*.stories.ts",
"**/*.stories.tsx",
"**/*.test.ts",
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
dist
/tmp
/out-tsc
out-tsc
/packages/*/dist/bundle-size

# TypeScript build info
Expand Down Expand Up @@ -53,4 +53,4 @@ Thumbs.db
.github/instructions/nx.instructions.md

vite.config.*.timestamp*
vitest.config.*.timestamp*
vitest.config.*.timestamp*
26 changes: 0 additions & 26 deletions .yarn/patches/beachball-npm-2.31.5-0e84ec4233.patch

This file was deleted.

12 changes: 2 additions & 10 deletions apps/website/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@
"executor": "nx:run-commands",
"options": {
"cwd": "apps/website",
"commands": [{ "command": "docusaurus build --out-dir ../../dist/apps/website" }]
"commands": [{ "command": "docusaurus build --out-dir ./dist" }]
},
"outputs": ["{workspaceRoot}/dist/apps/website"]
"outputs": ["{workspaceRoot}/apps/website/dist"]
},
"serve": {
"executor": "nx:run-commands",
"options": {
"cwd": "apps/website",
"commands": [{ "command": "docusaurus start" }]
}
},
"type-check": {
"executor": "nx:run-commands",
"options": {
"cwd": "apps/website",
"commands": [{ "command": "tsc -b --pretty" }],
"outputPath": []
}
}
},
"tags": []
Expand Down
9 changes: 6 additions & 3 deletions apps/website/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"allowJs": true,
"allowSyntheticDefaultImports": true,
"checkJs": true,
"jsx": "react",
"noEmit": true,
"outDir": "../../dist/out-tsc",
Expand All @@ -15,5 +13,10 @@
"webpack-env"
]
},
"include": ["./src/**/*.ts", "./src/**/*.tsx", "./src/**/*.js"]
"include": ["./src/**/*.ts", "./src/**/*.tsx"],
"references": [
{
"path": "../../packages/core"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/babel-preset",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/core",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/devtools",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/eslint-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/jest-serializer",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/next-extraction-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/postcss-syntax",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/react",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/shadow-dom",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/style-types",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/tag-processor",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/transform",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/vite-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/webpack-extraction-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/webpack-loader",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate from TS path aliases to workspaces + project references",
"packageName": "@griffel/webpack-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "none"
}
10 changes: 10 additions & 0 deletions e2e/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "@griffel/e2e-nextjs",
"private": true,
"devDependencies": {
"@griffel/e2e-utils": "workspace:*",
"@griffel/next-extraction-plugin": "^0.1.14",
"@griffel/react": "^1.6.0",
"@griffel/webpack-loader": "^2.2.22"
}
}
8 changes: 0 additions & 8 deletions e2e/nextjs/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
"commands": [{ "command": "ts-node src/test.ts" }]
},
"outputs": []
},
"type-check": {
"executor": "nx:run-commands",
"options": {
"cwd": "e2e/nextjs",
"commands": [{ "command": "tsc -b --pretty" }],
"outputPath": []
}
}
},
"tags": []
Expand Down
13 changes: 6 additions & 7 deletions e2e/nextjs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"allowJs": true,
"allowSyntheticDefaultImports": true,
"checkJs": true,
"module": "CommonJS",
"jsx": "react",
"noEmit": true
"jsx": "react"
},
"files": [],
"include": [],
Expand All @@ -16,7 +12,10 @@
}
],
"ts-node": {
"require": ["tsconfig-paths/register"],
"swc": true
"swc": true,
"compilerOptions": {
"module": "commonjs",
"moduleResolution": "node"
}
}
}
22 changes: 19 additions & 3 deletions e2e/nextjs/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
{
"extends": "./tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"outDir": "./dist",
"rootDir": "./src",
"types": ["node", "environment"]
},
"include": ["**/*.ts", "**/*.tsx", "**/*.js"]
"exclude": ["src/**/*.test.ts", "src/**/__fixture__/", "src/**/__mocks__/"],
"include": ["src/**/*.ts"],
"references": [
{
"path": "../../packages/webpack-loader/tsconfig.lib.json"
},
{
"path": "../../packages/react/tsconfig.lib.json"
},
{
"path": "../../packages/next-extraction-plugin/tsconfig.lib.json"
},
{
"path": "../utils/tsconfig.lib.json"
}
]
}
10 changes: 10 additions & 0 deletions e2e/rspack/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "@griffel/e2e-rspack",
"private": true,
"devDependencies": {
"@griffel/e2e-utils": "workspace:*",
"@griffel/react": "^1.6.0",
"@griffel/webpack-extraction-plugin": "^0.5.13",
"@griffel/webpack-loader": "^2.2.22"
}
}
8 changes: 0 additions & 8 deletions e2e/rspack/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
"commands": [{ "command": "ts-node src/test.ts" }]
},
"outputs": []
},
"type-check": {
"executor": "nx:run-commands",
"options": {
"cwd": "e2e/rspack",
"commands": [{ "command": "tsc -b --pretty" }],
"outputPath": []
}
}
},
"tags": []
Expand Down
13 changes: 6 additions & 7 deletions e2e/rspack/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"module": "CommonJS",
"jsx": "react",
"noEmit": true
"jsx": "react"
},
"files": [],
"include": [],
Expand All @@ -15,7 +11,10 @@
}
],
"ts-node": {
"require": ["tsconfig-paths/register"],
"swc": true
"swc": true,
"compilerOptions": {
"module": "commonjs",
"moduleResolution": "node"
}
}
}
22 changes: 19 additions & 3 deletions e2e/rspack/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
{
"extends": "./tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"outDir": "./dist",
"rootDir": "./src",
"types": ["node", "environment"]
},
"include": ["**/*.ts", "**/*.tsx", "**/*.js"]
"exclude": ["src/**/*.test.ts", "src/**/__fixture__/", "src/**/__mocks__/"],
"include": ["src/**/*.ts"],
"references": [
{
"path": "../../packages/webpack-loader/tsconfig.lib.json"
},
{
"path": "../../packages/webpack-extraction-plugin/tsconfig.lib.json"
},
{
"path": "../../packages/react/tsconfig.lib.json"
},
{
"path": "../utils/tsconfig.lib.json"
}
]
}
Loading
Loading