Skip to content

Commit 15c2f02

Browse files
EndyKaufmanEndyKaufman
committed
fix: added support work in angular 15 and >=12 (#213)
1 parent c10c113 commit 15c2f02

File tree

9 files changed

+147
-157
lines changed

9 files changed

+147
-157
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ All notable changes to this project will be documented in this file. See [standa
44

55
## [2.3.0](https://github.com/EndyKaufman/ngx-dynamic-form-builder/compare/v2.2.2...v2.3.0) (2022-11-25)
66

7-
87
### Features
98

10-
* update deps, angular from 13 to 15, nx from 13 to 15 ([e682987](https://github.com/EndyKaufman/ngx-dynamic-form-builder/commit/e682987b8e41006a554a2b9de79585e1cb3081f8))
9+
- update deps, angular from 13 to 15, nx from 13 to 15 ([e682987](https://github.com/EndyKaufman/ngx-dynamic-form-builder/commit/e682987b8e41006a554a2b9de79585e1cb3081f8))
1110

1211
### [2.2.2](https://github.com/EndyKaufman/ngx-dynamic-form-builder/compare/v2.2.1...v2.2.2) (2022-06-26)
1312

‎apps/debug/src/assets/i18n/en.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"must include word \"dep\" (async validate)": "must include word \"dep\" (async validate)"
3-
}
2+
"must include word \"dep\" (async validate)": "must include word \"dep\" (async validate)"
3+
}

‎apps/debug/src/assets/i18n/ru.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"must include word \"dep\" (async validate)": ""
3-
}
2+
"must include word \"dep\" (async validate)": ""
3+
}

‎apps/demo/src/assets/i18n/en.json‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
{
2-
"Experimental: user panel": "Experimental: user panel",
3-
"Experimental: login panel": "Experimental: login panel",
4-
"Experimental: registration panel": "Experimental: registration panel",
5-
"Other files": "Other files",
6-
"New API": "New API",
7-
"region num should not be empty (native angular)": "region num should not be empty (native angular)",
8-
"Login form": "Login form",
9-
"Username": "Username",
10-
"Password": "Password",
11-
"Form status:": "Form status:",
12-
"Form custom validate errors:": "Form custom validate errors:",
13-
"Login user data:": "Login user data:",
14-
"Login": "Login",
15-
"username": "username",
16-
"password": "password",
17-
"Registration form": "Registration form",
18-
"Confirm password": "Confirm password",
19-
"Registration user data:": "Registration user data:",
20-
"Registration": "Registration",
21-
"rePassword": "rePassword",
22-
"User form": "User form",
23-
"Email": "Email",
24-
"Date of birth": "Date of birth",
25-
"date of birth is": "date of birth is",
26-
"Department of user": "Department of user",
27-
"Department name": "Department name",
28-
"Company of department": "Company of department",
29-
"Company name": "Company name",
30-
"Company region num": "Company region num",
31-
"Administrator": "Administrator",
32-
"Staff": "Staff",
33-
"Saved item:": "Saved item:",
34-
"Load": "Load",
35-
"Clear": "Clear",
36-
"Save": "Save",
37-
"email": "email",
38-
"dateOfBirth": "dateOfBirth",
39-
"Tasks max length = 3 (native angular)": "Tasks max length = 3 (native angular)",
40-
"English": "English",
41-
"Russian": "Русский",
42-
"Experimental + transloco + i18n": "Experimental + transloco + i18n",
43-
"must include word \"dep\" (async validate)": "must include word \"dep\" (async validate)",
44-
"Id": "Id",
45-
"Name": "Name",
46-
"Region num": "Region num",
47-
"The company name must be longer than 15": "The company name must be longer than 15",
48-
"Company": "Company",
49-
"company name": "company name",
50-
"company region name": "company region name",
51-
"department name": "department name",
52-
"Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty": "Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty",
53-
"Department": "Department",
54-
"Only abc field": "Only abc field",
55-
"it should match the cool 'abc' string": "it should match the cool 'abc' string",
56-
"$constraint1 do not match to $property": "$constraint1 do not match to $property",
57-
"Form native errors:": "Form native errors:",
58-
"name": "name",
59-
"regionNum": "regionNum",
60-
"Group form": "Group form"
61-
}
2+
"Experimental: user panel": "Experimental: user panel",
3+
"Experimental: login panel": "Experimental: login panel",
4+
"Experimental: registration panel": "Experimental: registration panel",
5+
"Other files": "Other files",
6+
"New API": "New API",
7+
"region num should not be empty (native angular)": "region num should not be empty (native angular)",
8+
"Login form": "Login form",
9+
"Username": "Username",
10+
"Password": "Password",
11+
"Form status:": "Form status:",
12+
"Form custom validate errors:": "Form custom validate errors:",
13+
"Login user data:": "Login user data:",
14+
"Login": "Login",
15+
"username": "username",
16+
"password": "password",
17+
"Registration form": "Registration form",
18+
"Confirm password": "Confirm password",
19+
"Registration user data:": "Registration user data:",
20+
"Registration": "Registration",
21+
"rePassword": "rePassword",
22+
"User form": "User form",
23+
"Email": "Email",
24+
"Date of birth": "Date of birth",
25+
"date of birth is": "date of birth is",
26+
"Department of user": "Department of user",
27+
"Department name": "Department name",
28+
"Company of department": "Company of department",
29+
"Company name": "Company name",
30+
"Company region num": "Company region num",
31+
"Administrator": "Administrator",
32+
"Staff": "Staff",
33+
"Saved item:": "Saved item:",
34+
"Load": "Load",
35+
"Clear": "Clear",
36+
"Save": "Save",
37+
"email": "email",
38+
"dateOfBirth": "dateOfBirth",
39+
"Tasks max length = 3 (native angular)": "Tasks max length = 3 (native angular)",
40+
"English": "English",
41+
"Russian": "Русский",
42+
"Experimental + transloco + i18n": "Experimental + transloco + i18n",
43+
"must include word \"dep\" (async validate)": "must include word \"dep\" (async validate)",
44+
"Id": "Id",
45+
"Name": "Name",
46+
"Region num": "Region num",
47+
"The company name must be longer than 15": "The company name must be longer than 15",
48+
"Company": "Company",
49+
"company name": "company name",
50+
"company region name": "company region name",
51+
"department name": "department name",
52+
"Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty": "Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty",
53+
"Department": "Department",
54+
"Only abc field": "Only abc field",
55+
"it should match the cool 'abc' string": "it should match the cool 'abc' string",
56+
"$constraint1 do not match to $property": "$constraint1 do not match to $property",
57+
"Form native errors:": "Form native errors:",
58+
"name": "name",
59+
"regionNum": "regionNum",
60+
"Group form": "Group form"
61+
}

‎apps/demo/src/assets/i18n/ru.json‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
{
2-
"Experimental: user panel": "Экспериментально: панель пользователя",
3-
"Experimental: login panel": "Экспериментально: панель входа",
4-
"Experimental: registration panel": "Экспериментально: регистрационная панель",
5-
"Other files": "Другие файлы",
6-
"New API": "Новое АПИ",
7-
"region num should not be empty (native angular)": "номер региона не должен быть пустым (нативный angular)",
8-
"Login form": "Форма входа",
9-
"Username": "Имя пользователя",
10-
"Password": "Пароль",
11-
"Form status:": "Статус формы:",
12-
"Form custom validate errors:": "Короткие ошибки класс валидатора:",
13-
"Login user data:": "Данные пользователя для входа:",
14-
"Login": "Авторизоваться",
15-
"username": "имя пользователя",
16-
"password": "пароль",
17-
"Registration form": "Форма регистрации",
18-
"Confirm password": "Подтвердите пароль",
19-
"Registration user data:": "Регистрационные данные пользователя:",
20-
"Registration": "Регистрация",
21-
"rePassword": "повтор пароля",
22-
"User form": "Пользователь",
23-
"Email": "Эл. адрес",
24-
"Date of birth": "Дата рождения",
25-
"date of birth is": "дата рождения",
26-
"Department of user": "Отдел",
27-
"Department name": "Название отдела",
28-
"Company of department": "Компания",
29-
"Company name": "Название компании",
30-
"Company region num": "Номер региона компании",
31-
"Administrator": "Администратор",
32-
"Staff": "Персонал",
33-
"Saved item:": "Сохраненные данные:",
34-
"Load": "Загрузить",
35-
"Clear": "Очистить",
36-
"Save": "Сохранить",
37-
"email": "эл. адрес",
38-
"dateOfBirth": "дата рождения",
39-
"Tasks max length = 3 (native angular)": "",
40-
"English": "",
41-
"Russian": "Русский",
42-
"Experimental + transloco + i18n": "Экспериментально + transloco + перевод",
43-
"must include word \"dep\" (async validate)": "должен включать слово \"dep\" (асинхронная проверка)",
44-
"Id": "Ид.",
45-
"Name": "Название",
46-
"Region num": "Номер региона",
47-
"The company name must be longer than 15": "Название компании должно быть длиннее 15",
48-
"Company": "Компания",
49-
"company name": "название компании",
50-
"company region name": "регион компании",
51-
"department name": "название отдела",
52-
"Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty": "Задачи не инициализированы и минимальная длина = 1, а максимальная длина = 3, и все созданные задачи не должны быть пустыми",
53-
"Department": "Отдел",
54-
"Only abc field": "Должно включать только abc",
55-
"it should match the cool 'abc' string": "он должен соответствовать классной строке 'abc'",
56-
"$constraint1 do not match to $property": "$constraint1 не равно $property",
57-
"Form native errors:": "Нативные ошибки:",
58-
"name": "название",
59-
"regionNum": "номер региона",
60-
"Group form": "Форма группы"
61-
}
2+
"Experimental: user panel": "Экспериментально: панель пользователя",
3+
"Experimental: login panel": "Экспериментально: панель входа",
4+
"Experimental: registration panel": "Экспериментально: регистрационная панель",
5+
"Other files": "Другие файлы",
6+
"New API": "Новое АПИ",
7+
"region num should not be empty (native angular)": "номер региона не должен быть пустым (нативный angular)",
8+
"Login form": "Форма входа",
9+
"Username": "Имя пользователя",
10+
"Password": "Пароль",
11+
"Form status:": "Статус формы:",
12+
"Form custom validate errors:": "Короткие ошибки класс валидатора:",
13+
"Login user data:": "Данные пользователя для входа:",
14+
"Login": "Авторизоваться",
15+
"username": "имя пользователя",
16+
"password": "пароль",
17+
"Registration form": "Форма регистрации",
18+
"Confirm password": "Подтвердите пароль",
19+
"Registration user data:": "Регистрационные данные пользователя:",
20+
"Registration": "Регистрация",
21+
"rePassword": "повтор пароля",
22+
"User form": "Пользователь",
23+
"Email": "Эл. адрес",
24+
"Date of birth": "Дата рождения",
25+
"date of birth is": "дата рождения",
26+
"Department of user": "Отдел",
27+
"Department name": "Название отдела",
28+
"Company of department": "Компания",
29+
"Company name": "Название компании",
30+
"Company region num": "Номер региона компании",
31+
"Administrator": "Администратор",
32+
"Staff": "Персонал",
33+
"Saved item:": "Сохраненные данные:",
34+
"Load": "Загрузить",
35+
"Clear": "Очистить",
36+
"Save": "Сохранить",
37+
"email": "эл. адрес",
38+
"dateOfBirth": "дата рождения",
39+
"Tasks max length = 3 (native angular)": "",
40+
"English": "",
41+
"Russian": "Русский",
42+
"Experimental + transloco + i18n": "Экспериментально + transloco + перевод",
43+
"must include word \"dep\" (async validate)": "должен включать слово \"dep\" (асинхронная проверка)",
44+
"Id": "Ид.",
45+
"Name": "Название",
46+
"Region num": "Номер региона",
47+
"The company name must be longer than 15": "Название компании должно быть длиннее 15",
48+
"Company": "Компания",
49+
"company name": "название компании",
50+
"company region name": "регион компании",
51+
"department name": "название отдела",
52+
"Tasks not initialized or min length = 1 and max length = 3, and all initialized tasks must be not empty": "Задачи не инициализированы и минимальная длина = 1, а максимальная длина = 3, и все созданные задачи не должны быть пустыми",
53+
"Department": "Отдел",
54+
"Only abc field": "Должно включать только abc",
55+
"it should match the cool 'abc' string": "он должен соответствовать классной строке 'abc'",
56+
"$constraint1 do not match to $property": "$constraint1 не равно $property",
57+
"Form native errors:": "Нативные ошибки:",
58+
"name": "название",
59+
"regionNum": "номер региона",
60+
"Group form": "Форма группы"
61+
}

‎libs/ngx-dynamic-form-builder/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
}
4343
],
4444
"peerDependencies": {
45-
"@angular/common": "~15.0.1",
46-
"@angular/core": "~15.0.1",
45+
"@angular/common": "~15.0.1 || >=12.0.0",
46+
"@angular/core": "~15.0.1 || >=12.0.0",
4747
"class-transformer-global-storage": "0.4.1-1",
4848
"class-validator-multi-lang": "0.130.201",
4949
"lodash.clonedeep": "4.5.0",

‎package-lock.json‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@
132132
"validator": "13.7.0"
133133
},
134134
"dependencies": {
135+
"@angular/common": "~15.0.1 || >=12.0.0",
136+
"@angular/core": "~15.0.1 || >=12.0.0",
135137
"@angular/animations": "~15.0.1",
136138
"@angular/cdk": "~15.0.0",
137-
"@angular/common": "~15.0.1",
138139
"@angular/compiler": "~15.0.1",
139-
"@angular/core": "~15.0.1",
140140
"@angular/flex-layout": "*",
141141
"@angular/forms": "~15.0.1",
142142
"@angular/material": "~15.0.0",

‎transloco.config.json‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
{
2-
"serverRootTranslationsPath": "./apps/demo/src/assets/i18n/",
3-
"langs": [
4-
"en",
5-
"ru"
6-
],
7-
"serverScopedLibs": [
8-
"libs/ngx-dynamic-form-builder"
9-
],
10-
"rootTranslationsPath": "./apps/demo/src/assets/i18n/",
11-
"scopedLibs": [
12-
"libs/ngx-dynamic-form-builder"
13-
],
14-
"clientRootTranslationsPath": "./apps/demo/src/assets/i18n/",
15-
"clientScopedLibs": [
16-
"libs/ngx-dynamic-form-builder"
17-
]
18-
}
2+
"serverRootTranslationsPath": "./apps/demo/src/assets/i18n/",
3+
"langs": ["en", "ru"],
4+
"serverScopedLibs": ["libs/ngx-dynamic-form-builder"],
5+
"rootTranslationsPath": "./apps/demo/src/assets/i18n/",
6+
"scopedLibs": ["libs/ngx-dynamic-form-builder"],
7+
"clientRootTranslationsPath": "./apps/demo/src/assets/i18n/",
8+
"clientScopedLibs": ["libs/ngx-dynamic-form-builder"]
9+
}

0 commit comments

Comments
 (0)