Skip to content

Commit

Permalink
fix tests and rename pigmentcss dir to just pigment
Browse files Browse the repository at this point in the history
  • Loading branch information
brijeshb42 committed Mar 1, 2024
1 parent a82c62d commit bbf1973
Show file tree
Hide file tree
Showing 104 changed files with 212 additions and 130 deletions.
16 changes: 8 additions & 8 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"packages/mui-types",
"packages/mui-utils",
"packages-internal/scripts",
"packages/pigmentcss-react",
"packages/pigmentcss-unplugin",
"packages/pigmentcss-vite-plugin",
"packages/pigmentcss-nextjs-plugin"
"packages/pigment-react",
"packages/pigment-unplugin",
"packages/pigment-vite-plugin",
"packages/pigment-nextjs-plugin"
],
"publishDirectory": {
"@mui/base": "packages/mui-base/build",
Expand All @@ -49,10 +49,10 @@
"@mui/types": "packages/mui-types/build",
"@mui/utils": "packages/mui-utils/build",
"@mui-internal/docs-utils": "packages/docs-utils",
"@pigmentcss/react": "packages/pigmentcss-react",
"@pigmentcss/unplugin": "packages/pigmentcss-unplugin",
"@pigmentcss/vite-plugin": "packages/pigmentcss-vite-plugin",
"@pigmentcss/nextjs-plugin": "packages/pigmentcss-nextjs-plugin"
"@pigmentcss/react": "packages/pigment-react",
"@pigmentcss/unplugin": "packages/pigment-unplugin",
"@pigmentcss/vite-plugin": "packages/pigment-vite-plugin",
"@pigmentcss/nextjs-plugin": "packages/pigment-nextjs-plugin"
},
"sandboxes": [
"/examples/material-ui-cra-ts",
Expand Down
12 changes: 6 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
/packages/mui-icons-material/src/*.js
/packages/mui-icons-material/templateSvgIcon.js
/packages/mui-utils/macros/__fixtures__/
/packages/pigmentcss-react/utils/
/packages/pigmentcss-react/processors/
/packages/pigmentcss-react/exports/
/packages/pigmentcss-react/theme/
/packages/pigmentcss-react/tests/fixtures/
/packages/pigmentcss-nextjs-plugin/loader.js
/packages/pigment-react/utils/
/packages/pigment-react/processors/
/packages/pigment-react/exports/
/packages/pigment-react/theme/
/packages/pigment-react/tests/fixtures/
/packages/pigment-nextjs-plugin/loader.js
# Ignore fixtures
/packages-internal/scripts/typescript-to-proptypes/test/*/*
/test/bundling/fixtures/**/*.fixture.js
Expand Down
2 changes: 1 addition & 1 deletion apps/local-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "0.0.1",
"private": true,
"dependencies": {
"@pigmentcss/react": "file:../../packages/pigmentcss-react"
"@pigmentcss/react": "file:../../packages/pigment-react"
}
}
2 changes: 1 addition & 1 deletion apps/local-ui-lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"references": [
{
"path": "../../packages/pigmentcss-react"
"path": "../../packages/pigment-react"
}
]
}
6 changes: 3 additions & 3 deletions apps/pigment-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"clean": "rimraf .next"
},
"dependencies": {
"@pigmentcss/react": "file:../../packages/pigmentcss-react",
"@pigmentcss/react": "file:../../packages/pigment-react",
"@mui/utils": "file:../../packages/mui-utils/build",
"@mui/base": "file:../../packages/mui-base/build",
"@mui/material": "file:../../packages/mui-material/build",
Expand All @@ -23,8 +23,8 @@
"next": "latest"
},
"devDependencies": {
"@pigmentcss/unplugin": "file:../../packages/pigmentcss-unplugin",
"@pigmentcss/nextjs-plugin": "file:../../packages/pigmentcss-nextjs-plugin",
"@pigmentcss/unplugin": "file:../../packages/pigment-unplugin",
"@pigmentcss/nextjs-plugin": "file:../../packages/pigment-nextjs-plugin",
"@types/node": "^20.5.7",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-next-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"path": "../../packages/mui-material/tsconfig.build.json"
},
{
"path": "../../packages/pigmentcss-react/tsconfig.json"
"path": "../../packages/pigment-react/tsconfig.json"
}
]
}
4 changes: 2 additions & 2 deletions apps/pigment-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@pigmentcss/react": "file:../../packages/pigmentcss-react",
"@pigmentcss/react": "file:../../packages/pigment-react",
"@mui/utils": "file:../../packages/mui-utils/build",
"@mui/base": "file:../../packages/mui-base/build",
"@mui/material": "file:../../packages/mui-material/build",
Expand All @@ -27,7 +27,7 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@pigmentcss/vite-plugin": "file:../../packages/pigmentcss-vite-plugin",
"@pigmentcss/vite-plugin": "file:../../packages/pigment-vite-plugin",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@vitejs/plugin-react": "^4.2.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-vite-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"path": "../../packages/mui-material/tsconfig.build.json"
},
{
"path": "../../packages/pigmentcss-react/tsconfig.json"
"path": "../../packages/pigment-react/tsconfig.json"
}
]
}
74 changes: 37 additions & 37 deletions apps/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ packages:
- '../packages/test-utils'
- '../packages-internal/*'
- '../packages/mui-*'
- '../packages/pigmentcss-*'
- '../packages/pigment-*'
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = function getBabelConfig(api) {
'@mui/utils': resolveAliasPath('./packages/mui-utils/src'),
'@mui/material-next': resolveAliasPath('./packages/mui-material-next/src'),
'@mui/joy': resolveAliasPath('./packages/mui-joy/src'),
'@pigmentcss/react': resolveAliasPath('./packages/pigmentcss-react/src'),
'@pigmentcss/react': resolveAliasPath('./packages/pigment-react/src'),
'@mui-internal/docs-utils': resolveAliasPath('./packages/docs-utils/src'),
docs: resolveAliasPath('./docs'),
test: resolveAliasPath('./test'),
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"test": "node scripts/test.mjs",
"tc": "node test/cli.js",
"test:extended": "pnpm eslint && pnpm typescript && pnpm test:coverage",
"test:pigmentcss-react:ci": "pnpm nx run @pigmentcss/react:test:ci",
"test:coverage": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=text mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}' --exclude 'packages/pigmentcss-react/**/*.test.{js,ts,tsx}' && pnpm test:pigmentcss-react",
"test:coverage:ci": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}' --exclude 'packages/pigmentcss-react/**/*.test.{js,ts,tsx}' && pnpm test:pigmentcss-react:ci",
"test:pigment-react:ci": "pnpm nx run @pigmentcss/react:test:ci",
"test:coverage": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=text mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}' --exclude 'packages/pigment-react/**/*.test.{js,ts,tsx}' && pnpm test:pigment-react",
"test:coverage:ci": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}' --exclude 'packages/pigment-react/**/*.test.{js,ts,tsx}' && pnpm test:pigment-react:ci",
"test:coverage:html": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=html mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'",
"test:e2e": "cross-env NODE_ENV=production pnpm test:e2e:build && concurrently --success first --kill-others \"pnpm test:e2e:run\" \"pnpm test:e2e:server\"",
"test:e2e:build": "webpack --config test/e2e/webpack.config.js",
Expand Down
12 changes: 6 additions & 6 deletions packages/mui-icons-material/test/generated-types/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"@mui/types": ["./mui-types"],
"@mui/utils": ["./mui-utils/src"],
"@mui/utils/*": ["./mui-utils/src/*"],
"@pigmentcss/nextjs-plugin": ["./pigmentcss-nextjs-plugin/src"],
"@pigmentcss/nextjs-plugin/*": ["./pigmentcss-nextjs-plugin/src/*"],
"@pigmentcss/react": ["./pigmentcss-react/src"],
"@pigmentcss/react/*": ["./pigmentcss-react/src/*"],
"@pigmentcss/vite-plugin": ["./pigmentcss-vite-plugin/src"],
"@pigmentcss/vite-plugin/*": ["./pigmentcss-vite-plugin/src/*"],
"@pigmentcss/nextjs-plugin": ["./pigment-nextjs-plugin/src"],
"@pigmentcss/nextjs-plugin/*": ["./pigment-nextjs-plugin/src/*"],
"@pigmentcss/react": ["./pigment-react/src"],
"@pigmentcss/react/*": ["./pigment-react/src/*"],
"@pigmentcss/vite-plugin": ["./pigment-vite-plugin/src"],
"@pigmentcss/vite-plugin/*": ["./pigment-vite-plugin/src/*"],
"@mui/internal-scripts/typescript-to-proptypes": [
"../packages-internal/scripts/typescript-to-proptypes/src"
]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit bbf1973

Please sign in to comment.