Skip to content

Commit

Permalink
Fix/nx CI (#1579)
Browse files Browse the repository at this point in the history
* f

* f

* f
  • Loading branch information
samijaber authored Oct 2, 2024
1 parent dbd5a50 commit 5240bc2
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
cache-install-state: true

- name: Build Site
run: yarn nx build @builder.io/mitosis-site
run: yarn g:nx build @builder.io/mitosis-site

e2e:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ In `core`, we use vitest snapshots & integeration tests for test coverage. If yo

- copy your fiddle component into a file in `packages/core/src/__tests__/data`. See [packages/core/src/**tests**/data/basic.raw.tsx](/packages/core/src/__tests__/data/basic.raw.tsx) as an example.
- add that test to the [test generator](/packages/core/src/__tests__/test-generator.ts), most likely in `BASIC_TESTS`.
- run `yarn nx test:watch` in the `packages/core` directory to run the snapshot tests in watch mode
- run `yarn g:nx test:watch` in the `packages/core` directory to run the snapshot tests in watch mode

PS: don't worry about failing imports in the raw test TSX files. These are not an issue, since the files are standalone and don't actually belong to a cohesive project.

Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
},
"devDependencies": {
"alpinejs": "^3.10.5",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^3.0.2",
"vite": "^3.2.2",
"vite-plugin-handlebars": "^1.6.0"
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
"@angular/cli": "~15.2.10",
"@angular/compiler-cli": "^15.2.10",
"cpy-cli": "5.0.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^3.0.2",
"typescript": "^4.9.5"
}
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-app/output/qwik/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
"@builder.io/e2e-app": "workspace:*",
"@builder.io/qwik": "^1.5.5",
"@types/node": "latest",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"typescript": "^5.3.2",
"undici": "^6.18.2",
"vite": "^3.2.2"
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-app/output/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"@types/node": "^16.11.47",
"@vitejs/plugin-vue": "^3.0.1",
"@vue/tsconfig": "^0.1.3",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"typescript": "^5.3.2",
"vite": "^3.2.2",
"vite-plugin-dts": "^1.5.0",
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
"devDependencies": {
"@types/node": "^20.12.13",
"concurrently": "^7.3.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.4.5",
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-qwikcity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
"eslint": "8.35.0",
"eslint-plugin-qwik": "0.21.0",
"node-fetch": "3.3.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"prettier": "2.8.4",
"typescript": "^5.3.2",
"undici": "5.20.0",
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@vitejs/plugin-react": "^1.3.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^3.0.2",
"typescript": "^5.3.2",
"vite": "^3.2.2"
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
"solid-styled-components": "^0.28.4"
},
"devDependencies": {
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^3.0.2",
"typescript": "^5.3.2",
"vite": "^3.2.2",
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
"@tsconfig/svelte": "^3.0.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^3.0.2",
"svelte": "^3.48.0",
"svelte-check": "^2.8.0",
Expand Down
2 changes: 0 additions & 2 deletions e2e/e2e-vue3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
"devDependencies": {
"@vitejs/plugin-vue": "^2.3.3",
"@vue/devtools": "^6.5.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"typescript": "^5.3.2",
"vite": "^3.2.2",
"vue-tsc": "^1.8.22"
Expand Down
2 changes: 0 additions & 2 deletions examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"eslint": "^8.17.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"prettier": "^2.5.0",
"typescript": "^5.3.2",
"watch": "^1.0.2"
Expand Down
4 changes: 0 additions & 4 deletions examples/todo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,5 @@
"@builder.io/mitosis": "workspace:*",
"@builder.io/mitosis-cli": "workspace:*",
"eslint": "^7.21.0"
},
"devDependencies": {
"nx": "^19.0.8",
"nx-cloud": "^19.0.0"
}
}
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"scripts": {
"g:changeset": "yarn changeset",
"g:nx": "cd $INIT_CWD && nx",
"ci:release": "yarn ci:build:release && yarn workspace @builder.io/mitosis-cli fix-core-version && yarn changeset publish",
"ci:build:release": "nx run-many --skip-nx-cache --target build -p @builder.io/mitosis @builder.io/mitosis-cli @builder.io/eslint-plugin-mitosis @builder.io/create-mitosis",
"ci:build": "nx run-many --target build --exclude \"@builder.io/e2e-alpine\"",
Expand Down Expand Up @@ -54,5 +55,13 @@
"@sveltejs/[email protected]": "patch:@sveltejs/package@npm:1.0.0-next.1#.yarn/patches/@sveltejs-package-npm-1.0.0-next.1-2fd015530b.patch",
"prettier": "^2.8.7",
"vite": "4.5.0"
},
"dependenciesMeta": {
"nx": {
"built": false
},
"nx-cloud": {
"built": false
}
}
}
2 changes: 0 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
"@types/lodash": "^4.14.180",
"@types/node": "^12.7.11",
"concurrently": "^8.2.2",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"ts-node": "^8.4.1",
"tsc-alias": "^1.8.8",
"typescript": "^5.3.2",
Expand Down
2 changes: 0 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@
"@types/rollup__plugin-virtual": "^2.0.1",
"concurrently": "^8.2.2",
"fs-extra-promise": "^1.0.1",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"rimraf": "^5.0.5",
"rollup": "^2.70.1",
"strip-ansi": "^6.0.1",
Expand Down
2 changes: 0 additions & 2 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
"lz-string": "^1.5.0",
"meilisearch-docsearch": "^0.6.0",
"monaco-editor": "^0.48.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"postcss": "^8.4.31",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
Expand Down
2 changes: 0 additions & 2 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
"@types/eslint": "^7.2.4",
"@typescript-eslint/parser": "^6.13.1",
"eslint": "^7.13.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0",
"typescript": "^5.3.2",
"vite": "^3.2.2",
"vitest": "^0.34.6"
Expand Down
6 changes: 2 additions & 4 deletions packages/fiddle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@
"devDependencies": {
"@types/lz-string": "^1.3.34",
"@types/node": "^18.14.6",
"@typescript-eslint/typescript-estree": "^5.59.0",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0"
"@typescript-eslint/typescript-estree": "^5.59.0"
},
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"deploy": "yarn nx build"
"deploy": "yarn g:nx build"
}
}
4 changes: 1 addition & 3 deletions packages/starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
"release:patch": "yarn version patch && yarn npm publish"
},
"devDependencies": {
"@types/node": "^20.9.1",
"nx": "^19.0.8",
"nx-cloud": "^19.0.0"
"@types/node": "^20.9.1"
}
}
41 changes: 5 additions & 36 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2969,8 +2969,6 @@ __metadata:
"@typescript-eslint/parser": "npm:^6.13.1"
eslint: "npm:^8.17.0"
node-fetch: "npm:^2.6.1"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
prettier: "npm:^2.5.0"
seedrandom: "npm:^3.0.5"
typescript: "npm:^5.3.2"
Expand All @@ -2985,8 +2983,6 @@ __metadata:
"@clack/prompts": "npm:^0.7.0"
"@types/node": "npm:^20.9.1"
cross-spawn: "npm:^7.0.3"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
bin:
create-mitosis: ./script.cjs
languageName: unknown
Expand All @@ -2998,8 +2994,6 @@ __metadata:
dependencies:
"@builder.io/e2e-app": "workspace:*"
alpinejs: "npm:^3.10.5"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
rimraf: "npm:^3.0.2"
vite: "npm:^3.2.2"
vite-plugin-handlebars: "npm:^1.6.0"
Expand All @@ -3024,8 +3018,6 @@ __metadata:
"@builder.io/mitosis-cli": "workspace:*"
cpy-cli: "npm:5.0.0"
http-server: "npm:^14.1.1"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
rimraf: "npm:^3.0.2"
rxjs: "npm:~7.5.0"
tslib: "npm:^2.3.0"
Expand All @@ -3041,8 +3033,6 @@ __metadata:
"@builder.io/e2e-app": "workspace:*"
"@builder.io/qwik": "npm:^1.5.5"
"@types/node": "npm:latest"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
typescript: "npm:^5.3.2"
undici: "npm:^6.18.2"
vite: "npm:^3.2.2"
Expand All @@ -3058,8 +3048,6 @@ __metadata:
"@playwright/test": "npm:^1.34.0"
"@types/node": "npm:^20.12.13"
concurrently: "npm:^7.3.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
solid-js: "npm:^1.4.5"
Expand Down Expand Up @@ -3087,8 +3075,6 @@ __metadata:
eslint: "npm:8.35.0"
eslint-plugin-qwik: "npm:0.21.0"
node-fetch: "npm:3.3.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
prettier: "npm:2.8.4"
typescript: "npm:^5.3.2"
undici: "npm:5.20.0"
Expand All @@ -3105,8 +3091,6 @@ __metadata:
"@types/react": "npm:^18.0.14"
"@types/react-dom": "npm:^18.0.5"
"@vitejs/plugin-react": "npm:^1.3.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
rimraf: "npm:^3.0.2"
Expand All @@ -3120,8 +3104,6 @@ __metadata:
resolution: "@builder.io/e2e-solid@workspace:e2e/e2e-solid"
dependencies:
"@builder.io/e2e-app": "workspace:*"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
rimraf: "npm:^3.0.2"
solid-js: "npm:^1.4.5"
solid-styled-components: "npm:^0.28.4"
Expand All @@ -3138,8 +3120,6 @@ __metadata:
"@builder.io/e2e-app": "workspace:*"
"@sveltejs/vite-plugin-svelte": "npm:^1.0.0-next.49"
"@tsconfig/svelte": "npm:^3.0.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
rimraf: "npm:^3.0.2"
svelte: "npm:^3.48.0"
svelte-check: "npm:^2.8.0"
Expand All @@ -3157,8 +3137,6 @@ __metadata:
"@e2e-app/vue": "workspace:*"
"@vitejs/plugin-vue": "npm:^2.3.3"
"@vue/devtools": "npm:^6.5.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
typescript: "npm:^5.3.2"
vite: "npm:^3.2.2"
vue: "npm:^3.2.37"
Expand All @@ -3174,8 +3152,6 @@ __metadata:
"@types/eslint": "npm:^7.2.4"
"@typescript-eslint/parser": "npm:^6.13.1"
eslint: "npm:^7.13.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
ts-pattern: "npm:^3.3.5"
typescript: "npm:^5.3.2"
vite: "npm:^3.2.2"
Expand Down Expand Up @@ -3203,8 +3179,6 @@ __metadata:
fs-extra: "npm:^9.1.0"
gluegun: "npm:latest"
lodash: "npm:^4.17.21"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
prettier: "npm:^2.6.1"
ts-morph: "npm:^19.0.0"
ts-node: "npm:^8.4.1"
Expand Down Expand Up @@ -3241,8 +3215,6 @@ __metadata:
mobx-react-lite: "npm:^3.4.0"
monaco-editor: "npm:^0.34.0"
next: "npm:latest"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
prettier: "npm:^3.0.3"
prettier-plugin-svelte: "npm:^3.0.3"
raw-loader: "npm:^4.0.2"
Expand Down Expand Up @@ -3276,6 +3248,11 @@ __metadata:
prettier-plugin-organize-imports: "npm:^3.2.2"
rimraf: "npm:5.0.5"
typescript: "npm:^5.3.2"
dependenciesMeta:
nx:
built: false
nx-cloud:
built: false
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3307,8 +3284,6 @@ __metadata:
lz-string: "npm:^1.5.0"
meilisearch-docsearch: "npm:^0.6.0"
monaco-editor: "npm:^0.48.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
postcss: "npm:^8.4.31"
prettier: "npm:^3.2.5"
prettier-plugin-tailwindcss: "npm:^0.5.14"
Expand Down Expand Up @@ -3398,8 +3373,6 @@ __metadata:
json5: "npm:^2.1.3"
lodash: "npm:^4.17.20"
neotraverse: "npm:^0.6.15"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
object-hash: "npm:^2.0.3"
prettier: "npm:>=2.0.0 <3.0.0"
prettier-plugin-organize-imports: "npm:^3.2.3"
Expand Down Expand Up @@ -3538,8 +3511,6 @@ __metadata:
"@builder.io/mitosis": "workspace:*"
"@builder.io/mitosis-cli": "workspace:*"
eslint: "npm:^7.21.0"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3875,8 +3846,6 @@ __metadata:
"@types/node": "npm:^16.11.47"
"@vitejs/plugin-vue": "npm:^3.0.1"
"@vue/tsconfig": "npm:^0.1.3"
nx: "npm:^19.0.8"
nx-cloud: "npm:^19.0.0"
typescript: "npm:^5.3.2"
vite: "npm:^3.2.2"
vite-plugin-dts: "npm:^1.5.0"
Expand Down

0 comments on commit 5240bc2

Please sign in to comment.