Merge pull request #145 from TrialAndErrorOrg/feat/next-blog

Author: tefkah

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.json

@@ -1,13 +1,13 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx", "prettier", "prefer-arrow"],
+  "plugins": ["@nx", "prettier", "prefer-arrow"],
   "rules": {},
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -24,7 +24,7 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript", "airbnb", "airbnb-typescript", "next", "prettier"],
+      "extends": ["plugin:@nx/typescript", "airbnb", "airbnb-typescript", "next", "prettier"],
       "rules": {
         "prefer-arrow/prefer-arrow-functions": [
           "error",
@@ -34,8 +34,19 @@
             "classPropertiesAllowed": false
           }
         ],
-        "prefer-arrow-callback": ["error", { "allowNamedFunctions": true }],
-        "func-style": ["error", "expression", { "allowArrowFunctions": true }],
+        "prefer-arrow-callback": [
+          "error",
+          {
+            "allowNamedFunctions": true
+          }
+        ],
+        "func-style": [
+          "error",
+          "expression",
+          {
+            "allowArrowFunctions": true
+          }
+        ],
         "react/prop-types": "off",
         "import/prefer-default-export": "off",
         "import/no-extraneous-dependencies": "off",
@@ -61,7 +72,12 @@
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
+      "rules": {}
+    },
+    {
+      "files": "*.json",
+      "parser": "jsonc-eslint-parser",
       "rules": {}
     }
   ]

.storybook/main.js

@@ -1,9 +1,9 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-
   "tailwindCSS.experimental.configFile": "apps/trialanderror.org/tailwind.config.cjs",
   "exportall.config.folderListener": ["/libs/types/src/lib/github", "/libs/types/src/lib"],
   "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",
   "appService.deploySubpath": "apps/strapi",
-  "exportall.config.relExclusion": ["/libs/types/src/lib/validators.ts"]
+  "exportall.config.relExclusion": ["/libs/types/src/lib/validators.ts"],
+  "eslint.validate": ["json"]
 }

.storybook/tsconfig.json

@@ -1,6 +1,15 @@
 import { defineConfig } from 'cypress'
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset'
 
 export default defineConfig({
-  e2e: nxE2EPreset(__dirname),
+  e2e: {
+    ...nxE2EPreset(__dirname),
+    /**
+     * TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
+     * This can cause tests to start breaking where not indended.
+     * You should consider enabling this once you verify tests do not depend on each other
+     * More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
+     **/
+    testIsolation: false,
+  },
 })

.vscode/settings.json

@@ -5,15 +5,15 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/blog-e2e/cypress.config.ts",
         "devServerTarget": "blog:dev",
         "testingType": "e2e"
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/blog-e2e/**/*.{js,ts}"]

apps/blog-e2e/cypress.config.ts

@@ -1,11 +1,13 @@
 {
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "name": "blog",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/blog/src",
   "targets": {
     "build": {
-      "outputs": ["dist/apps/blog"],
+      "outputs": [
+        "dist/apps/blog"
+      ],
       "executor": "@nxtensions/astro:build",
       "options": {
         "config": "astro.config.ts"
@@ -18,8 +20,7 @@
     "preview": {
       "dependsOn": [
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ],
       "executor": "@nxtensions/astro:preview",

apps/blog-e2e/project.json

@@ -1,6 +1,6 @@
 {
   "extends": [
-    "plugin:@nrwl/nx/react-typescript",
+    "plugin:@nx/react-typescript",
     "next",
     "next/core-web-vitals",
     "../../.eslintrc.json"

apps/blog/project.json

@@ -3,9 +3,9 @@ export default {
   displayName: 'trialanderror.org',
   preset: '../../jest.preset.js',
   transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/apps/trialanderror.org',
-}
+};