ng-alain 13.5.1 → 14.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/application/files/root/.eslintrc.js +3 -2
- package/application/files/src/app/core/i18n/i18n.service.spec.ts +2 -2
- package/application/files/src/app/routes/passport/lock/lock.component.ts +8 -12
- package/application/files/src/app/routes/passport/login/login.component.ts +28 -39
- package/application/files/src/app/routes/passport/register/register.component.ts +24 -39
- package/application/index.js +7 -5
- package/application/index.js.map +1 -1
- package/application/index.ts +9 -5
- package/migration.json +5 -0
- package/ng-add/index.js +3 -3
- package/ng-add/index.js.map +1 -1
- package/ng-add/index.ts +2 -3
- package/ng-update/index.js +6 -1
- package/ng-update/index.js.map +1 -1
- package/ng-update/index.ts +5 -0
- package/ng-update/upgrade-rules/v12/index.js +4 -4
- package/ng-update/upgrade-rules/v12/index.js.map +1 -1
- package/ng-update/upgrade-rules/v12/index.spec.ts +3 -23
- package/ng-update/upgrade-rules/v12/index.ts +2 -3
- package/ng-update/upgrade-rules/v13/index.js +4 -4
- package/ng-update/upgrade-rules/v13/index.js.map +1 -1
- package/ng-update/upgrade-rules/v13/index.ts +2 -3
- package/ng-update/upgrade-rules/v14/index.js +65 -0
- package/ng-update/upgrade-rules/v14/index.js.map +1 -0
- package/ng-update/upgrade-rules/v14/index.spec.ts +157 -0
- package/ng-update/upgrade-rules/v14/index.ts +71 -0
- package/package.json +2 -2
- package/sta/index.js +10 -10
- package/sta/index.js.map +1 -1
- package/sta/index.spec.ts +2 -1
- package/sta/index.ts +1 -1
- package/utils/lib-versions.js +2 -2
- package/utils/lib-versions.ts +2 -2
- package/utils/log.js +4 -4
- package/utils/log.js.map +1 -1
- package/utils/log.ts +1 -2
- package/utils/versions.js +17 -19
- package/utils/versions.js.map +1 -1
- package/utils/versions.ts +17 -19
- package/utils/workspace.js +38 -11
- package/utils/workspace.js.map +1 -1
- package/utils/workspace.ts +29 -16
|
@@ -12,7 +12,7 @@ module.exports = {
|
|
|
12
12
|
project: ['tsconfig.json'],
|
|
13
13
|
createDefaultProgram: true
|
|
14
14
|
},
|
|
15
|
-
plugins: ['@typescript-eslint', 'jsdoc', 'import'],
|
|
15
|
+
plugins: ['@typescript-eslint', 'jsdoc', 'import', 'deprecation'],
|
|
16
16
|
extends: [
|
|
17
17
|
'plugin:@angular-eslint/recommended',
|
|
18
18
|
'plugin:@angular-eslint/template/process-inline-templates',
|
|
@@ -105,7 +105,8 @@ module.exports = {
|
|
|
105
105
|
'prefer-object-spread': 'error',
|
|
106
106
|
'prefer-template': 'error',
|
|
107
107
|
'prefer-const': 'off',
|
|
108
|
-
'max-len': 'off'
|
|
108
|
+
'max-len': 'off',
|
|
109
|
+
'deprecation/deprecation': 'warn'
|
|
109
110
|
}
|
|
110
111
|
},
|
|
111
112
|
{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
|
2
|
-
import { TestBed
|
|
2
|
+
import { TestBed } from '@angular/core/testing';
|
|
3
3
|
import { DelonLocaleService, SettingsService } from '@delon/theme';
|
|
4
4
|
import { NzSafeAny } from 'ng-zorro-antd/core/types';
|
|
5
5
|
import { NzI18nService } from 'ng-zorro-antd/i18n';
|
|
@@ -8,7 +8,7 @@ import { of } from 'rxjs';
|
|
|
8
8
|
import { I18NService } from './i18n.service';
|
|
9
9
|
|
|
10
10
|
describe('Service: I18n', () => {
|
|
11
|
-
let injector:
|
|
11
|
+
let injector: TestBed;
|
|
12
12
|
let srv: I18NService;
|
|
13
13
|
const MockSettingsService: NzSafeAny = {
|
|
14
14
|
layout: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Component, Inject } from '@angular/core';
|
|
2
|
-
import { FormBuilder,
|
|
2
|
+
import { FormBuilder, Validators } from '@angular/forms';
|
|
3
3
|
import { Router } from '@angular/router';
|
|
4
4
|
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
|
|
5
5
|
import { SettingsService, User } from '@delon/theme';
|
|
@@ -10,28 +10,24 @@ import { SettingsService, User } from '@delon/theme';
|
|
|
10
10
|
styleUrls: ['./lock.component.less']
|
|
11
11
|
})
|
|
12
12
|
export class UserLockComponent {
|
|
13
|
-
f
|
|
13
|
+
f = this.fb.group({
|
|
14
|
+
password: [null, Validators.required]
|
|
15
|
+
});
|
|
14
16
|
|
|
15
17
|
get user(): User {
|
|
16
18
|
return this.settings.user;
|
|
17
19
|
}
|
|
18
20
|
|
|
19
21
|
constructor(
|
|
20
|
-
fb: FormBuilder,
|
|
22
|
+
private fb: FormBuilder,
|
|
21
23
|
@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
|
|
22
24
|
private settings: SettingsService,
|
|
23
25
|
private router: Router
|
|
24
|
-
) {
|
|
25
|
-
this.f = fb.group({
|
|
26
|
-
password: [null, Validators.required]
|
|
27
|
-
});
|
|
28
|
-
}
|
|
26
|
+
) {}
|
|
29
27
|
|
|
30
28
|
submit(): void {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
this.f.controls[i].updateValueAndValidity();
|
|
34
|
-
}
|
|
29
|
+
this.f.controls.password.markAsDirty();
|
|
30
|
+
this.f.controls.password.updateValueAndValidity();
|
|
35
31
|
if (this.f.valid) {
|
|
36
32
|
console.log('Valid!');
|
|
37
33
|
console.log(this.f.value);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, Optional } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { FormBuilder, Validators } from '@angular/forms';
|
|
3
3
|
import { Router } from '@angular/router';
|
|
4
4
|
import { StartupService } from '@core';
|
|
5
5
|
import { ReuseTabService } from '@delon/abc/reuse-tab';
|
|
@@ -18,7 +18,7 @@ import { finalize } from 'rxjs';
|
|
|
18
18
|
})
|
|
19
19
|
export class UserLoginComponent implements OnDestroy {
|
|
20
20
|
constructor(
|
|
21
|
-
fb: FormBuilder,
|
|
21
|
+
private fb: FormBuilder,
|
|
22
22
|
private router: Router,
|
|
23
23
|
private settingsService: SettingsService,
|
|
24
24
|
private socialService: SocialService,
|
|
@@ -29,31 +29,17 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
29
29
|
private startupSrv: StartupService,
|
|
30
30
|
private http: _HttpClient,
|
|
31
31
|
private cdr: ChangeDetectorRef
|
|
32
|
-
) {
|
|
33
|
-
this.form = fb.group({
|
|
34
|
-
userName: [null, [Validators.required, Validators.pattern(/^(admin|user)$/)]],
|
|
35
|
-
password: [null, [Validators.required, Validators.pattern(/^(ng\-alain\.com)$/)]],
|
|
36
|
-
mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
|
|
37
|
-
captcha: [null, [Validators.required]],
|
|
38
|
-
remember: [true]
|
|
39
|
-
});
|
|
40
|
-
}
|
|
32
|
+
) {}
|
|
41
33
|
|
|
42
34
|
// #region fields
|
|
43
35
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return this.form.get('mobile')!;
|
|
52
|
-
}
|
|
53
|
-
get captcha(): AbstractControl {
|
|
54
|
-
return this.form.get('captcha')!;
|
|
55
|
-
}
|
|
56
|
-
form: FormGroup;
|
|
36
|
+
form = this.fb.group({
|
|
37
|
+
userName: [null, [Validators.required, Validators.pattern(/^(admin|user)$/)]],
|
|
38
|
+
password: [null, [Validators.required, Validators.pattern(/^(ng\-alain\.com)$/)]],
|
|
39
|
+
mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
|
|
40
|
+
captcha: [null, [Validators.required]],
|
|
41
|
+
remember: [true]
|
|
42
|
+
});
|
|
57
43
|
error = '';
|
|
58
44
|
type = 0;
|
|
59
45
|
loading = false;
|
|
@@ -70,9 +56,10 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
70
56
|
}
|
|
71
57
|
|
|
72
58
|
getCaptcha(): void {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
59
|
+
const mobile = this.form.controls.mobile;
|
|
60
|
+
if (mobile.invalid) {
|
|
61
|
+
mobile.markAsDirty({ onlySelf: true });
|
|
62
|
+
mobile.updateValueAndValidity({ onlySelf: true });
|
|
76
63
|
return;
|
|
77
64
|
}
|
|
78
65
|
this.count = 59;
|
|
@@ -89,19 +76,21 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
89
76
|
submit(): void {
|
|
90
77
|
this.error = '';
|
|
91
78
|
if (this.type === 0) {
|
|
92
|
-
this.
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
79
|
+
const { userName, password } = this.form.controls;
|
|
80
|
+
userName.markAsDirty();
|
|
81
|
+
userName.updateValueAndValidity();
|
|
82
|
+
password.markAsDirty();
|
|
83
|
+
password.updateValueAndValidity();
|
|
84
|
+
if (userName.invalid || password.invalid) {
|
|
97
85
|
return;
|
|
98
86
|
}
|
|
99
87
|
} else {
|
|
100
|
-
this.
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
88
|
+
const { mobile, captcha } = this.form.controls;
|
|
89
|
+
mobile.markAsDirty();
|
|
90
|
+
mobile.updateValueAndValidity();
|
|
91
|
+
captcha.markAsDirty();
|
|
92
|
+
captcha.updateValueAndValidity();
|
|
93
|
+
if (mobile.invalid || captcha.invalid) {
|
|
105
94
|
return;
|
|
106
95
|
}
|
|
107
96
|
}
|
|
@@ -113,8 +102,8 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
113
102
|
this.http
|
|
114
103
|
.post('/login/account?_allow_anonymous=true', {
|
|
115
104
|
type: this.type,
|
|
116
|
-
userName: this.
|
|
117
|
-
password: this.
|
|
105
|
+
userName: this.form.value.userName,
|
|
106
|
+
password: this.form.value.password
|
|
118
107
|
})
|
|
119
108
|
.pipe(
|
|
120
109
|
finalize(() => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
|
|
2
|
-
import { AbstractControl, FormBuilder, FormControl,
|
|
2
|
+
import { AbstractControl, FormBuilder, FormControl, Validators } from '@angular/forms';
|
|
3
3
|
import { Router } from '@angular/router';
|
|
4
4
|
import { _HttpClient } from '@delon/theme';
|
|
5
5
|
import { MatchControl } from '@delon/util/form';
|
|
@@ -13,40 +13,23 @@ import { finalize } from 'rxjs';
|
|
|
13
13
|
changeDetection: ChangeDetectionStrategy.OnPush
|
|
14
14
|
})
|
|
15
15
|
export class UserRegisterComponent implements OnDestroy {
|
|
16
|
-
constructor(fb: FormBuilder, private router: Router, private http: _HttpClient, private cdr: ChangeDetectorRef) {
|
|
17
|
-
this.form = fb.group(
|
|
18
|
-
{
|
|
19
|
-
mail: [null, [Validators.required, Validators.email]],
|
|
20
|
-
password: [null, [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]],
|
|
21
|
-
confirm: [null, [Validators.required, Validators.minLength(6)]],
|
|
22
|
-
mobilePrefix: ['+86'],
|
|
23
|
-
mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
|
|
24
|
-
captcha: [null, [Validators.required]]
|
|
25
|
-
},
|
|
26
|
-
{
|
|
27
|
-
validators: MatchControl('password', 'confirm')
|
|
28
|
-
}
|
|
29
|
-
);
|
|
30
|
-
}
|
|
16
|
+
constructor(private fb: FormBuilder, private router: Router, private http: _HttpClient, private cdr: ChangeDetectorRef) {}
|
|
31
17
|
|
|
32
18
|
// #region fields
|
|
33
19
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return this.form.get('captcha')!;
|
|
48
|
-
}
|
|
49
|
-
form: FormGroup;
|
|
20
|
+
form = this.fb.group(
|
|
21
|
+
{
|
|
22
|
+
mail: [null, [Validators.required, Validators.email]],
|
|
23
|
+
password: [null, [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]],
|
|
24
|
+
confirm: [null, [Validators.required, Validators.minLength(6)]],
|
|
25
|
+
mobilePrefix: ['+86'],
|
|
26
|
+
mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
|
|
27
|
+
captcha: [null, [Validators.required]]
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
validators: MatchControl('password', 'confirm')
|
|
31
|
+
}
|
|
32
|
+
);
|
|
50
33
|
error = '';
|
|
51
34
|
type = 0;
|
|
52
35
|
loading = false;
|
|
@@ -64,14 +47,14 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
64
47
|
// #region get captcha
|
|
65
48
|
|
|
66
49
|
count = 0;
|
|
67
|
-
interval$:
|
|
50
|
+
interval$: NzSafeAny;
|
|
68
51
|
|
|
69
52
|
static checkPassword(control: FormControl): NzSafeAny {
|
|
70
53
|
if (!control) {
|
|
71
54
|
return null;
|
|
72
55
|
}
|
|
73
56
|
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
74
|
-
const self:
|
|
57
|
+
const self: NzSafeAny = this;
|
|
75
58
|
self.visible = !!control.value;
|
|
76
59
|
if (control.value && control.value.length > 9) {
|
|
77
60
|
self.status = 'ok';
|
|
@@ -87,9 +70,10 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
87
70
|
}
|
|
88
71
|
|
|
89
72
|
getCaptcha(): void {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
73
|
+
const { mobile } = this.form.controls;
|
|
74
|
+
if (mobile.invalid) {
|
|
75
|
+
mobile.markAsDirty({ onlySelf: true });
|
|
76
|
+
mobile.updateValueAndValidity({ onlySelf: true });
|
|
93
77
|
return;
|
|
94
78
|
}
|
|
95
79
|
this.count = 59;
|
|
@@ -108,8 +92,9 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
108
92
|
submit(): void {
|
|
109
93
|
this.error = '';
|
|
110
94
|
Object.keys(this.form.controls).forEach(key => {
|
|
111
|
-
this.form.controls[key]
|
|
112
|
-
|
|
95
|
+
const control = (this.form.controls as NzSafeAny)[key] as AbstractControl;
|
|
96
|
+
control.markAsDirty();
|
|
97
|
+
control.updateValueAndValidity();
|
|
113
98
|
});
|
|
114
99
|
if (this.form.invalid) {
|
|
115
100
|
return;
|
package/application/index.js
CHANGED
|
@@ -58,13 +58,14 @@ function fixAngularJson(options) {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
(0, utils_1.addStylePreprocessorOptionsToAllProject)(workspace);
|
|
61
|
+
(0, utils_1.addSchematicCollections)(workspace);
|
|
61
62
|
}));
|
|
62
63
|
}
|
|
63
64
|
function addDependenciesToPackageJson(options) {
|
|
64
65
|
return (tree) => {
|
|
65
66
|
(0, versions_1.UpgradeMainVersions)(tree);
|
|
66
67
|
// 3rd
|
|
67
|
-
(0, utils_1.addPackage)(tree, ['screenfull@^6.0.
|
|
68
|
+
(0, utils_1.addPackage)(tree, ['screenfull@^6.0.2']);
|
|
68
69
|
return tree;
|
|
69
70
|
};
|
|
70
71
|
}
|
|
@@ -124,12 +125,12 @@ function addCodeStylesToPackageJson() {
|
|
|
124
125
|
// dependencies
|
|
125
126
|
(0, utils_1.addPackage)(tree, [
|
|
126
127
|
`husky@^7.0.4`,
|
|
127
|
-
`lint-staged@^
|
|
128
|
-
`prettier@^2.
|
|
129
|
-
`stylelint@^14.
|
|
128
|
+
`lint-staged@^13.0.3`,
|
|
129
|
+
`prettier@^2.7.1`,
|
|
130
|
+
`stylelint@^14.10.0`,
|
|
130
131
|
`stylelint-config-prettier@^9.0.3`,
|
|
131
132
|
`stylelint-config-rational-order@^0.1.2`,
|
|
132
|
-
`stylelint-config-standard@^
|
|
133
|
+
`stylelint-config-standard@^28.0.0`,
|
|
133
134
|
`stylelint-declaration-block-no-ignored-properties@^2.5.0`,
|
|
134
135
|
`stylelint-order@^5.0.0`
|
|
135
136
|
], 'devDependencies');
|
|
@@ -281,6 +282,7 @@ function default_1(options) {
|
|
|
281
282
|
// Configuring CommonJS dependencies
|
|
282
283
|
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
283
284
|
(0, utils_1.addAllowedCommonJsDependencies)([]),
|
|
285
|
+
(0, utils_1.addAllowSyntheticDefaultImports)(),
|
|
284
286
|
// ci
|
|
285
287
|
addRunScriptToPackageJson(),
|
|
286
288
|
addPathsToTsConfig(),
|
package/application/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAA2D;AAE3D,2DAaoC;AACpC,qEAAwE;AAExE,qDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
package/application/index.ts
CHANGED
|
@@ -19,10 +19,12 @@ import { updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
|
19
19
|
import { getLangData } from '../core/lang.config';
|
|
20
20
|
import {
|
|
21
21
|
addAllowedCommonJsDependencies,
|
|
22
|
+
addAllowSyntheticDefaultImports,
|
|
22
23
|
addAssetsToTarget,
|
|
23
24
|
addHeadStyle,
|
|
24
25
|
addHtmlToBody,
|
|
25
26
|
addPackage,
|
|
27
|
+
addSchematicCollections,
|
|
26
28
|
addStylePreprocessorOptionsToAllProject,
|
|
27
29
|
BUILD_TARGET_BUILD,
|
|
28
30
|
BUILD_TARGET_SERVE,
|
|
@@ -89,6 +91,7 @@ function fixAngularJson(options: ApplicationOptions): Rule {
|
|
|
89
91
|
}
|
|
90
92
|
|
|
91
93
|
addStylePreprocessorOptionsToAllProject(workspace);
|
|
94
|
+
addSchematicCollections(workspace);
|
|
92
95
|
});
|
|
93
96
|
}
|
|
94
97
|
|
|
@@ -96,7 +99,7 @@ function addDependenciesToPackageJson(options: ApplicationOptions): Rule {
|
|
|
96
99
|
return (tree: Tree) => {
|
|
97
100
|
UpgradeMainVersions(tree);
|
|
98
101
|
// 3rd
|
|
99
|
-
addPackage(tree, ['screenfull@^6.0.
|
|
102
|
+
addPackage(tree, ['screenfull@^6.0.2']);
|
|
100
103
|
return tree;
|
|
101
104
|
};
|
|
102
105
|
}
|
|
@@ -156,12 +159,12 @@ function addCodeStylesToPackageJson(): Rule {
|
|
|
156
159
|
tree,
|
|
157
160
|
[
|
|
158
161
|
`husky@^7.0.4`,
|
|
159
|
-
`lint-staged@^
|
|
160
|
-
`prettier@^2.
|
|
161
|
-
`stylelint@^14.
|
|
162
|
+
`lint-staged@^13.0.3`,
|
|
163
|
+
`prettier@^2.7.1`,
|
|
164
|
+
`stylelint@^14.10.0`,
|
|
162
165
|
`stylelint-config-prettier@^9.0.3`,
|
|
163
166
|
`stylelint-config-rational-order@^0.1.2`,
|
|
164
|
-
`stylelint-config-standard@^
|
|
167
|
+
`stylelint-config-standard@^28.0.0`,
|
|
165
168
|
`stylelint-declaration-block-no-ignored-properties@^2.5.0`,
|
|
166
169
|
`stylelint-order@^5.0.0`
|
|
167
170
|
],
|
|
@@ -353,6 +356,7 @@ export default function (options: ApplicationOptions): Rule {
|
|
|
353
356
|
// Configuring CommonJS dependencies
|
|
354
357
|
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
355
358
|
addAllowedCommonJsDependencies([]),
|
|
359
|
+
addAllowSyntheticDefaultImports(),
|
|
356
360
|
// ci
|
|
357
361
|
addRunScriptToPackageJson(),
|
|
358
362
|
addPathsToTsConfig(),
|
package/migration.json
CHANGED
|
@@ -11,6 +11,11 @@
|
|
|
11
11
|
"description": "Updates NG-ALAIN to v13 [https://github.com/ng-alain/ng-alain/issues/2174]",
|
|
12
12
|
"factory": "./ng-update/index#updateToV13"
|
|
13
13
|
},
|
|
14
|
+
"migration-v14": {
|
|
15
|
+
"version": "14",
|
|
16
|
+
"description": "Updates NG-ALAIN to v14 [https://github.com/ng-alain/ng-alain/issues/2285]",
|
|
17
|
+
"factory": "./ng-update/index#updateToV14"
|
|
18
|
+
},
|
|
14
19
|
"ng-post-update": {
|
|
15
20
|
"description": "Performs cleanup after ng-update.",
|
|
16
21
|
"factory": "./ng-update/index#postUpdate",
|
package/ng-add/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const color_1 = require("@angular/cli/utilities/color");
|
|
4
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
+
const colors = require("ansi-colors");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
7
7
|
const node_1 = require("../utils/node");
|
|
8
|
-
const V =
|
|
8
|
+
const V = 14;
|
|
9
9
|
function genRules(options) {
|
|
10
10
|
return () => {
|
|
11
11
|
const rules = [];
|
|
@@ -45,7 +45,7 @@ function isYarn(tree) {
|
|
|
45
45
|
function finished() {
|
|
46
46
|
return (_, context) => {
|
|
47
47
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
48
|
-
context.logger.info(
|
|
48
|
+
context.logger.info(colors.green(`
|
|
49
49
|
✓ Congratulations, NG-ALAIN scaffold generation complete 🎉.
|
|
50
50
|
|
|
51
51
|
NG-ALAIN documentation site: https://ng-alain.com
|
package/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/ng-add/index.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import { colors } from '@angular/cli/utilities/color';
|
|
2
|
-
|
|
3
1
|
import { chain, Rule, schematic, Tree, SchematicContext, SchematicsException } from '@angular-devkit/schematics';
|
|
4
2
|
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
3
|
+
import * as colors from 'ansi-colors';
|
|
5
4
|
|
|
6
5
|
import { Schema as ApplicationOptions } from '../application/schema';
|
|
7
6
|
import { readJSON, readPackage } from '../utils';
|
|
8
7
|
import { getNodeMajorVersion } from '../utils/node';
|
|
9
8
|
import { Schema as NgAddOptions } from './schema';
|
|
10
9
|
|
|
11
|
-
const V =
|
|
10
|
+
const V = 14;
|
|
12
11
|
|
|
13
12
|
function genRules(options: NgAddOptions): Rule {
|
|
14
13
|
return () => {
|
package/ng-update/index.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.postUpdate = exports.updateToV13 = exports.updateToV12 = void 0;
|
|
3
|
+
exports.postUpdate = exports.updateToV14 = exports.updateToV13 = exports.updateToV12 = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
const schematics_2 = require("@angular-devkit/schematics");
|
|
6
6
|
const upgrade_data_1 = require("./upgrade-data");
|
|
7
7
|
const _src_to_nz_image_rule_1 = require("./upgrade-rules/checks/_src-to-nz-image-rule");
|
|
8
8
|
const v12_1 = require("./upgrade-rules/v12");
|
|
9
9
|
const v13_1 = require("./upgrade-rules/v13");
|
|
10
|
+
const v14_1 = require("./upgrade-rules/v14");
|
|
10
11
|
const migrations = [_src_to_nz_image_rule_1.SrcToNzImageRule];
|
|
11
12
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
13
|
function updateToV12(schema) {
|
|
@@ -18,6 +19,10 @@ function updateToV13() {
|
|
|
18
19
|
return (0, schematics_2.chain)([(0, v13_1.v13Rule)(), (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V13, migrations, upgrade_data_1.ruleUpgradeData, postUpdate)]);
|
|
19
20
|
}
|
|
20
21
|
exports.updateToV13 = updateToV13;
|
|
22
|
+
function updateToV14() {
|
|
23
|
+
return (0, schematics_2.chain)([(0, v14_1.v14Rule)(), (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V14, migrations, upgrade_data_1.ruleUpgradeData, postUpdate)]);
|
|
24
|
+
}
|
|
25
|
+
exports.updateToV14 = updateToV14;
|
|
21
26
|
/** Post-update schematic to be called when update is finished. */
|
|
22
27
|
function postUpdate(context, targetVersion, hasFailures) {
|
|
23
28
|
context.logger.info('');
|
package/ng-update/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;;AAAA,wDAA+G;AAE/G,2DAA2E;AAE3E,iDAAiD;AACjD,wFAAgF;AAChF,6CAA8C;AAC9C,6CAA8C;AAE9C,MAAM,UAAU,GAA8B,CAAC,wCAAgB,CAAC,CAAC;AAEjE,8DAA8D;AAC9D,SAAgB,WAAW,CAAC,MAAW;IACrC,MAAM,IAAI,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAI,EAAE,IAAA,yCAA4B,EAAC,0BAAa,CAAC,GAAG,EAAE,UAAU,EAAE,8BAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACjH,CAAC;AAHD,kCAGC;AAED,SAAgB,WAAW;IACzB,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,aAAO,GAAE,EAAE,IAAA,yCAA4B,EAAC,0BAAa,CAAC,GAAG,EAAE,UAAU,EAAE,8BAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC;AAFD,kCAEC;AAED,kEAAkE;AAClE,SAAgB,UAAU,CAAC,OAAyB,EAAE,aAA4B,EAAE,WAAoB;IACtG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IACjE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,wFAAwF;YACtF,6CAA6C,CAChD,CAAC;KACH;AACH,CAAC;AAXD,gCAWC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;;AAAA,wDAA+G;AAE/G,2DAA2E;AAE3E,iDAAiD;AACjD,wFAAgF;AAChF,6CAA8C;AAC9C,6CAA8C;AAC9C,6CAA8C;AAE9C,MAAM,UAAU,GAA8B,CAAC,wCAAgB,CAAC,CAAC;AAEjE,8DAA8D;AAC9D,SAAgB,WAAW,CAAC,MAAW;IACrC,MAAM,IAAI,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAI,EAAE,IAAA,yCAA4B,EAAC,0BAAa,CAAC,GAAG,EAAE,UAAU,EAAE,8BAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACjH,CAAC;AAHD,kCAGC;AAED,SAAgB,WAAW;IACzB,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,aAAO,GAAE,EAAE,IAAA,yCAA4B,EAAC,0BAAa,CAAC,GAAG,EAAE,UAAU,EAAE,8BAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC;AAFD,kCAEC;AAED,SAAgB,WAAW;IACzB,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,aAAO,GAAE,EAAE,IAAA,yCAA4B,EAAC,0BAAa,CAAC,GAAG,EAAE,UAAU,EAAE,8BAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACtH,CAAC;AAFD,kCAEC;AAED,kEAAkE;AAClE,SAAgB,UAAU,CAAC,OAAyB,EAAE,aAA4B,EAAE,WAAoB;IACtG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IACjE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,wFAAwF;YACtF,6CAA6C,CAChD,CAAC;KACH;AACH,CAAC;AAXD,gCAWC"}
|
package/ng-update/index.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { ruleUpgradeData } from './upgrade-data';
|
|
|
6
6
|
import { SrcToNzImageRule } from './upgrade-rules/checks/_src-to-nz-image-rule';
|
|
7
7
|
import { v12Rule } from './upgrade-rules/v12';
|
|
8
8
|
import { v13Rule } from './upgrade-rules/v13';
|
|
9
|
+
import { v14Rule } from './upgrade-rules/v14';
|
|
9
10
|
|
|
10
11
|
const migrations: NullableDevkitMigration[] = [SrcToNzImageRule];
|
|
11
12
|
|
|
@@ -19,6 +20,10 @@ export function updateToV13(): Rule {
|
|
|
19
20
|
return chain([v13Rule(), createMigrationSchematicRule(TargetVersion.V13, migrations, ruleUpgradeData, postUpdate)]);
|
|
20
21
|
}
|
|
21
22
|
|
|
23
|
+
export function updateToV14(): Rule {
|
|
24
|
+
return chain([v14Rule(), createMigrationSchematicRule(TargetVersion.V14, migrations, ruleUpgradeData, postUpdate)]);
|
|
25
|
+
}
|
|
26
|
+
|
|
22
27
|
/** Post-update schematic to be called when update is finished. */
|
|
23
28
|
export function postUpdate(context: SchematicContext, targetVersion: TargetVersion, hasFailures: boolean): void {
|
|
24
29
|
context.logger.info('');
|
|
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.v12Rule = void 0;
|
|
13
|
-
const color_1 = require("@angular/cli/utilities/color");
|
|
14
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
14
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
15
|
+
const colors = require("ansi-colors");
|
|
16
16
|
const utils_1 = require("../../../utils");
|
|
17
17
|
const code_style_1 = require("../../../utils/code-style");
|
|
18
18
|
const versions_1 = require("../../../utils/versions");
|
|
@@ -59,7 +59,7 @@ function fixAngularJson(context) {
|
|
|
59
59
|
}
|
|
60
60
|
function upgradeThirdVersion() {
|
|
61
61
|
return (tree, context) => {
|
|
62
|
-
(0, utils_1.addPackage)(tree, [`ngx-ueditor@^
|
|
62
|
+
(0, utils_1.addPackage)(tree, [`ngx-ueditor@^14.0.0`, `ngx-tinymce@^14.0.0`], 'dependencies');
|
|
63
63
|
(0, utils_1.logStart)(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
|
|
64
64
|
};
|
|
65
65
|
}
|
|
@@ -137,8 +137,8 @@ function formatJson() {
|
|
|
137
137
|
}
|
|
138
138
|
function finished() {
|
|
139
139
|
return (_tree, context) => {
|
|
140
|
-
context.logger.warn(
|
|
141
|
-
context.logger.info(
|
|
140
|
+
context.logger.warn(colors.yellow(` ✓ After the upgrade is complete, you still need to execute \`ng lint --fix\` to fix the code format, Abort more detail please refer to upgrade guide https://ng-alain.com/docs/style-guide`));
|
|
141
|
+
context.logger.info(colors.green(` ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2027`));
|
|
142
142
|
};
|
|
143
143
|
}
|
|
144
144
|
function v12Rule(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v12/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v12/index.ts"],"names":[],"mappings":"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"}
|