Skip to content

Commit

Permalink
chore: bump to [email protected] (#487)
Browse files Browse the repository at this point in the history
  • Loading branch information
layershifter authored Jan 12, 2024
1 parent ee86e37 commit 9c0b1ac
Show file tree
Hide file tree
Showing 38 changed files with 1,522 additions and 1,831 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
/packages/*/dist
2 changes: 0 additions & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
module.exports = {
stories: [],
addons: ['@storybook/addon-essentials'],
babel: async options => {
return {
...options,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/executors/rollup/lib/update-package-json.js b/src/executors/rollup/lib/update-package-json.js
index 3bb0d36249b3f8ae8ad3f7932d6b1713a7cec101..848ebb1b85fcb7038fef12073e7ff41f00a431df 100644
index 48283ecf5c190a40e0659ad448bc541163805574..e710c225a164d1ab970303eec7bcf2cd4101a0a4 100644
--- a/src/executors/rollup/lib/update-package-json.js
+++ b/src/executors/rollup/lib/update-package-json.js
@@ -17,14 +17,14 @@ function updatePackageJson(options, context, target, dependencies, packageJson)
Expand All @@ -20,10 +20,10 @@ index 3bb0d36249b3f8ae8ad3f7932d6b1713a7cec101..848ebb1b85fcb7038fef12073e7ff41f
}
if (!options.skipTypeField) {
diff --git a/src/executors/rollup/rollup.impl.js b/src/executors/rollup/rollup.impl.js
index 9f31b3b69501963e632ca960545dc2411f9e4f1f..7aa1c8ed6403d8aab28fa13e6f1082bbe4b296fa 100644
index 2ca97d37c2fa1fa54d3372e8200054cdf343ac08..6849b7a14ee91f6374385d22de9a5dda758354a7 100644
--- a/src/executors/rollup/rollup.impl.js
+++ b/src/executors/rollup/rollup.impl.js
@@ -195,8 +195,8 @@ function createRollupOptions(options, dependencies, context, packageJson, source
@@ -196,8 +196,8 @@ function createRollupOptions(options, dependencies, context, packageJson, source
format,
dir: `${options.outputPath}`,
name: (0, devkit_1.names)(context.projectName).className,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump Nx to 15.9.7",
"packageName": "@griffel/babel-preset",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/core",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/devtools",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/eslint-plugin",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/jest-serializer",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/next-extraction-plugin",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/postcss-syntax",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/react",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/shadow-dom",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/webpack-extraction-plugin",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: bump to [email protected]",
"packageName": "@griffel/webpack-loader",
"email": "[email protected]",
"dependentChangeType": "none"
}
14 changes: 13 additions & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
const nxPreset = require('@nrwl/jest/preset').default;

module.exports = { ...nxPreset };
module.exports = {
...nxPreset,
/* TODO: Update to latest Jest snapshotFormat
* By default Nx has kept the older style of Jest Snapshot formats
* to prevent breaking of any existing tests with snapshots.
* It's recommend you update to the latest format.
* You can do this by removing snapshotFormat property
* and running tests with --update-snapshot flag.
* Example: "nx affected --targets=test --update-snapshot"
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
*/
snapshotFormat: { escapeString: true, printBasicPrototype: true },
};
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"targetDefaults": {
"build": {
"dependsOn": ["^build"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"pluginsConfig": {
Expand Down
49 changes: 26 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,25 @@
"@docusaurus/preset-classic": "3.1.0",
"@docusaurus/theme-mermaid": "3.1.0",
"@emotion/css": "^11.9.0",
"@nrwl/cli": "15.3.3",
"@nrwl/eslint-plugin-nx": "15.3.3",
"@nrwl/jest": "15.3.3",
"@nrwl/js": "15.3.3",
"@nrwl/linter": "15.3.3",
"@nrwl/node": "15.3.3",
"@nrwl/react": "15.3.3",
"@nrwl/storybook": "15.3.3",
"@nrwl/web": "15.3.3",
"@nrwl/workspace": "15.3.3",
"@nrwl/cli": "15.9.7",
"@nrwl/eslint-plugin-nx": "15.9.7",
"@nrwl/jest": "15.9.7",
"@nrwl/js": "15.9.7",
"@nrwl/linter": "15.9.7",
"@nrwl/node": "15.9.7",
"@nrwl/react": "15.9.7",
"@nrwl/rollup": "patch:@nrwl/rollup@npm%3A15.9.7#~/.yarn/patches/@nrwl-rollup-npm-15.9.7-09d422d3f8.patch",
"@nrwl/storybook": "15.9.7",
"@nrwl/web": "15.9.7",
"@nrwl/webpack": "15.9.7",
"@nrwl/workspace": "15.9.7",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@rspack/cli": "0.5.0",
"@rspack/core": "0.5.0",
"@storybook/addon-essentials": "6.5.15",
"@storybook/builder-webpack5": "6.5.15",
"@storybook/manager-webpack5": "6.5.15",
"@storybook/react": "6.5.15",
"@storybook/addon-essentials": "6.5.16",
"@storybook/builder-webpack5": "6.5.16",
"@storybook/manager-webpack5": "6.5.16",
"@storybook/react": "6.5.16",
"@swc/core": "^1.3.19",
"@testing-library/jest-dom": "5.16.1",
"@testing-library/react": "13.4.0",
Expand All @@ -61,11 +63,12 @@
"@types/chrome": "0.0.180",
"@types/classnames": "2.3.1",
"@types/d3-scale-chromatic": "^3.0.0",
"@types/jest": "28.1.8",
"@types/jest": "29.4.4",
"@types/js-beautify": "^1.13.3",
"@types/lz-string": "1.3.34",
"@types/mini-css-extract-plugin": "2.5.1",
"@types/node": "18.11.9",
"@types/prettier": "2.7.3",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.18",
"@types/styled-components": "5.1.26",
Expand All @@ -77,7 +80,7 @@
"@typescript-eslint/parser": "5.47.0",
"@uifabric/merge-styles": "7.19.1",
"@wyw-in-js/processor-utils": "^0.2.2",
"babel-jest": "28.1.3",
"babel-jest": "29.4.3",
"babel-loader": "8.1.0",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"babel-plugin-tester": "11.0.0",
Expand Down Expand Up @@ -105,9 +108,9 @@
"fela-plugin-prefixer": "^12.2.0",
"fela-plugin-rtl": "^12.2.0",
"highlight.js": "11.4.0",
"jest": "28.1.3",
"jest-chrome": "^0.7.2",
"jest-environment-jsdom": "28.1.1",
"jest": "29.4.3",
"jest-chrome": "0.8.0",
"jest-environment-jsdom": "29.4.3",
"js-beautify": "^1.14.0",
"log-symbols": "4.1.0",
"lz-string": "1.4.4",
Expand All @@ -117,10 +120,11 @@
"monosize-storage-upstash": "0.0.8",
"nano-staged": "0.5.0",
"next": "14.0.4",
"nx": "15.3.3",
"nx": "15.9.7",
"postcss": "^8.4.31",
"prettier": "2.8.2",
"prism-react-renderer": "2.3.1",
"raw-loader": "4.0.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-fela": "12.2.0",
Expand All @@ -134,10 +138,10 @@
"synckit": "^0.8.5",
"syncpack": "12.3.0",
"tmp": "0.2.1",
"ts-jest": "28.0.8",
"ts-jest": "29.0.5",
"ts-node": "10.9.1",
"tsconfig-paths": "4.1.1",
"typescript": "4.8.4",
"typescript": "4.9.5",
"url-loader": "^4.1.1",
"webpack": "^5.89.0",
"webpack-merge": "^5.8.0",
Expand All @@ -164,7 +168,6 @@
"tslib": "^2.1.0"
},
"resolutions": {
"@nrwl/[email protected]": "patch:@nrwl/rollup@npm:15.3.3#.yarn/patches/@nrwl-rollup-npm-15.3.3-2e996174b7.patch",
"[email protected]": "patch:beachball@npm:2.31.5#.yarn/patches/beachball-npm-2.31.5-0e84ec4233.patch",
"[email protected]": "patch:source-map-js@npm:1.0.2#.yarn/patches/source-map-js-npm-1.0.2-ee4f9f9b30.patch"
}
Expand Down
13 changes: 7 additions & 6 deletions packages/babel-preset/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
export default {
displayName: 'babel-preset',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
globals: {},
testEnvironment: 'node',
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
'^.+\\.[tj]sx?$': [
'ts-jest',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
},
],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
moduleNameMapper: {
Expand Down
12 changes: 9 additions & 3 deletions packages/core/.babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{
"plugins": ["annotate-pure-calls"],
"plugins": [
"annotate-pure-calls"
],
"env": {
"development": {
"presets": ["@nrwl/react/babel"]
"presets": [
"@nrwl/react/babel"
]
},
"test": {
"presets": ["@nrwl/react/babel"]
"presets": [
"@nrwl/react/babel"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/devtools/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
core: { ...rootMain.core, builder: 'webpack5' },

stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [...rootMain.addons, '@nrwl/react/plugins/storybook'],
addons: ['@storybook/addon-essentials', ...rootMain.addons, '@nrwl/react/plugins/storybook'],

webpackFinal: async (config, { configType }) => {
// apply any global webpack configs that might have been specified in .storybook/main.js
Expand Down
24 changes: 14 additions & 10 deletions packages/devtools/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@
"executor": "nx:run-commands",
"options": {
"cwd": "packages/devtools",
"commands": [{ "command": "tsc -b --pretty" }],
"commands": [
{
"command": "tsc -b --pretty"
}
],
"outputPath": []
}
},
Expand All @@ -92,17 +96,19 @@
"options": {
"cwd": ".",
"parallel": false,
"commands": [{ "command": " nx build @griffel/devtools --skip-nx-cache --configuration=development --watch" }]
"commands": [
{
"command": " nx build @griffel/devtools --skip-nx-cache --configuration=development --watch"
}
]
}
},
"storybook": {
"executor": "@nrwl/storybook:storybook",
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
"config": {
"configFolder": "packages/devtools/.storybook"
}
"configDir": "packages/devtools/.storybook"
},
"configurations": {
"ci": {
Expand All @@ -112,13 +118,11 @@
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"outputs": ["{options.outputPath}"],
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
"outputPath": "dist/storybook/@griffel/devtools",
"config": {
"configFolder": "packages/devtools/.storybook"
}
"configDir": "packages/devtools/.storybook",
"outputDir": "dist/storybook/@griffel/devtools"
},
"configurations": {
"ci": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
"presets": [["@nrwl/js/babel", { "useBuiltIns": "usage" }]]
}
13 changes: 7 additions & 6 deletions packages/eslint-plugin/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
export default {
displayName: 'eslint-plugin',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
globals: {},
testEnvironment: 'node',
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
'^.+\\.[tj]sx?$': [
'ts-jest',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
},
],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/packages/eslint-plugin',
Expand Down
Loading

0 comments on commit 9c0b1ac

Please sign in to comment.