ng-alain 18.3.0 → 19.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/root/.nvmrc +1 -1
- package/application/files/root/.stylelintrc.js +1 -0
- package/application/files/root/.vscode/settings.json +3 -0
- package/application/files/src/app/app.component.ts +1 -2
- package/application/files/src/app/core/net/refresh-token.ts +9 -8
- package/application/files/src/app/layout/basic/basic.component.ts +4 -5
- package/application/files/src/app/layout/basic/widgets/clear-storage.component.ts +0 -1
- package/application/files/src/app/layout/basic/widgets/fullscreen.component.ts +0 -1
- package/application/files/src/app/layout/basic/widgets/i18n.component.ts +0 -1
- package/application/files/src/app/layout/basic/widgets/search.component.ts +1 -3
- package/application/files/src/app/layout/basic/widgets/user.component.ts +0 -1
- package/application/files/src/app/layout/blank/blank.component.ts +0 -1
- package/application/files/src/app/layout/passport/passport.component.ts +0 -1
- package/application/files/src/app/routes/dashboard/dashboard.component.ts +0 -1
- package/application/files/src/app/routes/exception/exception.component.ts +0 -1
- package/application/files/src/app/routes/exception/trigger.component.ts +0 -1
- package/application/files/src/app/routes/passport/lock/lock.component.ts +0 -1
- package/application/files/src/app/routes/passport/login/login.component.ts +0 -1
- package/application/files/src/app/routes/passport/register/register.component.ts +0 -1
- package/application/files/src/app/routes/passport/register-result/register-result.component.ts +0 -1
- package/application/files/src/app/shared/index.ts +0 -1
- package/application/files/src/app/shared/json-schema/test/test.widget.ts +0 -1
- package/application/files/src/app/shared/shared-imports.ts +5 -2
- package/application/index.js +6 -6
- package/application/index.js.map +1 -1
- package/application/index.ts +7 -7
- package/docs/plugin.en-US.md +7 -7
- package/docs/plugin.zh-CN.md +7 -7
- package/edit/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +0 -1
- package/empty/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +0 -1
- package/empty/index.spec.ts +1 -1
- package/list/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +0 -1
- package/list/index.spec.ts +1 -1
- package/migration.json +4 -4
- package/module/index.spec.ts +1 -1
- package/ng-add/index.js +3 -3
- package/ng-add/index.js.map +1 -1
- package/ng-add/index.ts +4 -4
- package/ng-update/data/attribute-selectors.js +1 -1
- package/ng-update/data/attribute-selectors.ts +1 -1
- package/ng-update/data/class-names.js +1 -1
- package/ng-update/data/class-names.ts +1 -1
- package/ng-update/data/constructor-checks.js +1 -1
- package/ng-update/data/constructor-checks.ts +1 -1
- package/ng-update/data/css-selectors.js +1 -1
- package/ng-update/data/css-selectors.ts +1 -1
- package/ng-update/data/css-tokens.js +1 -1
- package/ng-update/data/css-tokens.ts +1 -1
- package/ng-update/data/element-selectors.js +1 -1
- package/ng-update/data/element-selectors.ts +1 -1
- package/ng-update/data/input-names.js +1 -1
- package/ng-update/data/input-names.ts +1 -1
- package/ng-update/data/method-call-checks.js +1 -1
- package/ng-update/data/method-call-checks.ts +1 -1
- package/ng-update/data/output-names.js +1 -1
- package/ng-update/data/output-names.ts +1 -1
- package/ng-update/data/property-names.js +1 -1
- package/ng-update/data/property-names.ts +1 -1
- package/ng-update/index.js +4 -4
- package/ng-update/index.ts +3 -3
- package/ng-update/upgrade-rules/{V18 → V19}/index.js +26 -5
- package/ng-update/upgrade-rules/V19/index.js.map +1 -0
- package/ng-update/upgrade-rules/V19/index.spec.ts +34 -0
- package/ng-update/upgrade-rules/V19/index.ts +47 -0
- package/package.json +2 -2
- package/plugin/files/rtl/layout/basic/widgets/rtl.component.ts +0 -1
- package/plugin/files/sts/swagger-list/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +0 -1
- package/plugin/plugin.code-style.js.map +1 -1
- package/plugin/plugin.code-style.ts +1 -1
- package/plugin/plugin.icon.js +2 -2
- package/plugin/plugin.icon.js.map +1 -1
- package/plugin/plugin.icon.spec.ts +3 -0
- package/plugin/plugin.icon.ts +2 -2
- package/sta/index.js +1 -1
- package/sta/index.js.map +1 -1
- package/sta/index.ts +4 -4
- package/tpl/index.spec.ts +1 -1
- package/utils/alain.spec.ts +1 -1
- package/utils/ast.spec.ts +0 -1
- package/utils/lib-versions.js +2 -2
- package/utils/lib-versions.ts +2 -2
- package/utils/versions.js +16 -16
- package/utils/versions.ts +16 -16
- package/view/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +0 -1
- package/ng-update/upgrade-rules/V18/index.js.map +0 -1
- package/ng-update/upgrade-rules/V18/index.spec.ts +0 -42
- package/ng-update/upgrade-rules/V18/index.ts +0 -25
- package/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.js +0 -22
- package/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.js.map +0 -1
- package/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.ts +0 -24
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.cssSelectors = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.cssSelectors = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=css-selectors.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.cssTokens = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.cssTokens = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=css-tokens.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.elementSelectors = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.elementSelectors = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=element-selectors.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.inputNames = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.inputNames = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=input-names.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.methodCallChecks = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.methodCallChecks = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=method-call-checks.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.outputNames = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.outputNames = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=output-names.js.map
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.propertyNames = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
5
|
exports.propertyNames = {
|
|
6
|
-
[schematics_1.TargetVersion.
|
|
6
|
+
[schematics_1.TargetVersion.V19]: []
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=property-names.js.map
|
package/ng-update/index.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.updateToV19 = updateToV19;
|
|
4
4
|
exports.postUpdate = postUpdate;
|
|
5
5
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
6
6
|
const schematics_2 = require("@angular-devkit/schematics");
|
|
7
7
|
const upgrade_data_1 = require("./upgrade-data");
|
|
8
|
-
const
|
|
8
|
+
const V19_1 = require("./upgrade-rules/V19");
|
|
9
9
|
const migrations = [];
|
|
10
|
-
function
|
|
11
|
-
return (0, schematics_2.chain)([(0,
|
|
10
|
+
function updateToV19() {
|
|
11
|
+
return (0, schematics_2.chain)([(0, V19_1.v19Rule)(), (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V19, migrations, upgrade_data_1.ruleUpgradeData, postUpdate)]);
|
|
12
12
|
}
|
|
13
13
|
/** Post-update schematic to be called when update is finished. */
|
|
14
14
|
function postUpdate(context, targetVersion, hasFailures) {
|
package/ng-update/index.ts
CHANGED
|
@@ -3,12 +3,12 @@ import { createMigrationSchematicRule, NullableDevkitMigration, TargetVersion }
|
|
|
3
3
|
import { chain, Rule, SchematicContext } from '@angular-devkit/schematics';
|
|
4
4
|
|
|
5
5
|
import { ruleUpgradeData } from './upgrade-data';
|
|
6
|
-
import {
|
|
6
|
+
import { v19Rule } from './upgrade-rules/V19';
|
|
7
7
|
|
|
8
8
|
const migrations: NullableDevkitMigration[] = [];
|
|
9
9
|
|
|
10
|
-
export function
|
|
11
|
-
return chain([
|
|
10
|
+
export function updateToV19(): Rule {
|
|
11
|
+
return chain([v19Rule(), createMigrationSchematicRule(TargetVersion.V19, migrations, ruleUpgradeData, postUpdate)]);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
/** Post-update schematic to be called when update is finished. */
|
|
@@ -9,23 +9,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.v19Rule = v19Rule;
|
|
13
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
14
14
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
15
15
|
const utils_1 = require("../../../utils");
|
|
16
16
|
const versions_1 = require("../../../utils/versions");
|
|
17
|
-
|
|
17
|
+
function addDPVNU() {
|
|
18
|
+
return (tree) => {
|
|
19
|
+
const filePath = '.stylelintrc.js';
|
|
20
|
+
const content = tree.read(filePath);
|
|
21
|
+
if (!content) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
let contentStr = content.toString('utf-8');
|
|
25
|
+
if (contentStr.includes('declaration-property-value-no-unknown')) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
// 在 'order/order' 之前插入 'declaration-property-value-no-unknown': null,
|
|
29
|
+
const findContent = ` 'order/order'`;
|
|
30
|
+
const idx = contentStr.indexOf(findContent.trim());
|
|
31
|
+
if (idx === -1) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const insertContent = ` 'declaration-property-value-no-unknown': null,\n`;
|
|
35
|
+
contentStr = contentStr.replace(findContent, `${insertContent}${findContent}`);
|
|
36
|
+
tree.overwrite(filePath, contentStr);
|
|
37
|
+
};
|
|
38
|
+
}
|
|
18
39
|
function finished() {
|
|
19
40
|
return (_tree, context) => {
|
|
20
41
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
21
|
-
(0, utils_1.logFinished)(context, `Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/
|
|
42
|
+
(0, utils_1.logFinished)(context, `Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2547`);
|
|
22
43
|
};
|
|
23
44
|
}
|
|
24
|
-
function
|
|
45
|
+
function v19Rule() {
|
|
25
46
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
26
47
|
(0, versions_1.UpgradeMainVersions)(tree);
|
|
27
48
|
(0, utils_1.logInfo)(context, `Upgrade dependency version number`);
|
|
28
|
-
return (0, schematics_1.chain)([(
|
|
49
|
+
return (0, schematics_1.chain)([addDPVNU(), finished()]);
|
|
29
50
|
});
|
|
30
51
|
}
|
|
31
52
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/V19/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAwCA,0BAMC;AA9CD,2DAAiF;AACjF,4DAA0E;AAE1E,0CAAsD;AACtD,sDAA8D;AAE9D,SAAS,QAAQ;IACf,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,iBAAiB,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,IAAI,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,UAAU,CAAC,QAAQ,CAAC,uCAAuC,CAAC,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QACD,sEAAsE;QACtE,MAAM,WAAW,GAAG,mBAAmB,CAAC;QACxC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,MAAM,aAAa,GAAG,sDAAsD,CAAC;QAC7E,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACvC,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,IAAA,mBAAW,EACT,OAAO,EACP,mHAAmH,CACpH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,OAAO;IACrB,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAA,8BAAmB,EAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,eAAO,EAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;QACtD,OAAO,IAAA,kBAAK,EAAC,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC,CAAA,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
|
|
2
|
+
|
|
3
|
+
import { tryAddFile } from '../../../utils';
|
|
4
|
+
import { createAlainApp, migrationCollection } from '../../../utils/testing';
|
|
5
|
+
|
|
6
|
+
describe('Schematic: ng-update: v19Rule', () => {
|
|
7
|
+
let runner: SchematicTestRunner;
|
|
8
|
+
let tree: UnitTestTree;
|
|
9
|
+
const logs: string[] = [];
|
|
10
|
+
|
|
11
|
+
beforeEach(async () => {
|
|
12
|
+
({ runner, tree } = await createAlainApp());
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
async function runMigration(): Promise<void> {
|
|
16
|
+
logs.length = 0;
|
|
17
|
+
runner = new SchematicTestRunner('schematics', migrationCollection);
|
|
18
|
+
runner.logger.subscribe(e => logs.push(e.message));
|
|
19
|
+
await runner.runSchematic('migration-v19', {}, tree);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
it('add declaration-property-value-no-unknown', async () => {
|
|
23
|
+
const filePath = '/.stylelintrc.js';
|
|
24
|
+
tryAddFile(
|
|
25
|
+
tree,
|
|
26
|
+
filePath,
|
|
27
|
+
` 'media-query-no-invalid': null,
|
|
28
|
+
'order/order': [`
|
|
29
|
+
);
|
|
30
|
+
await runMigration();
|
|
31
|
+
const content = tree.readContent(filePath);
|
|
32
|
+
expect(content).toContain(`declaration-property-value-no-unknown`);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
|
+
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
3
|
+
|
|
4
|
+
import { logFinished, logInfo } from '../../../utils';
|
|
5
|
+
import { UpgradeMainVersions } from '../../../utils/versions';
|
|
6
|
+
|
|
7
|
+
function addDPVNU() {
|
|
8
|
+
return (tree: Tree) => {
|
|
9
|
+
const filePath = '.stylelintrc.js';
|
|
10
|
+
const content = tree.read(filePath);
|
|
11
|
+
if (!content) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
let contentStr = content.toString('utf-8');
|
|
15
|
+
if (contentStr.includes('declaration-property-value-no-unknown')) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
// 在 'order/order' 之前插入 'declaration-property-value-no-unknown': null,
|
|
19
|
+
const findContent = ` 'order/order'`;
|
|
20
|
+
const idx = contentStr.indexOf(findContent.trim());
|
|
21
|
+
if (idx === -1) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const insertContent = ` 'declaration-property-value-no-unknown': null,\n`;
|
|
25
|
+
contentStr = contentStr.replace(findContent, `${insertContent}${findContent}`);
|
|
26
|
+
tree.overwrite(filePath, contentStr);
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function finished(): Rule {
|
|
31
|
+
return (_tree: Tree, context: SchematicContext) => {
|
|
32
|
+
context.addTask(new NodePackageInstallTask());
|
|
33
|
+
|
|
34
|
+
logFinished(
|
|
35
|
+
context,
|
|
36
|
+
`Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2547`
|
|
37
|
+
);
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function v19Rule(): Rule {
|
|
42
|
+
return async (tree: Tree, context: SchematicContext) => {
|
|
43
|
+
UpgradeMainVersions(tree);
|
|
44
|
+
logInfo(context, `Upgrade dependency version number`);
|
|
45
|
+
return chain([addDPVNU(), finished()]);
|
|
46
|
+
};
|
|
47
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ng-alain",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "19.0.0",
|
|
4
4
|
"description": "Schematics specific to ng-alain",
|
|
5
5
|
"author": "cipchk<cipchk@qq.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"swagger-typescript-api": "^12.0.4",
|
|
26
26
|
"ng-alain-sts": "^0.0.2",
|
|
27
27
|
"ng-alain-plugin-theme": "^18.0.0",
|
|
28
|
-
"@angular/cdk": "^
|
|
28
|
+
"@angular/cdk": "^19.1.0"
|
|
29
29
|
},
|
|
30
30
|
"ng-update": {
|
|
31
31
|
"migrations": "./migration.json",
|
|
@@ -6,7 +6,6 @@ import { SHARED_IMPORTS } from '@shared';<%}%>
|
|
|
6
6
|
|
|
7
7
|
@Component({
|
|
8
8
|
selector: '<%= selector %>',<% if(standalone) {%>
|
|
9
|
-
standalone: true,
|
|
10
9
|
imports: [...SHARED_IMPORTS],<%}%>
|
|
11
10
|
templateUrl: './<%= dasherize(name) %>.component.html',<% if(!inlineStyle) { %><% } else { %>
|
|
12
11
|
styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.code-style.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.code-style.ts"],"names":[],"mappings":";;AAMA,0CAaC;AAjBD,oCAAqD;
|
|
1
|
+
{"version":3,"file":"plugin.code-style.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.code-style.ts"],"names":[],"mappings":";;AAMA,0CAaC;AAjBD,oCAAqD;AAErD,oDAAsE;AAEtE,SAAgB,eAAe,CAAC,OAAsB;IACpD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,IAAI,IAAI;YAAE,OAAO;QAEzB,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,wBAAW,CAAC,GAAG,+BAAkB,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,wBAAW,CAAC,CAAC;QAC3B,CAAC;QAED,IAAA,oBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Rule, Tree } from '@angular-devkit/schematics';
|
|
2
2
|
|
|
3
3
|
import { readPackage, writePackage } from '../utils';
|
|
4
|
-
import { LINT_STAGED, LINT_STAGED_CONFIG } from '../utils/code-style';
|
|
5
4
|
import { PluginOptions } from './interface';
|
|
5
|
+
import { LINT_STAGED, LINT_STAGED_CONFIG } from '../utils/code-style';
|
|
6
6
|
|
|
7
7
|
export function pluginCodeStyle(options: PluginOptions): Rule {
|
|
8
8
|
return (tree: Tree) => {
|
package/plugin/plugin.icon.js
CHANGED
|
@@ -110,7 +110,7 @@ function genByClass(node) {
|
|
|
110
110
|
return match[0];
|
|
111
111
|
}
|
|
112
112
|
function genByComp(node) {
|
|
113
|
-
if (!node.attrs.find(attr => attr.name === 'nz-icon'))
|
|
113
|
+
if (node.nodeName != 'nz-icon' && !node.attrs.find(attr => attr.name === 'nz-icon'))
|
|
114
114
|
return null;
|
|
115
115
|
const type = node.attrs.find(attr => ['type', '[type]', 'nztype', '[nztype]'].includes(attr.name));
|
|
116
116
|
if (!type)
|
|
@@ -142,7 +142,7 @@ function getNgValue(attr) {
|
|
|
142
142
|
const str = attr.value.trim();
|
|
143
143
|
const templatVarIndex = str.indexOf('{{');
|
|
144
144
|
if (templatVarIndex === -1) {
|
|
145
|
-
// <
|
|
145
|
+
// <nz-icon [nzType]="d.status === 'NORMAL' ? 'close1' : 'close2'"></i>
|
|
146
146
|
const conMatch = /\? ['"]([^'"]+)['"] : ['"]([^'"]+)['"]/g.exec(str);
|
|
147
147
|
if (conMatch != null && conMatch.length === 3) {
|
|
148
148
|
return [conMatch[1], conMatch[2]];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.icon.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.icon.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.icon.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.icon.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ const testCases: Record<string, string> = {
|
|
|
35
35
|
<i nz-icon nzType="step-backward" theme="fill"></i>
|
|
36
36
|
<i nz-icon nzType="nz-step-a" nzTheme="fill"></i>
|
|
37
37
|
<i nz-icon nzType="up-circle" theme="twotone"></i>
|
|
38
|
+
<nz-icon nzType="up-circle2" />
|
|
38
39
|
<nz-input-group [nzAddOnBeforeIcon]="focus ? 'anticon anticon-arrow-down' : 'anticon anticon-search'"></nz-input-group>
|
|
39
40
|
\`
|
|
40
41
|
})
|
|
@@ -93,5 +94,7 @@ describe('NgAlainSchematic: plugin: icon', () => {
|
|
|
93
94
|
// <i nz-icon [nzType]="d.status === 'NORMAL' ? 'close1' : 'close2'"></i>
|
|
94
95
|
expect(content).toContain(`Close1Outline`);
|
|
95
96
|
expect(content).toContain(`Close2Outline`);
|
|
97
|
+
// <nz-icon nzType="up-circle" theme="twotone" />
|
|
98
|
+
expect(content).toContain(`UpCircle2Outline`);
|
|
96
99
|
});
|
|
97
100
|
});
|
package/plugin/plugin.icon.ts
CHANGED
|
@@ -115,7 +115,7 @@ function genByClass(node: Element): string | null {
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
function genByComp(node: Element): string[] | null {
|
|
118
|
-
if (!node.attrs.find(attr => attr.name === 'nz-icon')) return null;
|
|
118
|
+
if (node.nodeName != 'nz-icon' && !node.attrs.find(attr => attr.name === 'nz-icon')) return null;
|
|
119
119
|
|
|
120
120
|
const type = node.attrs.find(attr => ['type', '[type]', 'nztype', '[nztype]'].includes(attr.name));
|
|
121
121
|
if (!type) return null;
|
|
@@ -150,7 +150,7 @@ function getNgValue(attr: Attribute): string[] | null {
|
|
|
150
150
|
const templatVarIndex = str.indexOf('{{');
|
|
151
151
|
|
|
152
152
|
if (templatVarIndex === -1) {
|
|
153
|
-
// <
|
|
153
|
+
// <nz-icon [nzType]="d.status === 'NORMAL' ? 'close1' : 'close2'"></i>
|
|
154
154
|
const conMatch = /\? ['"]([^'"]+)['"] : ['"]([^'"]+)['"]/g.exec(str);
|
|
155
155
|
if (conMatch != null && conMatch.length === 3) {
|
|
156
156
|
return [conMatch[1], conMatch[2]];
|
package/sta/index.js
CHANGED
package/sta/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;;;;;;;AA6OvD,4BAoBC;AA/PD,+CAAiD;AAEjD,2DAAsG;AACtG,sCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":"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"}
|
package/sta/index.ts
CHANGED
|
@@ -4,15 +4,15 @@ import { normalize } from '@angular-devkit/core';
|
|
|
4
4
|
import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
|
|
5
5
|
import { Rule, SchematicsException, Tree, chain, SchematicContext } from '@angular-devkit/schematics';
|
|
6
6
|
import * as colors from 'ansi-colors';
|
|
7
|
-
import {
|
|
7
|
+
import { rmSync, mkdirSync, existsSync, readFileSync } from 'fs';
|
|
8
8
|
import { parse } from 'jsonc-parser';
|
|
9
9
|
import { resolve, join } from 'path';
|
|
10
10
|
import { generateApi, GenerateApiOutput, GenerateApiParams } from 'swagger-typescript-api';
|
|
11
11
|
|
|
12
|
-
import { ModifyJSONParam, modifyJSON, readJSON, writeJSON } from '../utils/json';
|
|
13
|
-
import { getProject, isMulitProject } from '../utils/workspace';
|
|
14
12
|
import { Schema } from './schema';
|
|
15
13
|
import { STAConfig } from './types';
|
|
14
|
+
import { modifyJSON } from '../utils/json';
|
|
15
|
+
import { getProject, isMulitProject } from '../utils/workspace';
|
|
16
16
|
|
|
17
17
|
let project: ProjectDefinition;
|
|
18
18
|
let projectName: string;
|
|
@@ -47,7 +47,7 @@ function addPathInTsConfig(name: string): Rule {
|
|
|
47
47
|
|
|
48
48
|
function cleanOutput(p: string): void {
|
|
49
49
|
try {
|
|
50
|
-
|
|
50
|
+
rmSync(p, { recursive: true });
|
|
51
51
|
mkdirSync(p);
|
|
52
52
|
} catch (e) {}
|
|
53
53
|
}
|
package/tpl/index.spec.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
|
|
2
2
|
import * as fs from 'fs';
|
|
3
3
|
|
|
4
|
-
import { NzSafeAny } from 'ng-zorro-antd/core/types';
|
|
4
|
+
import type { NzSafeAny } from 'ng-zorro-antd/core/types';
|
|
5
5
|
|
|
6
6
|
import { createAlainAndModuleApp } from '../utils/testing';
|
|
7
7
|
|
package/utils/alain.spec.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
|
|
2
2
|
|
|
3
|
-
import { createAlainAndModuleApp } from '../utils/testing';
|
|
4
3
|
import { addValueToVariable, CommonSchema } from './alain';
|
|
4
|
+
import { createAlainAndModuleApp } from '../utils/testing';
|
|
5
5
|
|
|
6
6
|
describe('Schematic: alain', () => {
|
|
7
7
|
let runner: SchematicTestRunner;
|
package/utils/ast.spec.ts
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 = '^
|
|
5
|
-
exports.ZORROVERSION = '^
|
|
4
|
+
exports.VERSION = '^19.0.0';
|
|
5
|
+
exports.ZORROVERSION = '^19.0.2';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^
|
|
2
|
-
export const ZORROVERSION = '^
|
|
1
|
+
export const VERSION = '^19.0.0';
|
|
2
|
+
export const ZORROVERSION = '^19.0.2';
|