Skip to content

Commit afb1f44

Browse files
markostanimirovicmarkostanimirovic
authored
Merge branch 'main' into test/migrate-jest-to-vitest-store
2 parents 4bbea6a + 123b117 commit afb1f44

1,012 files changed

Lines changed: 11 additions & 81954 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
cache-dependency-path: '**/pnpm-lock.yaml'
6262
- run: pnpm install --frozen-lockfile --prefer-offline
6363
- uses: nrwl/nx-set-shas@v4
64-
- run: pnpm exec nx affected -t test --exclude=docs-app --skip-nx-cache --parallel=3
64+
- run: pnpm exec nx affected -t test --skip-nx-cache --parallel=3
6565

6666
e2e-affected:
6767
runs-on: ubuntu-latest
@@ -80,7 +80,7 @@ jobs:
8080
- run: pnpm install --frozen-lockfile --prefer-offline
8181
- run: pnpm exec cypress install
8282
- uses: nrwl/nx-set-shas@v4
83-
- run: pnpm exec nx affected -t e2e --exclude=docs-app,www --parallel=1
83+
- run: pnpm exec nx affected -t e2e --exclude=www --parallel=1
8484

8585
build-affected:
8686
runs-on: ubuntu-latest
@@ -98,7 +98,7 @@ jobs:
9898
cache-dependency-path: '**/pnpm-lock.yaml'
9999
- run: pnpm install --frozen-lockfile --prefer-offline
100100
- uses: nrwl/nx-set-shas@v4
101-
- run: pnpm exec nx affected -t build --exclude=docs-app,www --skip-nx-cache --parallel=3
101+
- run: pnpm exec nx affected -t build --exclude=www --skip-nx-cache --parallel=3
102102

103103
schematics-core-check:
104104
runs-on: ubuntu-latest

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cache-dependency-path: '**/pnpm-lock.yaml'
6464
- run: pnpm install --frozen-lockfile --prefer-offline
6565
- uses: nrwl/nx-set-shas@v4
66-
- run: pnpm exec nx run-many -t test --exclude=docs-app --skip-nx-cache --parallel=3
66+
- run: pnpm exec nx run-many -t test --skip-nx-cache --parallel=3
6767

6868
e2e:
6969
runs-on: ubuntu-latest
@@ -82,7 +82,7 @@ jobs:
8282
- run: pnpm install --frozen-lockfile --prefer-offline
8383
- run: pnpm exec cypress install
8484
- uses: nrwl/nx-set-shas@v4
85-
- run: pnpm exec nx run-many -t e2e --exclude=docs-app,www --parallel=1
85+
- run: pnpm exec nx run-many -t e2e --exclude=www --parallel=1
8686

8787
schematics-core-check:
8888
runs-on: ubuntu-latest
@@ -119,7 +119,7 @@ jobs:
119119
cache-dependency-path: '**/pnpm-lock.yaml'
120120
- run: pnpm install --frozen-lockfile --prefer-offline
121121
- uses: nrwl/nx-set-shas@v4
122-
- run: pnpm exec nx run-many -t build --exclude=docs-app,www --skip-nx-cache --parallel=3
122+
- run: pnpm exec nx run-many -t build --exclude=www --skip-nx-cache --parallel=3
123123
- uses: actions/upload-artifact@v4
124124
with:
125125
name: artifact-modules

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
git tag ${{ inputs.release_version }}
7373
git push https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/ngrx/platform.git --follow-tags $(${{ inputs.dry_run == true }} && echo '--dry-run' || echo '')
7474
- name: Build Packages
75-
run: pnpm run build --exclude=docs-app,standalone-app,example-app,www --skip-nx-cache
75+
run: pnpm run build --exclude=standalone-app,example-app,www --skip-nx-cache
7676
- name: Release
7777
env:
7878
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.prettierignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
/modules/schematics/src/*/files/*
33
/modules/**/schematics/**/files/*
44
/tmp
5-
/projects/ngrx.io
6-
!/projects/ngrx.io/content/examples
75
package-lock.json
86
package.json
97
yarn.lock
108

119
/.nx/cache
12-
/.nx/workspace-data
10+
/.nx/workspace-data

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Sponsorships aid in the continued development and maintenance of NgRx libraries,
2222
### Gold Sponsors
2323

2424
<a href="https://nx.dev" target="_blank">
25-
<img src="https://github.com/ngrx/platform/blob/main/projects/ngrx.io/src/assets/images/sponsors/nx.svg" width="200px" height="200px" alt="NxDevTools logo">
25+
<img src="https://github.com/ngrx/platform/blob/main/projects/www/public/images/sponsors/nx.svg" width="200px" height="200px" alt="NxDevTools logo">
2626
</a>
2727

2828
Become a gold sponsor and get your logo on our README on GitHub and the front page of [ngrx.io](https://ngrx.io).
@@ -34,7 +34,7 @@ Become a silver sponsor and get your logo on our README on GitHub.
3434
### Bronze Sponsors
3535

3636
<a href="https://houseofangular.io" target="_blank">
37-
<img src="https://github.com/ngrx/platform/blob/main/projects/ngrx.io/src/assets/images/sponsors/house-of-angular.png" width="50px" height="50px" alt="House of Angular" />
37+
<img src="https://github.com/ngrx/platform/blob/main/projects/www/public/images/sponsors/house-of-angular.png" width="50px" height="50px" alt="House of Angular" />
3838
</a>
3939

4040
Become a bronze sponsor and get your logo on our README on GitHub.

‎build/deploy-build.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import * as tasks from './tasks';
22
import { createBuilder } from './util';
33
import { packages } from './config';
44

5-
const deploy = createBuilder([
6-
['Deploy builds', tasks.publishToRepo],
7-
// ['Deploy docs', tasks.publishDocs],
8-
]);
5+
const deploy = createBuilder([['Deploy builds', tasks.publishToRepo]]);
96

107
deploy({
118
scope: '@ngrx',

‎build/tasks.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ export async function publishToRepo(config: Config) {
5151
}
5252
}
5353

54-
/**
55-
* Deploy docs build artifacts
56-
*/
57-
export async function publishDocs() {
58-
const SOURCE_DIR = `./dist/ngrx.io`;
59-
const REPO_URL = 'git@github.com:ngrx/ngrx-io-builds.git';
60-
const REPO_DIR = `./tmp/docs`;
61-
62-
console.log(`Preparing and deploying docs to ${REPO_URL}`);
63-
await prepareAndPublish(SOURCE_DIR, REPO_URL, REPO_DIR);
64-
}
65-
6654
export async function prepareAndPublish(
6755
sourceDir: string,
6856
repoUrl: string,

‎projects/ngrx.io/.firebaserc‎

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

‎projects/ngrx.io/.gitignore‎

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

‎projects/ngrx.io/.node-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)