Skip to content

Commit

Permalink
Merge branch 'main' into fix/derived-from-undefined-initial-value
Browse files Browse the repository at this point in the history
  • Loading branch information
@nartc
nartc committed Oct 8, 2024
2 parents 5dcf4a2 + 26859d3 commit ecda908
Show file tree
Hide file tree
Showing 6 changed files with 4,199 additions and 3,414 deletions.
8 changes: 4 additions & 4 deletions jest.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
4 changes: 2 additions & 2 deletions libs/ngxtension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"dependencies": {
"tslib": "^2.3.0",
"@angular-eslint/bundled-angular-compiler": "^18.0.1",
"@nx/devkit": "^19.0.0",
"nx": "^19.0.0",
"@nx/devkit": "^20.0.0",
"nx": "^20.0.0",
"ts-morph": "^22.0.0"
},
"sideEffects": false,
Expand Down
13 changes: 8 additions & 5 deletions libs/ngxtension/to-lazy-signal/src/to-lazy-signal.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,25 @@ export function toLazySignal<T>(

export function toLazySignal<T>(
source: Observable<T> | Subscribable<T>,
options: ToSignalOptions & { initialValue?: undefined; requireSync?: false },
options: ToSignalOptions<T> & {
initialValue?: undefined;
requireSync?: false;
},
): Signal<T | undefined>;

export function toLazySignal<T>(
source: Observable<T> | Subscribable<T>,
options: ToSignalOptions & { initialValue?: null; requireSync?: false },
options: ToSignalOptions<T> & { initialValue?: null; requireSync?: false },
): Signal<T | null>;

export function toLazySignal<T>(
source: Observable<T> | Subscribable<T>,
options: ToSignalOptions & { initialValue?: undefined; requireSync: true },
options: ToSignalOptions<T> & { initialValue?: undefined; requireSync: true },
): Signal<T>;

export function toLazySignal<T, const U extends T>(
source: Observable<T> | Subscribable<T>,
options: ToSignalOptions & { initialValue: U; requireSync?: false },
options: ToSignalOptions<T> & { initialValue: U; requireSync?: false },
): Signal<T | U>;

/**
Expand All @@ -35,7 +38,7 @@ export function toLazySignal<T, const U extends T>(
*/
export function toLazySignal<T, U = undefined>(
source: Observable<T> | Subscribable<T>,
options?: ToSignalOptions & { initialValue?: U },
options?: ToSignalOptions<T> & { initialValue?: U },
): Signal<ReturnType<T, U>> {
const injector = assertInjector(toLazySignal, options?.injector);
let s: Signal<ReturnType<T, U>>;
Expand Down
66 changes: 61 additions & 5 deletions migrations.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,68 @@
{
"migrations": [
{
"version": "19.2.4-beta.0",
"description": "Set project name in nx.json explicitly",
"implementation": "./src/migrations/update-19-2-4/set-project-name",
"x-repair-skip": true,
"version": "20.0.0-beta.7",
"description": "Migration for v20.0.0-beta.7",
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
"package": "nx",
"name": "19-2-4-set-project-name"
"name": "move-use-daemon-process"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Update ciWebServerCommand to use static serve for the application.",
"implementation": "./src/migrations/update-19-6-0/update-ci-webserver-for-static-serve",
"package": "@nx/cypress",
"name": "update-19-6-0-update-ci-webserver-for-vite"
},
{
"cli": "nx",
"version": "20.0.0-beta.5",
"description": "replace getJestProjects with getJestProjectsAsync",
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync"
},
{
"cli": "nx",
"version": "19.5.0-beta.1",
"requires": { "@angular/core": ">=18.1.0" },
"description": "Update the @angular/cli package version to ~18.1.0.",
"factory": "./src/migrations/update-19-5-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-18-1-0"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Ensure Module Federation DTS is turned off by default.",
"factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default",
"package": "@nx/angular",
"name": "update-19-6-0"
},
{
"cli": "nx",
"version": "19.6.0-beta.7",
"requires": { "@angular/core": ">=18.2.0" },
"description": "Update the @angular/cli package version to ~18.2.0.",
"factory": "./src/migrations/update-19-6-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-18-2-0"
},
{
"cli": "nx",
"version": "19.6.1-beta.0",
"description": "Ensure Target Defaults are set correctly for Module Federation.",
"factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf",
"package": "@nx/angular",
"name": "update-19-6-1-ensure-module-federation-target-defaults"
},
{
"version": "18.1.0",
"description": "Updates calls to afterRender with an explicit phase to the new API",
"factory": "./migrations/after-render-phase/bundle",
"package": "@angular/core",
"name": "migration-after-render-phase"
}
]
}
108 changes: 54 additions & 54 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,80 +12,80 @@
"pnpm": ">=8"
},
"dependencies": {
"@angular/animations": "18.0.3",
"@angular/cdk": "18.0.3",
"@angular/common": "18.0.3",
"@angular/compiler": "18.0.3",
"@angular/core": "18.0.3",
"@angular/forms": "18.0.3",
"@angular/platform-browser": "18.0.3",
"@angular/platform-browser-dynamic": "18.0.3",
"@angular/router": "18.0.3",
"@angular/animations": "18.2.7",
"@angular/cdk": "18.2.7",
"@angular/common": "18.2.7",
"@angular/compiler": "18.2.7",
"@angular/core": "18.2.7",
"@angular/forms": "18.2.7",
"@angular/platform-browser": "18.2.7",
"@angular/platform-browser-dynamic": "18.2.7",
"@angular/router": "18.2.7",
"@swc/helpers": "0.5.11",
"@use-gesture/vanilla": "^10.3.1",
"rxjs": "~7.8.1",
"tslib": "^2.6.3",
"tslib": "^2.7.0",
"zone.js": "0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "18.0.4",
"@angular-devkit/core": "18.0.4",
"@angular-devkit/schematics": "18.0.4",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/cli": "~18.0.4",
"@angular/compiler-cli": "18.0.3",
"@angular/language-service": "18.0.3",
"@nx/angular": "19.4.3",
"@nx/cypress": "19.4.3",
"@nx/devkit": "19.4.3",
"@nx/eslint": "19.4.3",
"@nx/eslint-plugin": "19.4.3",
"@nx/jest": "19.4.3",
"@nx/js": "19.4.3",
"@nx/plugin": "19.4.3",
"@nx/web": "19.4.3",
"@nx/workspace": "19.4.3",
"@angular-devkit/build-angular": "18.2.7",
"@angular-devkit/core": "18.2.7",
"@angular-devkit/schematics": "18.2.7",
"@angular-eslint/eslint-plugin": "18.3.1",
"@angular-eslint/eslint-plugin-template": "18.3.1",
"@angular-eslint/template-parser": "18.3.1",
"@angular/cli": "~18.2.7",
"@angular/compiler-cli": "18.2.7",
"@angular/language-service": "18.2.7",
"@nx/angular": "20.0.0",
"@nx/cypress": "20.0.0",
"@nx/devkit": "20.0.0",
"@nx/eslint": "20.0.0",
"@nx/eslint-plugin": "20.0.0",
"@nx/jest": "20.0.0",
"@nx/js": "20.0.0",
"@nx/plugin": "20.0.0",
"@nx/web": "20.0.0",
"@nx/workspace": "20.0.0",
"@release-it/bumper": "^6.0.1",
"@release-it/conventional-changelog": "^8.0.1",
"@schematics/angular": "18.0.4",
"@swc-node/register": "1.9.2",
"@release-it/conventional-changelog": "^8.0.2",
"@schematics/angular": "18.2.7",
"@swc-node/register": "1.10.9",
"@swc/cli": "0.3.12",
"@swc/core": "1.6.0",
"@types/jest": "^29.5.12",
"@swc/core": "1.7.26",
"@types/jest": "29.5.13",
"@types/node": "20.14.2",
"@typescript-eslint/eslint-plugin": "7.13.0",
"@typescript-eslint/parser": "7.13.0",
"@typescript-eslint/utils": "^8.0.0-alpha.28",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@typescript-eslint/utils": "7.18.0",
"all-contributors-cli": "^6.26.1",
"autoprefixer": "^10.4.19",
"cypress": "13.13.0",
"autoprefixer": "^10.4.20",
"cypress": "13.15.0",
"dotenv-cli": "^7.4.2",
"eslint": "9.5.0",
"eslint": "9.12.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "^3.3.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-preset-angular": "14.1.0",
"eslint-plugin-cypress": "^3.5.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "14.2.4",
"jsonc-eslint-parser": "^2.4.0",
"lint-staged": "^15.2.7",
"ng-packagr": "18.0.0",
"nx": "19.4.3",
"postcss": "^8.4.38",
"lint-staged": "^15.2.10",
"ng-packagr": "18.2.1",
"nx": "20.0.0",
"postcss": "^8.4.47",
"postcss-import": "~16.1.0",
"postcss-preset-env": "~9.5.14",
"postcss-url": "~10.1.3",
"prettier": "^3.3.2",
"prettier-plugin-astro": "^0.14.0",
"prettier-plugin-organize-imports": "^3.2.4",
"release-it": "^17.3.0",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-organize-imports": "^4.1.0",
"release-it": "^17.7.0",
"sharp": "^0.33.3",
"simple-git-hooks": "^2.11.1",
"ts-jest": "^29.1.4",
"ts-jest": "^29.2.5",
"ts-morph": "^22.0.0",
"ts-node": "10.9.2",
"typescript": "5.4.5"
"typescript": "5.5.4"
},
"simple-git-hooks": {
"pre-commit": "pnpm exec lint-staged"
Expand Down
Loading

0 comments on commit ecda908

Please sign in to comment.