ng-alain 14.0.0-beta.0 → 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/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 +1 -0
- package/application/index.js.map +1 -1
- package/application/index.ts +2 -0
- package/ng-update/upgrade-rules/v14/index.js +9 -1
- package/ng-update/upgrade-rules/v14/index.js.map +1 -1
- package/ng-update/upgrade-rules/v14/index.ts +16 -2
- package/package.json +1 -1
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/workspace.js +15 -2
- package/utils/workspace.js.map +1 -1
- package/utils/workspace.ts +13 -2
|
@@ -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
|
@@ -282,6 +282,7 @@ function default_1(options) {
|
|
|
282
282
|
// Configuring CommonJS dependencies
|
|
283
283
|
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
284
284
|
(0, utils_1.addAllowedCommonJsDependencies)([]),
|
|
285
|
+
(0, utils_1.addAllowSyntheticDefaultImports)(),
|
|
285
286
|
// ci
|
|
286
287
|
addRunScriptToPackageJson(),
|
|
287
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,6 +19,7 @@ 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,
|
|
@@ -355,6 +356,7 @@ export default function (options: ApplicationOptions): Rule {
|
|
|
355
356
|
// Configuring CommonJS dependencies
|
|
356
357
|
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
357
358
|
addAllowedCommonJsDependencies([]),
|
|
359
|
+
addAllowSyntheticDefaultImports(),
|
|
358
360
|
// ci
|
|
359
361
|
addRunScriptToPackageJson(),
|
|
360
362
|
addPathsToTsConfig(),
|
|
@@ -50,7 +50,15 @@ function v14Rule() {
|
|
|
50
50
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
51
51
|
(0, utils_1.logStart)(context, `Upgrade @delon/* version number`);
|
|
52
52
|
(0, versions_1.UpgradeMainVersions)(tree);
|
|
53
|
-
return (0, schematics_1.chain)([
|
|
53
|
+
return (0, schematics_1.chain)([
|
|
54
|
+
(0, utils_1.addAllowSyntheticDefaultImports)(),
|
|
55
|
+
// Configuring CommonJS dependencies
|
|
56
|
+
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
57
|
+
(0, utils_1.addAllowedCommonJsDependencies)([]),
|
|
58
|
+
fixSchematicCollections(context),
|
|
59
|
+
addEslintPluginDeprecation(),
|
|
60
|
+
finished()
|
|
61
|
+
]);
|
|
54
62
|
});
|
|
55
63
|
}
|
|
56
64
|
exports.v14Rule = v14Rule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v14/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,qEAAwE;AACxE,sCAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v14/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,qEAAwE;AACxE,sCAAsC;AAEtC,0CAMwB;AACxB,sDAA8D;AAE9D,SAAS,uBAAuB,CAAC,OAAyB;IACxD,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,IAAA,+BAAuB,EAAC,SAAS,CAAC,CAAC;QACnC,IAAA,gBAAQ,EAAC,OAAO,EAAE,+FAA+F,CAAC,CAAC;IACrH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B;IACjC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,cAAc,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO;QAE/B,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,CAAC,QAAQ,CAAC,2CAA2C,CAAC,EAAE;YACjE,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,2CAA2C,EAC3C,0DAA0D,CAC3D,CAAC;SACH;QACD,IAAI,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE;YAC9C,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,EAAE,4DAA4D,CAAC,CAAC;SACnH;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,kBAAkB;QAClB,IAAA,kBAAU,EAAC,IAAI,EAAE,8CAA8C,EAAE,iBAAiB,CAAC,CAAC;QACpF,IAAA,gBAAQ,EAAC,OAAO,EAAE,gCAAgC,CAAC,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,KAAK,CACV,uHAAuH,CACxH,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,OAAO;IACrB,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAA,gBAAQ,EAAC,OAAO,EAAE,iCAAiC,CAAC,CAAC;QACrD,IAAA,8BAAmB,EAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,uCAA+B,GAAE;YACjC,oCAAoC;YACpC,mEAAmE;YACnE,IAAA,sCAA8B,EAAC,EAAE,CAAC;YAClC,uBAAuB,CAAC,OAAO,CAAC;YAChC,0BAA0B,EAAE;YAC5B,QAAQ,EAAE;SACX,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAdD,0BAcC"}
|
|
@@ -3,7 +3,13 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
|
3
3
|
import { updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
4
4
|
import * as colors from 'ansi-colors';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
addAllowedCommonJsDependencies,
|
|
8
|
+
addAllowSyntheticDefaultImports,
|
|
9
|
+
addPackage,
|
|
10
|
+
addSchematicCollections,
|
|
11
|
+
logStart
|
|
12
|
+
} from '../../../utils';
|
|
7
13
|
import { UpgradeMainVersions } from '../../../utils/versions';
|
|
8
14
|
|
|
9
15
|
function fixSchematicCollections(context: SchematicContext): Rule {
|
|
@@ -52,6 +58,14 @@ export function v14Rule(): Rule {
|
|
|
52
58
|
return async (tree: Tree, context: SchematicContext) => {
|
|
53
59
|
logStart(context, `Upgrade @delon/* version number`);
|
|
54
60
|
UpgradeMainVersions(tree);
|
|
55
|
-
return chain([
|
|
61
|
+
return chain([
|
|
62
|
+
addAllowSyntheticDefaultImports(),
|
|
63
|
+
// Configuring CommonJS dependencies
|
|
64
|
+
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
65
|
+
addAllowedCommonJsDependencies([]),
|
|
66
|
+
fixSchematicCollections(context),
|
|
67
|
+
addEslintPluginDeprecation(),
|
|
68
|
+
finished()
|
|
69
|
+
]);
|
|
56
70
|
};
|
|
57
71
|
}
|
package/package.json
CHANGED
package/utils/lib-versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ZORROVERSION = exports.VERSION = void 0;
|
|
4
|
-
exports.VERSION = '^14.0.0-beta.
|
|
4
|
+
exports.VERSION = '^14.0.0-beta.1';
|
|
5
5
|
exports.ZORROVERSION = '^14.0.0';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^14.0.0-beta.
|
|
1
|
+
export const VERSION = '^14.0.0-beta.1';
|
|
2
2
|
export const ZORROVERSION = '^14.0.0';
|
package/utils/workspace.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.addSchematicCollections = exports.addStylePreprocessorOptionsToAllProject = exports.getProjectTarget = exports.getProjectFromWorkspace = exports.removeAllowedCommonJsDependencies = exports.addAllowedCommonJsDependencies = exports.addAssetsToTarget = exports.getProject = exports.getNgAlainJson = exports.NG_ALAIN_JSON = exports.BUILD_TARGET_LINT = exports.BUILD_TARGET_SERVE = exports.BUILD_TARGET_TEST = exports.BUILD_TARGET_BUILD = void 0;
|
|
12
|
+
exports.addSchematicCollections = exports.addStylePreprocessorOptionsToAllProject = exports.getProjectTarget = exports.getProjectFromWorkspace = exports.addAllowSyntheticDefaultImports = exports.removeAllowedCommonJsDependencies = exports.addAllowedCommonJsDependencies = exports.addAssetsToTarget = exports.getProject = exports.getNgAlainJson = exports.NG_ALAIN_JSON = exports.BUILD_TARGET_LINT = exports.BUILD_TARGET_SERVE = exports.BUILD_TARGET_TEST = exports.BUILD_TARGET_BUILD = void 0;
|
|
13
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
14
14
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
15
15
|
const json_1 = require("./json");
|
|
@@ -83,7 +83,7 @@ function addAllowedCommonJsDependencies(items, projectName) {
|
|
|
83
83
|
list = [...list, ...items];
|
|
84
84
|
}
|
|
85
85
|
const result = new Set(...list);
|
|
86
|
-
['ajv', 'ajv-formats'].forEach(key => result.add(key));
|
|
86
|
+
['ajv', 'ajv-formats', 'mockjs', 'file-saver', 'extend'].forEach(key => result.add(key));
|
|
87
87
|
targetOptions.allowedCommonJsDependencies = Array.from(result).sort();
|
|
88
88
|
}));
|
|
89
89
|
}
|
|
@@ -104,6 +104,19 @@ function removeAllowedCommonJsDependencies(key, projectName) {
|
|
|
104
104
|
}));
|
|
105
105
|
}
|
|
106
106
|
exports.removeAllowedCommonJsDependencies = removeAllowedCommonJsDependencies;
|
|
107
|
+
function addAllowSyntheticDefaultImports(value = true) {
|
|
108
|
+
return (tree) => {
|
|
109
|
+
const json = (0, json_1.readJSON)(tree, 'tsconfig.json', 'compilerOptions');
|
|
110
|
+
if (json == null)
|
|
111
|
+
return tree;
|
|
112
|
+
if (!json.compilerOptions)
|
|
113
|
+
json.compilerOptions = {};
|
|
114
|
+
json.compilerOptions['allowSyntheticDefaultImports'] = value;
|
|
115
|
+
(0, json_1.writeJSON)(tree, 'tsconfig.json', json);
|
|
116
|
+
return tree;
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
exports.addAllowSyntheticDefaultImports = addAllowSyntheticDefaultImports;
|
|
107
120
|
function getProjectFromWorkspace(workspace, projectName) {
|
|
108
121
|
var _a;
|
|
109
122
|
if (!projectName) {
|
package/utils/workspace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2DAA6E;AAC7E,qEAAsF;AAEtF,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":"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"}
|
package/utils/workspace.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { ProjectDefinition, WorkspaceDefinition } from '@angular-devkit/core/src
|
|
|
3
3
|
import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
|
|
4
4
|
import { getWorkspace, updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
5
5
|
|
|
6
|
-
import { readJSON } from './json';
|
|
6
|
+
import { readJSON, writeJSON } from './json';
|
|
7
7
|
|
|
8
8
|
export const BUILD_TARGET_BUILD = 'build';
|
|
9
9
|
export const BUILD_TARGET_TEST = 'test';
|
|
@@ -91,7 +91,7 @@ export function addAllowedCommonJsDependencies(items: string[], projectName?: st
|
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
const result = new Set<string>(...list);
|
|
94
|
-
['ajv', 'ajv-formats'].forEach(key => result.add(key));
|
|
94
|
+
['ajv', 'ajv-formats', 'mockjs', 'file-saver', 'extend'].forEach(key => result.add(key));
|
|
95
95
|
|
|
96
96
|
targetOptions.allowedCommonJsDependencies = Array.from(result).sort();
|
|
97
97
|
});
|
|
@@ -115,6 +115,17 @@ export function removeAllowedCommonJsDependencies(key: string, projectName?: str
|
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
|
|
118
|
+
export function addAllowSyntheticDefaultImports(value: boolean = true): Rule {
|
|
119
|
+
return (tree: Tree) => {
|
|
120
|
+
const json = readJSON(tree, 'tsconfig.json', 'compilerOptions');
|
|
121
|
+
if (json == null) return tree;
|
|
122
|
+
if (!json.compilerOptions) json.compilerOptions = {};
|
|
123
|
+
json.compilerOptions['allowSyntheticDefaultImports'] = value;
|
|
124
|
+
writeJSON(tree, 'tsconfig.json', json);
|
|
125
|
+
return tree;
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
|
|
118
129
|
export function getProjectFromWorkspace(workspace: WorkspaceDefinition, projectName: string): ProjectDefinition {
|
|
119
130
|
if (!projectName) {
|
|
120
131
|
projectName = Array.from(workspace.projects.keys()).pop() ?? null;
|