Skip to content

Commit

Permalink
chore: add missing links in monorepo tree + cleaning (#1193)
Browse files Browse the repository at this point in the history
<!-- For Coveo Employees only. Fill this section.

CDX-XXX

-->

## Proposed changes

- Add link from the create-atomic-* packages to their templates
- Add link from atomic-component-health-check to create-atomic-*
packages
- Morph vue to follow the 'defacto' standard.
- Replaced `.npmignore` by !-prefixed entry in `files` (because `files`
overrule ignore`)
- Replaced verbose noop executor by `nx:noop`

## Testing

- Run nx graph and check the project graph, and the task graph for
`release:phase1` before and after.
- Assert that all `create-atomic-*` packages depends (indirectly) on
`atomic-component-health-check`
- Assert that the CLI depends on all the package it may calls using npx

---------

Co-authored-by: ylakhdar <ylakhdar@coveo.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: jpmarceau <39384459+jpmarceau@users.noreply.github.com>
  • Loading branch information
6 people authored Mar 22, 2023
1 parent bfcaf69 commit 34e7b86
Show file tree
Hide file tree
Showing 21 changed files with 107 additions and 21 deletions.
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"{projectRoot}/dist",
"{projectRoot}/tsconfig.build.tsbuildinfo"
]
},
"release:phase1": {
"dependsOn": ["^release:phase1"]
}
},
"tasksRunnerOptions": {
Expand Down
4 changes: 4 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"packages/*",
"packages/ui/*",
"packages/ui/atomic/*",
"packages/ui/atomic/*/template/*",
"packages/ui/vue/create-headless-vue",
"packages/ui/vue/create-headless-vue/template",
"packages/cli/*",
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
"@coveo/cra-template": "1.36.5",
"@coveo/create-atomic": "1.36.4",
"@coveo/create-headless-vue": "1.1.0",
"@coveo/create-atomic-component": "0.1.1",
"@coveo/create-atomic-component-project": "0.1.1",
"@coveo/create-atomic-result-component": "0.1.1",
"@oclif/test": "2.2.21",
"@types/archiver": "5.3.2",
"@types/async-retry": "1.4.5",
Expand Down
4 changes: 0 additions & 4 deletions packages/ui/atomic/create-atomic-component-project/.npmignore

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"files": [
"index.js",
"template/**/*",
"!template/**/project.json",
"template/.gitignore"
],
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"name": "create-atomic-component-project",
"root": "packages/ui/atomic/create-atomic-component-project",
"sourceRoot": "packages/ui/atomic/create-atomic-component-project/template",
"projectType": "application"
"projectType": "application",
"implicitDependencies": ["create-atomic-component-project-template"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "create-atomic-component-project-template",
"root": "packages/ui/create-atomic-component-project/template",
"sourceRoot": "packages/ui/create-atomic-component-project/template",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
},
"test": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
}
}
}
4 changes: 0 additions & 4 deletions packages/ui/atomic/create-atomic-component/.npmignore

This file was deleted.

1 change: 1 addition & 0 deletions packages/ui/atomic/create-atomic-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"files": [
"index.js",
"template/**/*",
"!template/**/project.json",
"template/.gitignore"
],
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/ui/atomic/create-atomic-component/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"name": "create-atomic-component",
"root": "packages/ui/atomic/create-atomic-component",
"sourceRoot": "packages/ui/atomic/create-atomic-component/template",
"projectType": "application"
"projectType": "application",
"implicitDependencies": ["create-atomic-component-template"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "create-atomic-component-template",
"root": "packages/ui/create-atomic-component/template/src/components/sample-component",
"sourceRoot": "packages/ui/create-atomic-component/template/src/components/sample-component",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
},
"test": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
}
}
}

This file was deleted.

4 changes: 0 additions & 4 deletions packages/ui/atomic/create-atomic-result-component/.npmignore

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"files": [
"index.js",
"template/**/*",
"!template/**/project.json",
"template/.gitignore"
],
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"name": "create-atomic-result-component",
"root": "packages/ui/atomic/create-atomic-result-component",
"sourceRoot": "packages/ui/atomic/create-atomic-result-component/template",
"projectType": "application"
"projectType": "application",
"implicitDependencies": ["create-atomic-result-component-template"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "create-atomic-result-component-template",
"root": "packages/ui/create-atomic-result-component/template/src/components/sample-result-component",
"sourceRoot": "packages/ui/create-atomic-result-component/template/src/components/sample-result-component",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
},
"test": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
}
}
}
6 changes: 6 additions & 0 deletions packages/ui/atomic/template/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"options": {
"command": "exit 0"
}
},
"test": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
}
}
}
1 change: 1 addition & 0 deletions packages/ui/vue/create-headless-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"files": [
"index.js",
"template/*",
"!template/**/project.json",
"template/.gitignore"
],
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/ui/vue/create-headless-vue/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"name": "create-headless-vue",
"root": "packages/ui/atomic/create-headless-vue",
"sourceRoot": "packages/ui/atomic/create-headless-vue/template",
"projectType": "application"
"projectType": "application",
"implicitDependencies": ["create-headless-vue-template"]
}
19 changes: 18 additions & 1 deletion packages/ui/vue/create-headless-vue/template/project.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
{
"ignore": true
"name": "create-headless-vue-template",
"root": "packages/ui/vue/create-headless-vue/template",
"sourceRoot": "packages/ui/vue/create-headless-vue/template",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
},
"test": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "exit 0"
}
}
}
}

0 comments on commit 34e7b86

Please sign in to comment.