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(nx): migrate nx to 15.7.0 #496

Merged
merged 2 commits into from
Feb 15, 2023
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
3 changes: 1 addition & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
stories: [],
addons: ['@storybook/addon-essentials', 'storybook-tailwind-dark-mode'],
addons: ['storybook-tailwind-dark-mode'],
// 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
Expand Down
2 changes: 2 additions & 0 deletions apps/console-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "console-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/console-e2e/src",
"projectType": "application",
"targets": {
Expand Down
7 changes: 5 additions & 2 deletions apps/console/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "console",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/console/src",
"projectType": "application",
"targets": {
Expand All @@ -25,8 +27,9 @@
],
"styles": ["apps/console/src/styles.scss"],
"scripts": [],
"webpackConfig": "@nrwl/react/plugins/webpack",
"postcssConfig": "apps/console/postcss.config.js"
"webpackConfig": "apps/console/webpack.config.js",
"postcssConfig": "apps/console/postcss.config.js",
"isolatedConfig": true
},
"configurations": {
"production": {
Expand Down
11 changes: 11 additions & 0 deletions apps/console/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const { composePlugins, withNx } = require('@nrwl/webpack')
const { withReact } = require('@nrwl/react')

// Nx plugins for webpack.
module.exports = composePlugins(withNx(), withReact(), (config, { options, context }) => {
// Update the webpack config as needed here.
// e.g. config.plugins.push(new MyPlugin())
// For more information on webpack config and Nx see:
// https://nx.dev/packages/webpack/documents/webpack-config-setup
return config
})
2 changes: 2 additions & 0 deletions apps/design-system-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "design-system-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/design-system-e2e/src",
"projectType": "application",
"targets": {
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/application/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-application",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/application/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/database/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-database",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/database/src",
"projectType": "library",
"tags": [],
Expand Down
1 change: 1 addition & 0 deletions libs/domains/environment-variable/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "domains-environment-variable",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/environment-variable/src",
"projectType": "library",
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/environment/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-environment",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/environment/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/organization/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-organization",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/organization/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/projects/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-projects",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/projects/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/domains/user/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "domains-user",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/domains/user/src",
"projectType": "library",
"tags": [],
Expand Down
1 change: 1 addition & 0 deletions libs/pages/application/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-application",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/application/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/cluster/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-cluster",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/cluster/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/clusters/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-clusters",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/clusters/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/database/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-database",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/database/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/environments/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-environments",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/environments/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/layout/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-layout",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/layout/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/login/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-login",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/login/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/logs/application/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-logs-application",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/logs/application/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/logs/infra/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-logs-infra",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/logs/infra/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/onboarding/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-onboarding",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/onboarding/src",
"projectType": "library",
Expand Down
2 changes: 2 additions & 0 deletions libs/pages/overview/feature/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "pages-overview-feature",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/overview/feature/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/pages/overview/ui/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "pages-overview-ui",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/overview/ui/src",
"projectType": "library",
"tags": [],
Expand Down
1 change: 1 addition & 0 deletions libs/pages/services/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-services",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/services/src",
"projectType": "library",
Expand Down
1 change: 1 addition & 0 deletions libs/pages/settings/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "pages-settings",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/pages/settings/src",
"projectType": "library",
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/auth/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-auth",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/auth/src",
"projectType": "library",
"tags": [],
Expand Down
1 change: 1 addition & 0 deletions libs/shared/console-shared/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "shared-console-shared",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/console-shared/src",
"projectType": "library",
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/enums/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-enums",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/enums/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/interfaces/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-interfaces",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/interfaces/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/router/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-router",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/router/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/toast/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-toast",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/toast/src",
"projectType": "library",
"tags": [],
Expand Down
4 changes: 2 additions & 2 deletions libs/shared/ui/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const rootMain = require('../../../../.storybook/main')
module.exports = {
...rootMain,
core: { ...rootMain.core, builder: 'webpack5' },
stories: [...rootMain.stories, '../src/**/**/*.stories.mdx', '../src/**/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [...rootMain.addons, '@nrwl/react/plugins/storybook'],
stories: ['../src/**/**/*.stories.mdx', '../src/**/**/*.stories.@(js|jsx|ts|tsx)'],
addons: ['@storybook/addon-essentials', ...rootMain.addons, '@nrwl/react/plugins/storybook'],
staticDirs: ['../src/lib'],
webpackFinal: async (config, { configType }) => {
// apply any global webpack configs that might have been specified in .storybook/main.js
Expand Down
14 changes: 6 additions & 8 deletions libs/shared/ui/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-ui",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/ui/src",
"projectType": "library",
"tags": [],
Expand All @@ -23,9 +25,7 @@
"options": {
"uiFramework": "@storybook/react",
"port": 4400,
"config": {
"configFolder": "libs/shared/ui/.storybook"
}
"configDir": "libs/shared/ui/.storybook"
},
"configurations": {
"ci": {
Expand All @@ -35,13 +35,11 @@
},
"build-storybook": {
"executor": "@nrwl/storybook:build",
"outputs": ["{options.outputPath}"],
"outputs": ["{options.outputDir}"],
"options": {
"uiFramework": "@storybook/react",
"outputPath": "dist/storybook/design-system",
"config": {
"configFolder": "libs/shared/ui/.storybook"
}
"configDir": "libs/shared/ui/.storybook",
"outputDir": "dist/storybook/design-system"
},
"configurations": {
"ci": {
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/utils/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-utils",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/utils/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/shared/websockets/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "shared-websockets",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/shared/websockets/src",
"projectType": "library",
"tags": [],
Expand Down
2 changes: 2 additions & 0 deletions libs/store/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "store",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/store/src",
"projectType": "library",
"tags": ["root-store"],
Expand Down
Loading