ng-alain 13.0.0-beta.2 → 13.0.0
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.ts +1 -1
- package/application/files/src/app/core/net/default.interceptor.ts +1 -1
- package/application/files/src/app/layout/basic/widgets/fullscreen.component.ts +4 -7
- package/application/files/src/app/layout/passport/passport.component.less +1 -1
- package/application/files/src/app/routes/exception/exception.component.ts +1 -1
- package/application/files/src/app/routes/passport/callback.component.ts +1 -1
- package/application/files/src/app/routes/passport/login/login.component.less +1 -1
- package/application/files/src/app/routes/passport/login/login.component.ts +4 -4
- package/application/files/src/app/routes/passport/register/register.component.less +1 -1
- package/application/files/src/app/routes/passport/register/register.component.ts +5 -5
- package/application/files/src/app/routes/passport/register-result/register-result.component.ts +1 -1
- package/application/files/src/styles/theme.less +1 -1
- package/application/files/src/styles.less +5 -5
- package/application/files/src/test.ts +3 -1
- package/application/index.js +1 -0
- package/application/index.js.map +1 -1
- package/application/index.ts +3 -0
- package/ng-update/upgrade-rules/v13/index.js +46 -2
- package/ng-update/upgrade-rules/v13/index.js.map +1 -1
- package/ng-update/upgrade-rules/v13/index.spec.ts +8 -1
- package/ng-update/upgrade-rules/v13/index.ts +63 -3
- package/package.json +1 -1
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/versions.js +5 -2
- package/utils/versions.js.map +1 -1
- package/utils/versions.ts +5 -2
- package/utils/workspace.js +20 -1
- package/utils/workspace.js.map +1 -1
- package/utils/workspace.ts +15 -0
|
@@ -59,7 +59,7 @@ const LANGS: { [key: string]: LangConfigData } = {
|
|
|
59
59
|
|
|
60
60
|
@Injectable({ providedIn: 'root' })
|
|
61
61
|
export class I18NService extends AlainI18nBaseService {
|
|
62
|
-
protected _defaultLang = DEFAULT;
|
|
62
|
+
protected override _defaultLang = DEFAULT;
|
|
63
63
|
private _langs = Object.keys(LANGS).map(code => {
|
|
64
64
|
const item = LANGS[code];
|
|
65
65
|
return { code, text: item.text, abbr: item.abbr };
|
|
@@ -80,7 +80,7 @@ export class DefaultInterceptor implements HttpInterceptor {
|
|
|
80
80
|
*/
|
|
81
81
|
private refreshTokenRequest(): Observable<any> {
|
|
82
82
|
const model = this.tokenSrv.get();
|
|
83
|
-
return this.http.post(`/api/auth/refresh`, null, null, { headers: { refresh_token: model?.refresh_token || '' } });
|
|
83
|
+
return this.http.post(`/api/auth/refresh`, null, null, { headers: { refresh_token: model?.['refresh_token'] || '' } });
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
// #region 刷新Token方式一：使用 401 重新刷新 Token
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, Component, HostListener } from '@angular/core';
|
|
2
|
-
import
|
|
2
|
+
import screenfull from 'screenfull';
|
|
3
3
|
|
|
4
4
|
@Component({
|
|
5
5
|
selector: 'header-fullscreen',
|
|
@@ -14,19 +14,16 @@ import * as screenfull from 'screenfull';
|
|
|
14
14
|
})
|
|
15
15
|
export class HeaderFullScreenComponent {
|
|
16
16
|
status = false;
|
|
17
|
-
private get sf(): screenfull.Screenfull {
|
|
18
|
-
return screenfull as screenfull.Screenfull;
|
|
19
|
-
}
|
|
20
17
|
|
|
21
18
|
@HostListener('window:resize')
|
|
22
19
|
_resize(): void {
|
|
23
|
-
this.status =
|
|
20
|
+
this.status = screenfull.isFullscreen;
|
|
24
21
|
}
|
|
25
22
|
|
|
26
23
|
@HostListener('click')
|
|
27
24
|
_click(): void {
|
|
28
|
-
if (
|
|
29
|
-
|
|
25
|
+
if (screenfull.isEnabled) {
|
|
26
|
+
screenfull.toggle();
|
|
30
27
|
}
|
|
31
28
|
}
|
|
32
29
|
}
|
|
@@ -9,7 +9,7 @@ import { ExceptionType } from '@delon/abc/exception';
|
|
|
9
9
|
})
|
|
10
10
|
export class ExceptionComponent {
|
|
11
11
|
get type(): ExceptionType {
|
|
12
|
-
return this.route.snapshot.data
|
|
12
|
+
return this.route.snapshot.data['type'];
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
constructor(private route: ActivatedRoute) {}
|
|
@@ -14,7 +14,7 @@ export class CallbackComponent implements OnInit {
|
|
|
14
14
|
constructor(private socialService: SocialService, private settingsSrv: SettingsService, private route: ActivatedRoute) {}
|
|
15
15
|
|
|
16
16
|
ngOnInit(): void {
|
|
17
|
-
this.type = this.route.snapshot.params
|
|
17
|
+
this.type = this.route.snapshot.params['type'];
|
|
18
18
|
this.mockModel();
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -42,16 +42,16 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
42
42
|
// #region fields
|
|
43
43
|
|
|
44
44
|
get userName(): AbstractControl {
|
|
45
|
-
return this.form.
|
|
45
|
+
return this.form.get('userName')!;
|
|
46
46
|
}
|
|
47
47
|
get password(): AbstractControl {
|
|
48
|
-
return this.form.
|
|
48
|
+
return this.form.get('password')!;
|
|
49
49
|
}
|
|
50
50
|
get mobile(): AbstractControl {
|
|
51
|
-
return this.form.
|
|
51
|
+
return this.form.get('mobile')!;
|
|
52
52
|
}
|
|
53
53
|
get captcha(): AbstractControl {
|
|
54
|
-
return this.form.
|
|
54
|
+
return this.form.get('captcha')!;
|
|
55
55
|
}
|
|
56
56
|
form: FormGroup;
|
|
57
57
|
error = '';
|
|
@@ -32,19 +32,19 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
32
32
|
// #region fields
|
|
33
33
|
|
|
34
34
|
get mail(): AbstractControl {
|
|
35
|
-
return this.form.
|
|
35
|
+
return this.form.get('mail')!;
|
|
36
36
|
}
|
|
37
37
|
get password(): AbstractControl {
|
|
38
|
-
return this.form.
|
|
38
|
+
return this.form.get('password')!;
|
|
39
39
|
}
|
|
40
40
|
get confirm(): AbstractControl {
|
|
41
|
-
return this.form.
|
|
41
|
+
return this.form.get('confirm')!;
|
|
42
42
|
}
|
|
43
43
|
get mobile(): AbstractControl {
|
|
44
|
-
return this.form.
|
|
44
|
+
return this.form.get('mobile')!;
|
|
45
45
|
}
|
|
46
46
|
get captcha(): AbstractControl {
|
|
47
|
-
return this.form.
|
|
47
|
+
return this.form.get('captcha')!;
|
|
48
48
|
}
|
|
49
49
|
form: FormGroup;
|
|
50
50
|
error = '';
|
package/application/files/src/app/routes/passport/register-result/register-result.component.ts
CHANGED
|
@@ -10,6 +10,6 @@ export class UserRegisterResultComponent {
|
|
|
10
10
|
params = { email: '' };
|
|
11
11
|
email = '';
|
|
12
12
|
constructor(route: ActivatedRoute, public msg: NzMessageService) {
|
|
13
|
-
this.params.email = this.email = route.snapshot.queryParams
|
|
13
|
+
this.params.email = this.email = route.snapshot.queryParams['email'] || 'ng-alain@example.com';
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// - `default` Default theme
|
|
3
3
|
// - `dark` Import the official dark less style file
|
|
4
4
|
// - `compact` Import the official compact less style file
|
|
5
|
-
@import '
|
|
5
|
+
@import '@delon/theme/theme-default.less';
|
|
6
6
|
|
|
7
7
|
// ==========The following is the custom theme variable area==========
|
|
8
8
|
// The theme paraments can be generated at https://ng-alain.github.io/ng-alain/
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
@import '
|
|
2
|
-
@import '
|
|
3
|
-
@import '
|
|
4
|
-
@import '
|
|
5
|
-
@import '
|
|
1
|
+
@import '@delon/theme/system/index';
|
|
2
|
+
@import '@delon/abc/index';
|
|
3
|
+
@import '@delon/chart/index';
|
|
4
|
+
@import '@delon/theme/layout-default/style/index';
|
|
5
|
+
@import '@delon/theme/layout-blank/style/index';
|
|
6
6
|
|
|
7
7
|
@import './styles/index';
|
|
8
8
|
@import './styles/theme';
|
|
@@ -13,7 +13,9 @@ declare const require: any;
|
|
|
13
13
|
// First, initialize the Angular testing environment.
|
|
14
14
|
getTestBed().initTestEnvironment(
|
|
15
15
|
BrowserDynamicTestingModule,
|
|
16
|
-
platformBrowserDynamicTesting()
|
|
16
|
+
platformBrowserDynamicTesting(), {
|
|
17
|
+
teardown: { destroyAfterEach: false }
|
|
18
|
+
}
|
|
17
19
|
);
|
|
18
20
|
|
|
19
21
|
// Then we find all the tests.
|
package/application/index.js
CHANGED
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
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
addHeadStyle,
|
|
24
24
|
addHtmlToBody,
|
|
25
25
|
addPackage,
|
|
26
|
+
addStylePreprocessorOptionsToAllProject,
|
|
26
27
|
BUILD_TARGET_BUILD,
|
|
27
28
|
BUILD_TARGET_SERVE,
|
|
28
29
|
getProject,
|
|
@@ -86,6 +87,8 @@ function fixAngularJson(options: ApplicationOptions): Rule {
|
|
|
86
87
|
initial.maximumError = '3mb';
|
|
87
88
|
}
|
|
88
89
|
}
|
|
90
|
+
|
|
91
|
+
addStylePreprocessorOptionsToAllProject(workspace);
|
|
89
92
|
});
|
|
90
93
|
}
|
|
91
94
|
|
|
@@ -12,9 +12,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.v13Rule = void 0;
|
|
13
13
|
const color_1 = require("@angular/cli/utilities/color");
|
|
14
14
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
15
16
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
16
17
|
const utils_1 = require("../../../utils");
|
|
17
18
|
const versions_1 = require("../../../utils/versions");
|
|
19
|
+
function addStylePreprocessorOptions() {
|
|
20
|
+
return (0, workspace_1.updateWorkspace)((workspace) => __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
(0, utils_1.addStylePreprocessorOptionsToAllProject)(workspace);
|
|
22
|
+
}));
|
|
23
|
+
}
|
|
24
|
+
// Using ~ is deprecated and can be removed from your code
|
|
25
|
+
function fixLessResolver() {
|
|
26
|
+
return (tree, context) => {
|
|
27
|
+
(0, utils_1.logStart)(context, `Removed deprecated ~ in less file, pls refer to https://github.com/webpack-contrib/less-loader#imports`);
|
|
28
|
+
tree.visit(path => {
|
|
29
|
+
if (!path.endsWith(`.less`))
|
|
30
|
+
return;
|
|
31
|
+
const content = tree
|
|
32
|
+
.read(path)
|
|
33
|
+
.toString('utf8')
|
|
34
|
+
.replace(/^(@import ['"]{1})~/gm, '$1');
|
|
35
|
+
tree.overwrite(path, content);
|
|
36
|
+
});
|
|
37
|
+
};
|
|
38
|
+
}
|
|
18
39
|
function removeIE() {
|
|
19
40
|
return (tree, context) => {
|
|
20
41
|
const pkg = (0, utils_1.readPackage)(tree);
|
|
@@ -34,6 +55,20 @@ function addYarn(context) {
|
|
|
34
55
|
(0, utils_1.logStart)(context, `Configuration optimization using Yarn to install dependencies`);
|
|
35
56
|
}));
|
|
36
57
|
}
|
|
58
|
+
function upgradeKarmaCoverage() {
|
|
59
|
+
return (tree, context) => {
|
|
60
|
+
const karmaConfJs = 'karma.conf.js';
|
|
61
|
+
const pkg = (0, utils_1.readPackage)(tree);
|
|
62
|
+
if (!pkg.devDependencies || !pkg.devDependencies['karma-coverage-istanbul-reporter'] || !tree.exists(karmaConfJs))
|
|
63
|
+
return;
|
|
64
|
+
delete pkg.devDependencies['karma-coverage-istanbul-reporter'];
|
|
65
|
+
(0, utils_1.writePackage)(tree, pkg);
|
|
66
|
+
// update karma.conf.js
|
|
67
|
+
const content = (0, utils_1.readContent)(tree, karmaConfJs).replace(`karma-coverage-istanbul-reporter`, 'karma-coverage');
|
|
68
|
+
tree.overwrite(karmaConfJs, content);
|
|
69
|
+
(0, utils_1.logStart)(context, `karma-coverage instead of karma-coverage-istanbul-reporter`);
|
|
70
|
+
};
|
|
71
|
+
}
|
|
37
72
|
function upgradeThirdVersion() {
|
|
38
73
|
return (tree, context) => {
|
|
39
74
|
(0, utils_1.addPackage)(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
|
|
@@ -42,14 +77,23 @@ function upgradeThirdVersion() {
|
|
|
42
77
|
}
|
|
43
78
|
function finished() {
|
|
44
79
|
return (_tree, context) => {
|
|
45
|
-
context.
|
|
80
|
+
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
81
|
+
context.logger.info(color_1.colors.green(` ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2174`));
|
|
46
82
|
};
|
|
47
83
|
}
|
|
48
84
|
function v13Rule() {
|
|
49
85
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
50
86
|
(0, utils_1.logStart)(context, `Upgrade @delon/* version number`);
|
|
51
87
|
(0, versions_1.UpgradeMainVersions)(tree);
|
|
52
|
-
return (0, schematics_1.chain)([
|
|
88
|
+
return (0, schematics_1.chain)([
|
|
89
|
+
removeIE(),
|
|
90
|
+
addStylePreprocessorOptions(),
|
|
91
|
+
fixLessResolver(),
|
|
92
|
+
upgradeKarmaCoverage(),
|
|
93
|
+
upgradeThirdVersion(),
|
|
94
|
+
addYarn(context),
|
|
95
|
+
finished()
|
|
96
|
+
]);
|
|
53
97
|
});
|
|
54
98
|
}
|
|
55
99
|
exports.v13Rule = v13Rule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsD;AAEtD,2DAAiF;AACjF,qEAAwE;AAExE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,17 @@ describe('Schematic: ng-update: v13Rule', () => {
|
|
|
18
18
|
await runner.runSchematicAsync('migration-v13', {}, tree).toPromise();
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
it(`should be
|
|
21
|
+
it(`should be working`, async () => {
|
|
22
|
+
tree.create(
|
|
23
|
+
`1.less`,
|
|
24
|
+
`@import '~@delon/theme/index';
|
|
25
|
+
@import '~ng-zorro-antd/';`
|
|
26
|
+
);
|
|
22
27
|
await runMigration();
|
|
23
28
|
const content = tree.readContent('angular.json');
|
|
29
|
+
expect(content).toContain(`stylePreprocessorOptions`);
|
|
24
30
|
expect(content).toContain(`"packageManager": "yarn"`);
|
|
31
|
+
expect(tree.readContent('1.less')).not.toContain(`@import '~@delon`);
|
|
25
32
|
});
|
|
26
33
|
|
|
27
34
|
it(`should be tips not support ie`, async () => {
|
|
@@ -1,11 +1,44 @@
|
|
|
1
1
|
import { colors } from '@angular/cli/utilities/color';
|
|
2
2
|
|
|
3
3
|
import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
4
|
+
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
4
5
|
import { updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
5
6
|
|
|
6
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
addPackage,
|
|
9
|
+
addStylePreprocessorOptionsToAllProject,
|
|
10
|
+
logStart,
|
|
11
|
+
readContent,
|
|
12
|
+
readPackage,
|
|
13
|
+
writePackage
|
|
14
|
+
} from '../../../utils';
|
|
7
15
|
import { UpgradeMainVersions } from '../../../utils/versions';
|
|
8
16
|
|
|
17
|
+
function addStylePreprocessorOptions(): Rule {
|
|
18
|
+
return updateWorkspace(async workspace => {
|
|
19
|
+
addStylePreprocessorOptionsToAllProject(workspace);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// Using ~ is deprecated and can be removed from your code
|
|
24
|
+
function fixLessResolver(): Rule {
|
|
25
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
26
|
+
logStart(
|
|
27
|
+
context,
|
|
28
|
+
`Removed deprecated ~ in less file, pls refer to https://github.com/webpack-contrib/less-loader#imports`
|
|
29
|
+
);
|
|
30
|
+
tree.visit(path => {
|
|
31
|
+
if (!path.endsWith(`.less`)) return;
|
|
32
|
+
const content = tree
|
|
33
|
+
.read(path)
|
|
34
|
+
.toString('utf8')
|
|
35
|
+
.replace(/^(@import ['"]{1})~/gm, '$1');
|
|
36
|
+
|
|
37
|
+
tree.overwrite(path, content);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
|
|
9
42
|
function removeIE(): Rule {
|
|
10
43
|
return (tree: Tree, context: SchematicContext) => {
|
|
11
44
|
const pkg = readPackage(tree);
|
|
@@ -25,6 +58,23 @@ function addYarn(context: SchematicContext): Rule {
|
|
|
25
58
|
});
|
|
26
59
|
}
|
|
27
60
|
|
|
61
|
+
function upgradeKarmaCoverage(): Rule {
|
|
62
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
63
|
+
const karmaConfJs = 'karma.conf.js';
|
|
64
|
+
const pkg = readPackage(tree);
|
|
65
|
+
if (!pkg.devDependencies || !pkg.devDependencies['karma-coverage-istanbul-reporter'] || !tree.exists(karmaConfJs))
|
|
66
|
+
return;
|
|
67
|
+
delete pkg.devDependencies['karma-coverage-istanbul-reporter'];
|
|
68
|
+
writePackage(tree, pkg);
|
|
69
|
+
|
|
70
|
+
// update karma.conf.js
|
|
71
|
+
const content = readContent(tree, karmaConfJs).replace(`karma-coverage-istanbul-reporter`, 'karma-coverage');
|
|
72
|
+
tree.overwrite(karmaConfJs, content);
|
|
73
|
+
|
|
74
|
+
logStart(context, `karma-coverage instead of karma-coverage-istanbul-reporter`);
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
|
|
28
78
|
function upgradeThirdVersion(): Rule {
|
|
29
79
|
return (tree: Tree, context: SchematicContext) => {
|
|
30
80
|
addPackage(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
|
|
@@ -34,9 +84,11 @@ function upgradeThirdVersion(): Rule {
|
|
|
34
84
|
|
|
35
85
|
function finished(): Rule {
|
|
36
86
|
return (_tree: Tree, context: SchematicContext) => {
|
|
87
|
+
context.addTask(new NodePackageInstallTask());
|
|
88
|
+
|
|
37
89
|
context.logger.info(
|
|
38
90
|
colors.green(
|
|
39
|
-
` ✓
|
|
91
|
+
` ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2174`
|
|
40
92
|
)
|
|
41
93
|
);
|
|
42
94
|
};
|
|
@@ -46,6 +98,14 @@ export function v13Rule(): Rule {
|
|
|
46
98
|
return async (tree: Tree, context: SchematicContext) => {
|
|
47
99
|
logStart(context, `Upgrade @delon/* version number`);
|
|
48
100
|
UpgradeMainVersions(tree);
|
|
49
|
-
return chain([
|
|
101
|
+
return chain([
|
|
102
|
+
removeIE(),
|
|
103
|
+
addStylePreprocessorOptions(),
|
|
104
|
+
fixLessResolver(),
|
|
105
|
+
upgradeKarmaCoverage(),
|
|
106
|
+
upgradeThirdVersion(),
|
|
107
|
+
addYarn(context),
|
|
108
|
+
finished()
|
|
109
|
+
]);
|
|
50
110
|
};
|
|
51
111
|
}
|
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 = '^13.0.0
|
|
4
|
+
exports.VERSION = '^13.0.0';
|
|
5
5
|
exports.ZORROVERSION = '^13.0.0';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^13.0.0
|
|
1
|
+
export const VERSION = '^13.0.0';
|
|
2
2
|
export const ZORROVERSION = '^13.0.0';
|
package/utils/versions.js
CHANGED
|
@@ -21,7 +21,6 @@ const workspace_2 = require("./workspace");
|
|
|
21
21
|
function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
22
22
|
(0, package_1.addPackage)(tree, ['abc', 'acl', 'auth', 'cache', 'form', 'mock', 'theme', 'util', 'chart'].map(name => `@delon/${name}@${version}`));
|
|
23
23
|
(0, package_1.addPackage)(tree, [
|
|
24
|
-
`ng-zorro-antd@^13.0.0`,
|
|
25
24
|
`@angular-eslint/builder@~13.0.1`,
|
|
26
25
|
`@angular-eslint/eslint-plugin@~13.0.1`,
|
|
27
26
|
`@angular-eslint/eslint-plugin-template@~13.0.1`,
|
|
@@ -43,7 +42,11 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
|
43
42
|
`@angular/language-service@~13.1.1`,
|
|
44
43
|
`@delon/testing@${version}`
|
|
45
44
|
], 'devDependencies');
|
|
46
|
-
(0, package_1.addPackage)(tree, [
|
|
45
|
+
(0, package_1.addPackage)(tree, [
|
|
46
|
+
`ng-zorro-antd@^13.0.0`,
|
|
47
|
+
'ajv@^8.8.2',
|
|
48
|
+
'ajv-formats@^2.1.1'
|
|
49
|
+
]);
|
|
47
50
|
}
|
|
48
51
|
exports.UpgradeMainVersions = UpgradeMainVersions;
|
|
49
52
|
function addESLintRule(context, showLog = true) {
|
package/utils/versions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE,+CAA+C;QAC/C,qDAAqD;QACrD,8DAA8D;QAC9D,kDAAkD;QAClD,uDAAuD;QACvD,wDAAwD;QACxD,iDAAiD;QACjD,8BAA8B;QAC9B,8CAA8C;QAC9C,4CAA4C;QAC5C,2CAA2C;QAC3C,kDAAkD;QAClD,8CAA8C;QAC9C,gCAAgC;QAChC,6BAA6B;QAC7B,YAAY,OAAO,EAAE;QACrB,6CAA6C;QAC7C,2CAA2C;QAC3C,iDAAiD;QACjD,kBAAkB,OAAO,EAAE;KAC5B,EACD,iBAAiB,CAClB,CAAC;IACF,IAAA,oBAAU,EAAC,IAAI,EAAE;QACf,qCAAqC;QACrC,2BAA2B;QAC3B,mCAAmC;KACpC,CAAC,CAAC;AACL,CAAC;AApCD,kDAoCC;AAED,SAAgB,aAAa,CAAC,OAAyB,EAAE,UAAmB,IAAI;IAC9E,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,EAAE;gBAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;aAC3C;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,EAAE;gBACrC,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE;oBACP,gBAAgB,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;iBACnD;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,IAAA,aAAO,EAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;SACxD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,sCAiBC"}
|
package/utils/versions.ts
CHANGED
|
@@ -17,7 +17,6 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
17
17
|
addPackage(
|
|
18
18
|
tree,
|
|
19
19
|
[
|
|
20
|
-
`ng-zorro-antd@^13.0.0`,
|
|
21
20
|
`@angular-eslint/builder@~13.0.1`,
|
|
22
21
|
`@angular-eslint/eslint-plugin@~13.0.1`,
|
|
23
22
|
`@angular-eslint/eslint-plugin-template@~13.0.1`,
|
|
@@ -41,7 +40,11 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
41
40
|
],
|
|
42
41
|
'devDependencies'
|
|
43
42
|
);
|
|
44
|
-
addPackage(tree, [
|
|
43
|
+
addPackage(tree, [
|
|
44
|
+
`ng-zorro-antd@^13.0.0`,
|
|
45
|
+
'ajv@^8.8.2',
|
|
46
|
+
'ajv-formats@^2.1.1'
|
|
47
|
+
]);
|
|
45
48
|
}
|
|
46
49
|
|
|
47
50
|
export function addESLintRule(context: SchematicContext, showLog: Boolean = true): Rule {
|
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.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.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;
|
|
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");
|
|
@@ -127,4 +127,23 @@ function getProjectTarget(project, buildTarget, type = 'options') {
|
|
|
127
127
|
return options;
|
|
128
128
|
}
|
|
129
129
|
exports.getProjectTarget = getProjectTarget;
|
|
130
|
+
function addStylePreprocessorOptionsToAllProject(workspace) {
|
|
131
|
+
workspace.projects.forEach(project => {
|
|
132
|
+
var _a;
|
|
133
|
+
const build = project.targets.get(exports.BUILD_TARGET_BUILD);
|
|
134
|
+
if (build == null || build.options == null)
|
|
135
|
+
return;
|
|
136
|
+
if (build.options.stylePreprocessorOptions == null) {
|
|
137
|
+
build.options.stylePreprocessorOptions = {};
|
|
138
|
+
}
|
|
139
|
+
let includePaths = (_a = build.options.stylePreprocessorOptions['includePaths']) !== null && _a !== void 0 ? _a : [];
|
|
140
|
+
if (!Array.isArray(includePaths))
|
|
141
|
+
includePaths = [];
|
|
142
|
+
if (includePaths.includes(`node_modules/`))
|
|
143
|
+
return;
|
|
144
|
+
includePaths.push(`node_modules/`);
|
|
145
|
+
build.options.stylePreprocessorOptions['includePaths'] = includePaths;
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
exports.addStylePreprocessorOptionsToAllProject = addStylePreprocessorOptionsToAllProject;
|
|
130
149
|
//# sourceMappingURL=workspace.js.map
|
package/utils/workspace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":"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"}
|
package/utils/workspace.ts
CHANGED
|
@@ -150,3 +150,18 @@ export function getProjectTarget(
|
|
|
150
150
|
|
|
151
151
|
return options;
|
|
152
152
|
}
|
|
153
|
+
|
|
154
|
+
export function addStylePreprocessorOptionsToAllProject(workspace: WorkspaceDefinition): void {
|
|
155
|
+
workspace.projects.forEach(project => {
|
|
156
|
+
const build = project.targets.get(BUILD_TARGET_BUILD);
|
|
157
|
+
if (build == null || build.options == null) return;
|
|
158
|
+
if (build.options.stylePreprocessorOptions == null) {
|
|
159
|
+
build.options.stylePreprocessorOptions = {};
|
|
160
|
+
}
|
|
161
|
+
let includePaths: string[] = build.options.stylePreprocessorOptions['includePaths'] ?? [];
|
|
162
|
+
if (!Array.isArray(includePaths)) includePaths = [];
|
|
163
|
+
if (includePaths.includes(`node_modules/`)) return;
|
|
164
|
+
includePaths.push(`node_modules/`);
|
|
165
|
+
build.options.stylePreprocessorOptions['includePaths'] = includePaths;
|
|
166
|
+
});
|
|
167
|
+
}
|