Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade peer dependencies #9138

Merged
merged 1 commit into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,043 changes: 1,119 additions & 924 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
"husky": "8.0.3",
"kill-port": "2.0.1",
"lint-staged": "15.2.0",
"ng-morph": "4.8.2",
"ng-packagr": "12.2.7",
"nx": "17.2.3",
"prettier": "3.1.1",
Expand Down
10 changes: 5 additions & 5 deletions projects/addon-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@ng-web-apis/common": "^3.0.6",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"tslib": ">=2.7.0"
}
}
22 changes: 11 additions & 11 deletions projects/addon-commerce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"@maskito/angular": "^1.9.0",
"@maskito/core": "^1.9.0",
"@maskito/kit": "^1.9.0",
"@ng-web-apis/common": "^3.0.6",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/i18n": "^3.94.0",
"@taiga-ui/kit": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@maskito/angular": ">=1.9.0",
"@maskito/core": ">=1.9.0",
"@maskito/kit": ">=1.9.0",
Comment on lines +20 to +22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

"@ng-web-apis/common": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@taiga-ui/i18n": ">=3.94.0",
"@taiga-ui/kit": ">=3.94.0",
"@tinkoff/ng-polymorpheus": "4>=.3.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mistake ?

"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": ">=2.7.0"
}
}
20 changes: 10 additions & 10 deletions projects/addon-doc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
"repository": "https://github.com/taiga-family/taiga-ui",
"license": "Apache-2.0",
"dependencies": {
"markdown-it": "14.0.0",
"ngx-highlightjs": "6.1.3"
"markdown-it": "^14.1.0",
"ngx-highlightjs": "^6.1.3"
},
"devDependencies": {
"@types/markdown-it": "13.0.7"
"@types/markdown-it": "^13.0.9"
},
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"@angular/router": ">=12.0.0",
"@ng-web-apis/common": "^3.0.6",
"@taiga-ui/addon-mobile": "^3.94.0",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/kit": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"@taiga-ui/addon-mobile": ">=3.94.0",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@taiga-ui/kit": ">=3.94.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"tslib": ">=2.7.0"
}
}
14 changes: 7 additions & 7 deletions projects/addon-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"@angular/cdk": ">=12.0.0",
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@ng-web-apis/common": "^3.0.6",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/kit": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@taiga-ui/kit": ">=3.94.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": ">=2.7.0"
}
}
2 changes: 1 addition & 1 deletion projects/addon-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@taiga-ui/i18n": ">=3.94.0",
"@taiga-ui/kit": ">=3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": "^2.6.2"
},
"publishConfig": {
Expand Down
16 changes: 8 additions & 8 deletions projects/addon-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@ng-web-apis/intersection-observer": "^3.2.0",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/i18n": "^3.94.0",
"@taiga-ui/kit": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@ng-web-apis/intersection-observer": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@taiga-ui/i18n": ">=3.94.0",
"@taiga-ui/kit": ">=3.94.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": "^2.7.0"
}
}
2 changes: 1 addition & 1 deletion projects/addon-tablebars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": "^2.6.2"
}
}
18 changes: 9 additions & 9 deletions projects/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
"repository": "https://github.com/taiga-family/taiga-ui",
"license": "Apache-2.0",
"dependencies": {
"@ng-web-apis/common": "3.0.6",
"@ng-web-apis/mutation-observer": "3.1.0",
"@ng-web-apis/resize-observer": "3.0.6",
"@tinkoff/ng-event-plugins": "3.2.0",
"@tinkoff/ng-polymorpheus": "4.3.0",
"tslib": "2.6.2"
"@ng-web-apis/common": "^3.2.3",
"@ng-web-apis/mutation-observer": "^3.2.3",
"@ng-web-apis/resize-observer": "^3.2.3",
"@tinkoff/ng-event-plugins": "^3.2.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"tslib": "^2.7.0"
},
"peerDependencies": {
"@angular/animations": ">=12.0.0",
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"rxjs": ">=6.0.0"
"rxjs": ">=6.0.0 || >=7.0.0"
},
"optionalDependencies": {
"ng-morph": "4.0.5",
"parse5": "6.0.1"
"ng-morph": "^4.8.2",
"parse5": "^6.0.1"
},
"ng-update": {
"migrations": "./schematics/migration.json",
Expand Down
4 changes: 4 additions & 0 deletions projects/cdk/schematics/ng-add/steps/add-taiga-modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ export function addTaigaModules(options: TuiSchema): Rule {
} else {
const mainClass = getMainModule(mainFilePath);

if (!mainClass) {
return;
}

addTuiModules({mainClass, options, context});
addExtraTuiProvidersToRootComponent({mainClass, options});
}
Expand Down
5 changes: 5 additions & 0 deletions projects/cdk/schematics/ng-add/steps/wrap-with-tui-root.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ function getAppTemplatePath(mainPath: string): string | undefined {
}

const mainModule = getMainModule(mainPath);

if (!mainModule) {
return;
}

const mainInitializer = getTemplateInitializer(
mainModule,
'NgModule',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {Tree} from '@angular-devkit/schematics';
import {createProject, setActiveProject} from 'ng-morph';
import {DevkitFileSystem} from 'ng-morph/project/classes/devkit-file-system';
import {createProject, DevkitFileSystem, setActiveProject} from 'ng-morph';

import {ALL_FILES} from '../../constants';
import {projectRoot} from '../../utils/project-root';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {UpdateRecorder} from '@angular-devkit/schematics';
import {DevkitFileSystem} from 'ng-morph/project/classes/devkit-file-system';
import {DevkitFileSystem} from 'ng-morph';
import {Element} from 'parse5';

import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {UpdateRecorder} from '@angular-devkit/schematics';
import {arrayFlat} from 'ng-morph';
import {DevkitFileSystem} from 'ng-morph/project/classes/devkit-file-system';
import {arrayFlat, DevkitFileSystem} from 'ng-morph';
import {Attribute, Element} from 'parse5';

import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DevkitFileSystem} from 'ng-morph/project/classes/devkit-file-system';
import {DevkitFileSystem} from 'ng-morph';
import {Element} from 'parse5';

import {TemplateResource} from '../../ng-update/interfaces/template-resource';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function getTemplateFromTemplateResource(

const path = fileSystem.resolve(templateRes.templatePath);

return fileSystem.read(path);
return fileSystem.read(path) ?? '';
}

export function getPathFromTemplateResource(templateRes: TemplateResource): string {
Expand Down
16 changes: 8 additions & 8 deletions projects/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@angular/forms": ">=12.0.0",
"@angular/platform-browser": ">=12.0.0",
"@angular/router": ">=12.0.0",
"@ng-web-apis/common": "^3.0.6",
"@ng-web-apis/mutation-observer": "^3.1.0",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/i18n": "^3.94.0",
"@tinkoff/ng-event-plugins": "^3.2.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"@ng-web-apis/mutation-observer": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/i18n": ">=3.94.0",
"@tinkoff/ng-event-plugins": ">=3.2.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": ">=2.7.0"
},
"schematics": "./schematics/collection.json"
}
32 changes: 16 additions & 16 deletions projects/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"name": "@taiga-ui/demo",
"private": true,
"dependencies": {
"@ng-web-apis/universal": "3.0.7",
"@nguniversal/express-engine": "12.1.3",
"@stackblitz/sdk": "1.9.0",
"@tinkoff/angular-contenteditable-accessor": "2.0.0",
"@tinkoff/ng-dompurify": "4.0.0",
"date-fns": "2.30.0",
"dompurify": "3.0.6",
"ngx-markdown": "10.1.1"
"@ng-web-apis/universal": "^3.2.3",
"@nguniversal/express-engine": "^12.1.3",
"@stackblitz/sdk": "^1.9.0",
"@tinkoff/angular-contenteditable-accessor": "^2.0.0",
"@tinkoff/ng-dompurify": "^4.0.0",
"date-fns": "^2.30.0",
"dompurify": "^3.1.6",
"ngx-markdown": "^10.1.1"
},
"devDependencies": {
"@nguniversal/builders": "12.1.3",
"@types/dompurify": "3.0.5",
"@types/express": "4.17.21",
"@types/showdown": "2.0.6",
"express": "4.18.2",
"less-plugin-npm-import": "2.1.0",
"showdown": "2.1.0",
"terser-webpack-plugin": "5.3.9"
"@nguniversal/builders": "^12.1.3",
"@types/dompurify": "^3.0.5",
"@types/express": "^4.17.21",
"@types/showdown": "^2.0.6",
"express": "^4.21.0",
"less-plugin-npm-import": "^2.1.0",
"showdown": "^2.1.0",
"terser-webpack-plugin": "^5.3.10"
}
}
2 changes: 1 addition & 1 deletion projects/experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/kit": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": "^2.6.2"
}
}
6 changes: 3 additions & 3 deletions projects/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"license": "Apache-2.0",
"peerDependencies": {
"@angular/core": ">=12.0.0",
"@ng-web-apis/common": "^3.0.6",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": ">=2.7.0"
}
}
28 changes: 14 additions & 14 deletions projects/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
"repository": "https://github.com/taiga-family/taiga-ui",
"license": "Apache-2.0",
"dependencies": {
"@maskito/angular": "1.9.0",
"@maskito/core": "1.9.0",
"@maskito/kit": "1.9.0",
"@ng-web-apis/intersection-observer": "3.2.0",
"text-mask-core": "5.1.2"
"@maskito/angular": "^1.9.0",
"@maskito/core": "^1.9.0",
"@maskito/kit": "^1.9.0",
"@ng-web-apis/intersection-observer": "^3.2.3",
"text-mask-core": "^5.1.2"
},
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"@angular/router": ">=12.0.0",
"@ng-web-apis/common": "3.0.6",
"@ng-web-apis/mutation-observer": "^3.1.0",
"@ng-web-apis/resize-observer": "^3.0.6",
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@taiga-ui/i18n": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"tslib": "^2.6.2"
"@ng-web-apis/common": ">=3.2.3",
"@ng-web-apis/mutation-observer": ">=3.2.3",
"@ng-web-apis/resize-observer": ">=3.2.3",
"@taiga-ui/cdk": ">=3.94.0",
"@taiga-ui/core": ">=3.94.0",
"@taiga-ui/i18n": ">=3.94.0",
"@tinkoff/ng-polymorpheus": ">=4.3.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": ">2.7.0"
}
}
2 changes: 1 addition & 1 deletion projects/layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@taiga-ui/cdk": "^3.94.0",
"@taiga-ui/core": "^3.94.0",
"@tinkoff/ng-polymorpheus": "^4.3.0",
"rxjs": ">=6.0.0",
"rxjs": ">=6.0.0 || >=7.0.0",
"tslib": "^2.6.2"
}
}
Loading