Remove nx

.eslintrc.json

@@ -1,87 +1,74 @@
 {
   "root": true,
-  "ignorePatterns": ["**/*"],
-  "plugins": ["@nx", "simple-import-sort"],
-  "rules": {
-    "no-duplicate-imports": [
-      "error",
-      {
-        "includeExports": true
-      }
-    ],
-    "simple-import-sort/imports": "error",
-    "simple-import-sort/exports": "error",
-    "storybook/no-uninstalled-addons": [
-      "error",
-      {
-        "ignore": ["@nx/react/plugins/storybook"]
-      }
-    ]
+  "env": {
+    "browser": true,
+    "es2020": true
   },
+  "ignorePatterns": ["**/*"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/jsx-runtime",
+    "plugin:react-hooks/recommended",
+    "plugin:jsx-a11y/recommended",
+    "plugin:storybook/recommended",
+
+    //Keep this at the end for compatibility with prettier
+    "prettier"
+  ],
   "overrides": [
     {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {
-        "@nx/enforce-module-boundaries": [
-          "error",
-          {
-            "enforceBuildableLibDependency": true,
-            "allow": ["@marble-front/builder"],
-            "depConstraints": [
-              {
-                "sourceTag": "type:api",
-                "onlyDependOnLibsWithTags": ["type:util"]
-              },
-              {
-                "sourceTag": "type:app",
-                "onlyDependOnLibsWithTags": [
-                  "type:ui",
-                  "type:util",
-                  "type:service"
-                ]
-              },
-              {
-                "sourceTag": "type:service",
-                "onlyDependOnLibsWithTags": ["type:util"]
-              },
-              {
-                "sourceTag": "type:ui",
-                "onlyDependOnLibsWithTags": ["type:ui", "type:util"]
-              },
-              {
-                "sourceTag": "type:util",
-                "onlyDependOnLibsWithTags": ["type:util"]
-              },
-              {
-                "sourceTag": "scope:webapp",
-                "onlyDependOnLibsWithTags": ["scope:webapp", "scope:shared"]
-              },
-              {
-                "sourceTag": "scope:shared",
-                "onlyDependOnLibsWithTags": ["scope:shared"]
-              }
-            ]
-          }
-        ]
+      "files": ["*.config.js"],
+      "env": {
+        "node": true
       }
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nx/typescript"],
+      "parser": "@typescript-eslint/parser",
+      "extends": [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking"
+      ],
+      "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "project": true
+      },
       "rules": {
+        "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/consistent-type-imports": [
           "error",
           {
             "fixStyle": "inline-type-imports"
           }
+        ],
+        "@typescript-eslint/no-unused-vars": [
+          "error",
+          {
+            "argsIgnorePattern": "^_",
+            "ignoreRestSiblings": true
+          }
         ]
       }
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nx/javascript"],
-      "rules": {}
     }
   ],
-  "extends": ["plugin:storybook/recommended"]
+  "plugins": ["react-refresh", "simple-import-sort"],
+  "rules": {
+    "no-duplicate-imports": [
+      "error",
+      {
+        "includeExports": true
+      }
+    ],
+    "simple-import-sort/imports": "error",
+    "simple-import-sort/exports": "error",
+    "storybook/no-uninstalled-addons": "error"
+  },
+  "settings": {
+    "jsx-a11y": {
+      "components": {
+        "Button": "button"
+      }
+    }
+  }
 }

.firebaserc

@@ -1,5 +1,8 @@
 {
   "projects": {
-    "default": "tokyo-country-381508"
-  }
+    "default": "tokyo-country-381508",
+    "staging": "tokyo-country-381508",
+    "production": "marble-prod-1"
+  },
+  "etags": {}
 }

.github/workflows/build_and_deploy.yaml

@@ -49,7 +49,7 @@ jobs:
           docker build \
             --platform linux/amd64 \
             --tag ${{env.TAG }} \
-            -f ./apps/builder/Dockerfile \
+            -f ./packages/app-builder/Dockerfile \
             .
 
       - name: Push

.github/workflows/check.yaml

@@ -26,8 +26,8 @@ jobs:
 
       - run: npm ci
 
-      - run: npx nx format:check
-      - run: npx nx affected -t lint --parallel=3
-      - run: npx nx affected -t type-check --parallel=3
-      - run: npx nx affected -t test --parallel=3 --configuration=ci
-      - run: npx nx affected -t build --parallel=3
+      - run: npm run format:check
+      - run: npm run lint --workspaces
+      - run: npm run type-check --workspaces
+      - run: npm run test:all
+      - run: npm run build --workspaces --if-present

.prettierignore

@@ -1,9 +1,11 @@
 # Add files here to ignore them from prettier formatting
+/.vscode/
 
-/dist
-/coverage
+# app-builder
+/packages/app-builder/.cache/
+/packages/app-builder/build/
+/packages/app-builder/public/build/
+/packages/app-builder/src/services/routes/routes.ts
 
-# Generated
-/libs/tailwind-preset/src/lib
-/libs/api/marble/src/lib/generated
-/apps/builder/app/services/routes/routes.ts
+# marble-api
+/packages/marble-api/src/generated