Skip to content

Commit

Permalink
chore: 🤖 bump nx.dev to the last version and next.js to 13+
Browse files Browse the repository at this point in the history
  • Loading branch information
flexbox committed Mar 7, 2023
1 parent 19a51f7 commit 71194f8
Show file tree
Hide file tree
Showing 9 changed files with 1,413 additions and 985 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
3 changes: 0 additions & 3 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
module.exports = {
stories: [],
addons: ['@storybook/addon-essentials'],
// uncomment the property below if you want to apply some webpack config globally
// webpackFinal: async (config, { configType }) => {
// // Make whatever fine-grained changes you need that should apply to all storybook configs

// // Return the altered config
// return config;
// },
Expand Down
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 },
};
6 changes: 5 additions & 1 deletion libs/ui/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ module.exports = {
'../src/lib/**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: [...rootMain.addons, '@nrwl/react/plugins/storybook'],
addons: [
'@storybook/addon-essentials',
...rootMain.addons,
'@nrwl/react/plugins/storybook',
],
};
13 changes: 7 additions & 6 deletions libs/ui/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
export default {
displayName: 'ui',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
globals: {},
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
'^.+\\.[tj]sx?$': [
'ts-jest',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
},
],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/libs/ui',
Expand Down
16 changes: 6 additions & 10 deletions libs/ui/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "ui",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/ui/src",
"projectType": "library",
Expand All @@ -24,9 +25,7 @@
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
"config": {
"configFolder": "libs/ui/.storybook"
}
"configDir": "libs/ui/.storybook"
},
"configurations": {
"ci": {
Expand All @@ -36,20 +35,17 @@
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"outputs": ["{options.outputPath}"],
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
"outputPath": "dist/storybook/ui",
"config": {
"configFolder": "libs/ui/.storybook"
}
"configDir": "libs/ui/.storybook",
"outputDir": "dist/storybook/ui"
},
"configurations": {
"ci": {
"quiet": true
}
}
}
},
"name": "ui"
}
}
53 changes: 27 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"core-js": "^3.6.5",
"graphql": "^16.6.0",
"lodash": "^4.17.21",
"next": "13.0.0",
"next": "13.1.1",
"next-seo": "^5.14.1",
"next-sitemap": "^3.1.31",
"postcss": "^8.4.20",
Expand All @@ -56,37 +56,38 @@
"@babel/core": "7.12.13",
"@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "7.12.13",
"@nrwl/cli": "15.3.3",
"@nrwl/cypress": "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/next": "15.3.3",
"@nrwl/react": "15.3.3",
"@nrwl/storybook": "15.3.3",
"@nrwl/web": "15.3.3",
"@nrwl/workspace": "15.3.3",
"@storybook/addon-essentials": "~6.5.13",
"@storybook/builder-webpack5": "~6.5.13",
"@storybook/core-server": "~6.5.13",
"@storybook/manager-webpack5": "~6.5.13",
"@storybook/react": "~6.5.13",
"@nrwl/cli": "15.8.5",
"@nrwl/cypress": "15.8.5",
"@nrwl/eslint-plugin-nx": "15.8.5",
"@nrwl/jest": "15.8.5",
"@nrwl/js": "15.8.5",
"@nrwl/linter": "15.8.5",
"@nrwl/next": "15.8.5",
"@nrwl/react": "15.8.5",
"@nrwl/storybook": "15.8.5",
"@nrwl/web": "15.8.5",
"@nrwl/webpack": "15.8.5",
"@nrwl/workspace": "15.8.5",
"@storybook/addon-essentials": "6.5.16",
"@storybook/builder-webpack5": "6.5.16",
"@storybook/core-server": "6.5.16",
"@storybook/manager-webpack5": "6.5.16",
"@storybook/react": "6.5.16",
"@svgr/webpack": "^5.4.0",
"@testing-library/react": "13.4.0",
"@types/jest": "28.1.8",
"@types/jest": "29.4.0",
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@types/react-dom": "18.0.9",
"@types/react-gravatar": "^2.6.10",
"@typescript-eslint/eslint-plugin": "5.41.0",
"@typescript-eslint/parser": "5.41.0",
"babel-jest": "28.1.3",
"babel-jest": "29.4.3",
"babel-loader": "8.1.0",
"cypress": "^11.0.0",
"cypress": "^12.2.0",
"cz-conventional-changelog": "3.3.0",
"eslint": "~8.30.0",
"eslint-config-next": "13.1.0",
"eslint-config-next": "13.1.1",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "2.26.0",
Expand All @@ -96,15 +97,15 @@
"eslint-plugin-tailwindcss": "^3.7.1",
"git-cz": "^4.9.0",
"husky": "^8.0.2",
"jest": "28.1.3",
"jest-environment-jsdom": "^29.2.2",
"jest": "29.4.3",
"jest-environment-jsdom": "29.4.3",
"lint-staged": "^13.0.3",
"nx": "15.3.3",
"nx": "15.8.5",
"prettier": "^2.6.2",
"react-test-renderer": "18.2.0",
"ts-jest": "28.0.8",
"ts-jest": "29.0.5",
"ts-node": "10.9.1",
"typescript": "4.8.4",
"typescript": "4.9.5",
"url-loader": "^3.0.0"
},
"lint-staged": {
Expand Down
10 changes: 0 additions & 10 deletions workspace.json

This file was deleted.

Loading

0 comments on commit 71194f8

Please sign in to comment.