Skip to content

Commit 2ede880

Browse files
authored
fix: env setup in nxV22 (#95)
1 parent ee65045 commit 2ede880

File tree

92 files changed

+9236
-8680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+9236
-8680
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ jobs:
2424
- name: Audit production dependencies
2525
run: npm audit --omit=dev --omit=optional
2626

27-
lint:
28-
name: Lint
29-
runs-on: ubuntu-latest
27+
unit-test:
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
os: [ubuntu-latest, macos-latest, windows-latest]
32+
name: Unit tests
33+
runs-on: ${{ matrix.os }}
3034
steps:
3135
- name: Checkout repository
3236
uses: actions/checkout@v4
@@ -41,15 +45,15 @@ jobs:
4145
uses: nrwl/nx-set-shas@v4
4246
- name: Install dependencies
4347
run: npm ci
44-
- name: Lint affected projects
45-
run: npx nx affected -t lint --parallel=3 --verbose
48+
- name: Unit test affected projects
49+
run: npx nx affected -t unit-test --parallel=3 --coverage.enabled --exclude="tag:type:example"
4650

47-
unit-test:
51+
int-test:
4852
strategy:
4953
fail-fast: false
5054
matrix:
51-
os: [ubuntu-latest, macos-latest, windows-latest] # @TODO add windows-latest after we have the os agnostic macher
52-
name: Unit tests
55+
os: [ubuntu-latest, macos-latest, windows-latest]
56+
name: Integration tests
5357
runs-on: ${{ matrix.os }}
5458
steps:
5559
- name: Checkout repository
@@ -65,14 +69,14 @@ jobs:
6569
uses: nrwl/nx-set-shas@v4
6670
- name: Install dependencies
6771
run: npm ci
68-
- name: Unit test affected projects
69-
run: npx nx affected -t unit-test integration-test --parallel=3 --coverage.enabled
72+
- name: Integration test affected projects
73+
run: npx nx affected -t integration-test --parallel=3 --coverage.enabled --exclude="tag:type:example"
7074

7175
e2e:
7276
strategy:
7377
fail-fast: false
7478
matrix:
75-
os: [ubuntu-latest, macos-latest, windows-latest] # @TODO add windows-latest after we know why it is running forever
79+
os: [ubuntu-latest, macos-latest] # @TODO add windows-latest after we know why it is running forever
7680
name: E2E tests
7781
runs-on: ${{ matrix.os }}
7882
steps:
@@ -88,6 +92,6 @@ jobs:
8892
- name: Set base and head for Nx affected commands
8993
uses: nrwl/nx-set-shas@v4
9094
- name: Install dependencies
91-
run: npm i
95+
run: npm ci
9296
- name: E2E test affected projects
9397
run: npx nx affected -t nxv-e2e --exclude="tag:type:example" --skipNxCache --verbose

.node-version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
24.1.0
2+

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.11.0
1+
24

.prettierignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
/dist
33
/coverage
44
/.nx
5+
/profiles
6+
/tmp
7+
/node_modules
8+
*.cpuprofile
9+
*.trace
510
CHANGELOG.md

code-pushup.config.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

code-pushup.preset.ts

Lines changed: 0 additions & 127 deletions
This file was deleted.

e2e/nx-verdaccio-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"targets": {
99
"lint": {},
1010
"e2e": {
11-
"executor": "@nx/vite:test",
11+
"executor": "@nx/vitest:test",
1212
"inputs": ["default", "^production"],
1313
"options": {
1414
"coverage": false

e2e/nx-verdaccio-e2e/test/plugin-create-nodes.e2e.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ describe('nx-verdaccio plugin create-nodes-v2', () => {
187187
'nxv-env-bootstrap': expect.objectContaining({
188188
executor: '@push-based/nx-verdaccio:env-bootstrap',
189189
options: {
190-
verdaccioStartTarget: 'nxv-verdaccio-start',
190+
verdaccioStartTarget: 'local-registry',
191191
verdaccioStopTarget: 'nxv-verdaccio-stop',
192192
},
193193
}),
@@ -236,7 +236,7 @@ describe('nx-verdaccio plugin create-nodes-v2', () => {
236236
'{options.environmentRoot}/node_modules',
237237
],
238238
}),
239-
'nxv-verdaccio-start': expect.objectContaining({
239+
'local-registry': expect.objectContaining({
240240
executor: '@nx/js:verdaccio',
241241
options: expect.objectContaining({
242242
clear: true,
@@ -290,7 +290,7 @@ describe('nx-verdaccio plugin create-nodes-v2', () => {
290290
'nxv-env-bootstrap': expect.any(Object),
291291
'nxv-env-install': expect.any(Object),
292292
'nxv-env-setup': expect.any(Object),
293-
'nxv-verdaccio-start': expect.any(Object),
293+
'local-registry': expect.any(Object),
294294
'nxv-verdaccio-stop': expect.any(Object),
295295
})
296296
);

0 commit comments

Comments
 (0)