fix(content): adjust project config (#1122)

analogjs · May 29, 2024 · 2570d65 · 2570d65
1 parent 9f750ae
commit 2570d65
Show file tree

Hide file tree

Showing 28 changed files with 76 additions and 72 deletions.
diff --git a/apps/analog-app-e2e-cypress/project.json b/apps/analog-app-e2e-cypress/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/analog-app-e2e-cypress/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["analog-app"],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -22,7 +24,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["analog-app"]
+  }
 }
diff --git a/apps/analog-app-e2e-playwright/project.json b/apps/analog-app-e2e-playwright/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/analog-app-e2e-playwright/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["analog-app"],
   "targets": {
     "vitest": {
       "executor": "@nx/vite:test"
@@ -18,7 +20,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["analog-app"]
+  }
 }
diff --git a/apps/analog-app/project.json b/apps/analog-app/project.json
@@ -4,6 +4,7 @@
   "projectType": "application",
   "sourceRoot": "apps/analog-app/src",
   "prefix": "analogjs",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/vite:build",
@@ -66,6 +67,5 @@
       "executor": "@nx/vite:test",
       "outputs": ["{projectRoot}/coverage"]
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/analog-preset-e2e/project.json b/apps/analog-preset-e2e/project.json
@@ -3,11 +3,11 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/analog-preset-e2e/src",
+  "tags": [],
+  "implicitDependencies": ["platform"],
   "targets": {
     "e2e": {
       "executor": "@nx/vite:test"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["platform"]
+  }
 }
diff --git a/apps/astro-app-e2e-playwright/project.json b/apps/astro-app-e2e-playwright/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/astro-app-e2e-playwright/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["astro-app"],
   "targets": {
     "vitest": {
       "executor": "@nx/vite:test"
@@ -18,7 +20,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["astro-app"]
+  }
 }
diff --git a/apps/astro-app/project.json b/apps/astro-app/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/astro-app/src",
+  "tags": [],
+  "implicitDependencies": ["astro-angular"],
   "targets": {
     "serve": {
       "command": "astro dev --root apps/astro-app"
@@ -13,7 +15,5 @@
     "preview": {
       "command": "astro preview --root apps/astro-app"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["astro-angular"]
+  }
 }
diff --git a/apps/blog-app-e2e-cypress/project.json b/apps/blog-app-e2e-cypress/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/blog-app-e2e-cypress/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["blog-app"],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -21,7 +23,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["blog-app"]
+  }
 }
diff --git a/apps/blog-app/project.json b/apps/blog-app/project.json
@@ -4,6 +4,7 @@
   "projectType": "application",
   "sourceRoot": "apps/blog-app/src",
   "prefix": "blog",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/vite:build",
@@ -54,6 +55,5 @@
         "staticFilePath": "dist/apps/blog-app/analog/public"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/create-analog-e2e/project.json b/apps/create-analog-e2e/project.json
@@ -3,11 +3,11 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/create-analog-e2e/src",
+  "tags": [],
+  "implicitDependencies": ["create-analog"],
   "targets": {
     "e2e": {
       "executor": "@nx/vite:test"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["create-analog"]
+  }
 }
diff --git a/apps/docs-app/project.json b/apps/docs-app/project.json
@@ -3,15 +3,19 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/docs-app/src",
+  "tags": [],
+  "namedInputs": {
+    "projectSpecificFiles": ["{workspaceRoot}/CONTRIBUTING.md"]
+  },
   "targets": {
     "build": {
       "executor": "nx:run-commands",
       "options": {
         "cwd": "apps/docs-app",
         "command": "docusaurus build  --out-dir={args.out-dir}",
-        "out-dir": "../../dist/apps/docs-app",
-        "outputPath": "dist/apps/docs-app"
-      }
+        "out-dir": "../../dist/apps/docs-app"
+      },
+      "outputs": ["{workspaceRoot}/dist/apps/docs-app"]
     },
     "serve": {
       "executor": "nx:run-commands",
@@ -44,9 +48,5 @@
         "command": "docusaurus write-translations --locale={args.locale}"
       }
     }
-  },
-  "tags": [],
-  "namedInputs": {
-    "projectSpecificFiles": ["{workspaceRoot}/CONTRIBUTING.md"]
   }
 }
diff --git a/apps/nx-plugin-e2e/project.json b/apps/nx-plugin-e2e/project.json
@@ -3,11 +3,11 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/nx-plugin-e2e/src",
+  "tags": [],
+  "implicitDependencies": ["platform", "trpc", "content"],
   "targets": {
     "e2e": {
       "executor": "@nx/vite:test"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["platform", "trpc", "content"]
+  }
 }
diff --git a/apps/trpc-app-e2e-playwright/project.json b/apps/trpc-app-e2e-playwright/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/trpc-app-e2e-playwright/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["trpc-app"],
   "targets": {
     "vitest": {
       "executor": "@nx/vite:test"
@@ -18,7 +20,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["trpc-app"]
+  }
 }
diff --git a/apps/trpc-app/project.json b/apps/trpc-app/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/trpc-app/src",
+  "tags": [],
+  "implicitDependencies": ["trpc"],
   "targets": {
     "build": {
       "dependsOn": ["^build"],
@@ -67,7 +69,5 @@
       "executor": "@nx/vite:test",
       "outputs": ["{projectRoot}/coverage"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["trpc"]
+  }
 }
diff --git a/libs/card/project.json b/libs/card/project.json
@@ -3,8 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/card/src",
   "prefix": "lib",
-  "tags": [],
   "projectType": "library",
+  "tags": [],
+  "implicitDependencies": ["vite-plugin-angular"],
   "targets": {
     "test": {
       "executor": "@nx/vite:test"
@@ -13,6 +14,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "implicitDependencies": ["vite-plugin-angular"]
+  }
 }
diff --git a/libs/top-bar/project.json b/libs/top-bar/project.json
@@ -4,6 +4,7 @@
   "projectType": "library",
   "sourceRoot": "libs/top-bar/src",
   "prefix": "analogjs",
+  "tags": [],
   "targets": {
     "test": {
       "executor": "@nx/vite:test"
@@ -12,6 +13,5 @@
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
-  },
-  "tags": []
+  }
 }
diff --git a/nx.json b/nx.json
@@ -36,11 +36,6 @@
     "@nx/eslint:lint": {
       "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
       "cache": true
-    },
-    "@nx/js:tsc": {
-      "cache": true,
-      "dependsOn": ["^build"],
-      "inputs": ["production", "^production"]
     }
   },
   "generators": {

diff --git a/packages/astro-angular/project.json b/packages/astro-angular/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/astro-angular/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
@@ -43,6 +44,5 @@
         "tagPrefix": "astro-angular@"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/packages/content-plugin/package.json b/packages/content-plugin/package.json
@@ -1,5 +1,6 @@
 {
   "name": "content-plugin",
   "version": "0.0.1",
-  "main": "./src/index.js"
+  "main": "./src/index.js",
+  "type": "commonjs"
 }
diff --git a/packages/content-plugin/tsconfig.json b/packages/content-plugin/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "commonjs"
+    "module": "CommonJS"
   },
   "files": [],
   "include": [],

diff --git a/packages/content/ng-package.json b/packages/content/ng-package.json
@@ -1,7 +1,6 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../node_modules/@analogjs/content",
-  "assets": ["migrations/migration.json"],
   "lib": {
     "entryFile": "src/index.ts"
   }

diff --git a/packages/content/project.json b/packages/content/project.json
@@ -4,8 +4,18 @@
   "projectType": "library",
   "sourceRoot": "packages/content/src",
   "prefix": "analogjs",
+  "tags": [],
   "targets": {
     "build": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/node_modules/@analogjs/content"],
+      "options": {
+        "commands": ["nx build-package content", "nx build content-plugin"],
+        "parallel": false
+      },
+      "dependsOn": ["^build"]
+    },
+    "build-package": {
       "executor": "@angular-devkit/build-angular:ng-packagr",
       "outputs": ["{workspaceRoot}/node_modules/@analogjs/content"],
       "options": {
@@ -36,6 +46,5 @@
         "tagPrefix": "content@"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/packages/create-analog/project.json b/packages/create-analog/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/vite-plugin-angular/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "nx:run-commands",
@@ -21,6 +22,5 @@
         "tagPrefix": "create-analog@"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/packages/nx-plugin/project.json b/packages/nx-plugin/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/nx-plugin/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
@@ -43,6 +44,5 @@
     "test": {
       "executor": "@nx/vite:test"
     }
-  },
-  "tags": []
+  }
 }