Skip to content

Commit afeb6aa

Browse files
tefkahtefkah
committed
chore: nx upgrade
1 parent b2a6c54 commit afeb6aa

64 files changed

Lines changed: 4628 additions & 5174 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx", "prettier", "prefer-arrow"],
4+
"plugins": ["@nx", "prettier", "prefer-arrow"],
55
"rules": {},
66
"overrides": [
77
{
88
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
99
"rules": {
10-
"@nrwl/nx/enforce-module-boundaries": [
10+
"@nx/enforce-module-boundaries": [
1111
"error",
1212
{
1313
"enforceBuildableLibDependency": true,
@@ -24,7 +24,7 @@
2424
},
2525
{
2626
"files": ["*.ts", "*.tsx"],
27-
"extends": ["plugin:@nrwl/nx/typescript", "airbnb", "airbnb-typescript", "next", "prettier"],
27+
"extends": ["plugin:@nx/typescript", "airbnb", "airbnb-typescript", "next", "prettier"],
2828
"rules": {
2929
"prefer-arrow/prefer-arrow-functions": [
3030
"error",
@@ -34,8 +34,19 @@
3434
"classPropertiesAllowed": false
3535
}
3636
],
37-
"prefer-arrow-callback": ["error", { "allowNamedFunctions": true }],
38-
"func-style": ["error", "expression", { "allowArrowFunctions": true }],
37+
"prefer-arrow-callback": [
38+
"error",
39+
{
40+
"allowNamedFunctions": true
41+
}
42+
],
43+
"func-style": [
44+
"error",
45+
"expression",
46+
{
47+
"allowArrowFunctions": true
48+
}
49+
],
3950
"react/prop-types": "off",
4051
"import/prefer-default-export": "off",
4152
"import/no-extraneous-dependencies": "off",
@@ -61,7 +72,12 @@
6172
},
6273
{
6374
"files": ["*.js", "*.jsx"],
64-
"extends": ["plugin:@nrwl/nx/javascript"],
75+
"extends": ["plugin:@nx/javascript"],
76+
"rules": {}
77+
},
78+
{
79+
"files": "*.json",
80+
"parser": "jsonc-eslint-parser",
6581
"rules": {}
6682
}
6783
]

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"typescript.tsdk": "node_modules/typescript/lib",
3-
43
"tailwindCSS.experimental.configFile": "apps/trialanderror.org/tailwind.config.cjs",
54
"exportall.config.folderListener": ["/libs/types/src/lib/github", "/libs/types/src/lib"],
65
"appService.defaultWebAppToDeploy": "/subscriptions/3d4dfc68-39d1-4d8e-81d5-b59ee8d8cd36/microsoft.web/sites/subscriptions/3d4dfc68-39d1-4d8e-81d5-b59ee8d8cd36/resourceGroups/centeroftrialanderror.com/providers/Microsoft.Web/sites/cote-strapi",
76
"appService.deploySubpath": "apps/strapi",
8-
"exportall.config.relExclusion": ["/libs/types/src/lib/validators.ts"]
7+
"exportall.config.relExclusion": ["/libs/types/src/lib/validators.ts"],
8+
"eslint.validate": ["json"]
99
}

‎apps/blog-e2e/cypress.config.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { defineConfig } from 'cypress'
2-
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'
2+
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset'
33

44
export default defineConfig({
55
e2e: {
66
...nxE2EPreset(__dirname),
77
/**
8-
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
9-
* This can cause tests to start breaking where not indended.
10-
* You should consider enabling this once you verify tests do not depend on each other
11-
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
12-
**/
8+
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
9+
* This can cause tests to start breaking where not indended.
10+
* You should consider enabling this once you verify tests do not depend on each other
11+
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
12+
**/
1313
testIsolation: false,
1414
},
1515
})

‎apps/blog-e2e/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"projectType": "application",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/cypress:cypress",
8+
"executor": "@nx/cypress:cypress",
99
"options": {
1010
"cypressConfig": "apps/blog-e2e/cypress.config.ts",
1111
"devServerTarget": "blog:dev",
1212
"testingType": "e2e"
1313
}
1414
},
1515
"lint": {
16-
"executor": "@nrwl/linter:eslint",
16+
"executor": "@nx/linter:eslint",
1717
"outputs": ["{options.outputFile}"],
1818
"options": {
1919
"lintFilePatterns": ["apps/blog-e2e/**/*.{js,ts}"]

‎apps/blog/project.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{
2-
"$schema": "../../node_modules/nx/schemas/project-schema.json",
32
"name": "blog",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "application",
55
"sourceRoot": "apps/blog/src",
66
"targets": {
77
"build": {
8-
"outputs": ["dist/apps/blog"],
8+
"outputs": [
9+
"dist/apps/blog"
10+
],
911
"executor": "@nxtensions/astro:build",
1012
"options": {
1113
"config": "astro.config.ts"
@@ -18,8 +20,7 @@
1820
"preview": {
1921
"dependsOn": [
2022
{
21-
"target": "build",
22-
"projects": "self"
23+
"target": "build"
2324
}
2425
],
2526
"executor": "@nxtensions/astro:preview",

‎apps/email/.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": [
3-
"plugin:@nrwl/nx/react-typescript",
3+
"plugin:@nx/react-typescript",
44
"next",
55
"next/core-web-vitals",
66
"../../.eslintrc.json"

‎apps/email/jest.config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ export default {
33
displayName: 'trialanderror.org',
44
preset: '../../jest.preset.js',
55
transform: {
6-
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
7-
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
6+
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
7+
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
88
},
99
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
1010
coverageDirectory: '../../coverage/apps/trialanderror.org',
11-
}
11+
};

‎apps/email/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"command": "pnpm exec email dev --dir apps/email/emails"
1212
},
1313
"test": {
14-
"executor": "@nrwl/jest:jest",
14+
"executor": "@nx/jest:jest",
1515
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
1616
"options": {
1717
"jestConfig": "apps/email/jest.config.ts",
1818
"passWithNoTests": true
1919
}
2020
},
2121
"lint": {
22-
"executor": "@nrwl/linter:eslint",
22+
"executor": "@nx/linter:eslint",
2323
"outputs": ["{options.outputFile}"],
2424
"options": {
2525
"lintFilePatterns": ["apps/email/**/*.{ts,tsx,js,jsx}"]

‎apps/email/tailwind.config.cjs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// @ts-check
2-
const { createGlobPatternsForDependencies } = require("@nrwl/react/tailwind")
2+
const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
33

4-
const { join } = require("path")
5-
const defaultTheme = require("tailwindcss/defaultTheme")
4+
const { join } = require('path');
5+
const defaultTheme = require('tailwindcss/defaultTheme');
66

77
/**
88
* @type {import('tailwindcss').Config}
99
*/
1010
module.exports = {
11-
darkMode: "class",
11+
darkMode: 'class',
1212
// presets: [require("../../tailwind-workspace-preset.js")],
1313
content: [
14-
join(__dirname, "**/*!(*.stories|*.spec).{ts,tsx,html}"),
14+
join(__dirname, '**/*!(*.stories|*.spec).{ts,tsx,html}'),
1515
...createGlobPatternsForDependencies(__dirname),
1616
],
1717
theme: {
@@ -20,7 +20,7 @@ module.exports = {
2020
},
2121
extend: {
2222
fontFamily: {
23-
sans: ["var(--font-open-sans)", ...defaultTheme.fontFamily.sans],
23+
sans: ['var(--font-open-sans)', ...defaultTheme.fontFamily.sans],
2424
},
2525
boxShadow: {
2626
'thick-1': '2px 2px 0 #000',
@@ -32,31 +32,31 @@ module.exports = {
3232
},
3333
colors: {
3434
orange: {
35-
50: "#ffe13e",
36-
100: "#ffd734",
37-
200: "#ffcd2a",
38-
300: "#ffc320",
39-
400: "#ffb916",
40-
500: "#ffaf0c",
41-
600: "#f5a502",
42-
700: "#eb9b00",
43-
800: "#e19100",
44-
900: "#d78700",
35+
50: '#ffe13e',
36+
100: '#ffd734',
37+
200: '#ffcd2a',
38+
300: '#ffc320',
39+
400: '#ffb916',
40+
500: '#ffaf0c',
41+
600: '#f5a502',
42+
700: '#eb9b00',
43+
800: '#e19100',
44+
900: '#d78700',
4545
},
4646
blue: {
47-
50: "#dfe4ea",
48-
100: "#284e6a",
49-
200: "#1e4460",
50-
300: "#143a56",
51-
400: "#0a304c",
52-
500: "#002642",
53-
600: "#001c38",
54-
700: "#00122e",
55-
800: "#000824",
56-
900: "#00001a",
47+
50: '#dfe4ea',
48+
100: '#284e6a',
49+
200: '#1e4460',
50+
300: '#143a56',
51+
400: '#0a304c',
52+
500: '#002642',
53+
600: '#001c38',
54+
700: '#00122e',
55+
800: '#000824',
56+
900: '#00001a',
5757
},
5858
},
5959
},
6060
},
61-
plugins: [require("@tailwindcss/typography"), require("@tailwindcss/forms")],
62-
}
61+
plugins: [require('@tailwindcss/typography'), require('@tailwindcss/forms')],
62+
};

‎apps/frontend/.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": [
3-
"plugin:@nrwl/nx/react-typescript",
3+
"plugin:@nx/react-typescript",
44
"next",
55
"next/core-web-vitals",
66
"../../.eslintrc.json"

0 commit comments

Comments
 (0)