ng-alain 12.4.1 → 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/clear-storage.component.ts +1 -1
- package/application/files/src/app/layout/basic/widgets/fullscreen.component.ts +5 -8
- package/application/files/src/app/layout/basic/widgets/i18n.component.ts +3 -0
- 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 +44 -43
- package/application/index.js.map +1 -1
- package/application/index.ts +11 -8
- package/application/schema.json +1 -1
- package/collection.json +2 -3
- package/curd/index.js +2 -2
- package/curd/index.js.map +1 -1
- package/curd/schema.json +34 -27
- package/docs/generate.en-US.md +7 -7
- package/docs/generate.zh-CN.md +7 -7
- package/docs/plugin.en-US.md +0 -13
- package/docs/plugin.zh-CN.md +0 -13
- package/edit/index.js +1 -1
- package/edit/index.js.map +1 -1
- package/edit/schema.json +2 -7
- package/empty/index.js +1 -1
- package/empty/index.js.map +1 -1
- package/empty/schema.json +2 -7
- package/list/index.js +1 -1
- package/list/index.js.map +1 -1
- package/list/schema.json +2 -7
- package/migration.json +5 -10
- package/module/index.js +18 -18
- package/module/index.js.map +1 -1
- package/module/schema.json +1 -1
- package/ng-add/index.js +24 -26
- package/ng-add/index.js.map +1 -1
- package/ng-add/index.spec.ts +13 -3
- package/ng-add/index.ts +19 -21
- package/ng-add/schema.json +1 -1
- 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/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 +8 -13
- package/ng-update/index.js.map +1 -1
- package/ng-update/index.ts +5 -10
- package/ng-update/upgrade-data.js +3 -1
- package/ng-update/upgrade-data.js.map +1 -1
- package/ng-update/upgrade-data.ts +3 -2
- package/ng-update/upgrade-rules/checks/_src-to-nz-image-rule.js +1 -1
- package/ng-update/upgrade-rules/checks/_src-to-nz-image-rule.js.map +1 -1
- package/ng-update/upgrade-rules/v12/index.js +32 -32
- package/ng-update/upgrade-rules/v12/index.js.map +1 -1
- package/ng-update/upgrade-rules/v12/index.ts +1 -5
- package/ng-update/upgrade-rules/v12/schema.json +1 -1
- package/ng-update/upgrade-rules/v13/index.js +100 -0
- package/ng-update/upgrade-rules/v13/index.js.map +1 -0
- package/ng-update/upgrade-rules/v13/index.spec.ts +39 -0
- package/ng-update/upgrade-rules/v13/index.ts +111 -0
- package/package.json +1 -1
- package/plugin/files/rtl/layout/basic/widgets/rtl.component.ts +1 -1
- package/plugin/index.js +10 -14
- package/plugin/index.js.map +1 -1
- package/plugin/index.ts +0 -4
- package/plugin/plugin.code-style.js +2 -2
- package/plugin/plugin.code-style.js.map +1 -1
- package/plugin/plugin.default-language.js +3 -3
- package/plugin/plugin.default-language.js.map +1 -1
- package/plugin/plugin.default-language.ts +1 -1
- package/plugin/plugin.docker.js +6 -6
- package/plugin/plugin.docker.js.map +1 -1
- package/plugin/plugin.icon.js +7 -7
- package/plugin/plugin.icon.js.map +1 -1
- package/plugin/plugin.icon.ts +2 -2
- package/plugin/plugin.rtl.js +11 -11
- package/plugin/plugin.rtl.js.map +1 -1
- package/plugin/plugin.sts.js +1 -1
- package/plugin/plugin.sts.js.map +1 -1
- package/plugin/schema.json +1 -1
- package/schema.json +10 -0
- package/sta/index.js +13 -13
- package/sta/index.js.map +1 -1
- package/sta/schema.json +1 -1
- package/tpl/index.js +2 -2
- package/tpl/index.js.map +1 -1
- package/tpl/index.ts +1 -1
- package/tpl/schema.json +3 -8
- package/utils/alain.js +17 -18
- package/utils/alain.js.map +1 -1
- package/utils/alain.ts +1 -2
- package/utils/file.js +2 -2
- package/utils/file.js.map +1 -1
- package/utils/html.js +1 -1
- package/utils/html.js.map +1 -1
- package/utils/json.js +1 -1
- package/utils/json.js.map +1 -1
- package/utils/lib-versions.js +2 -2
- package/utils/lib-versions.ts +2 -2
- package/utils/log.js +3 -3
- package/utils/log.js.map +1 -1
- package/utils/log.ts +3 -3
- package/utils/node.js +8 -0
- package/utils/node.js.map +1 -0
- package/utils/node.ts +3 -0
- package/utils/package.js +4 -4
- package/utils/package.js.map +1 -1
- package/utils/package.ts +2 -2
- package/utils/testing.js +3 -3
- package/utils/testing.js.map +1 -1
- package/utils/versions.js +24 -20
- package/utils/versions.js.map +1 -1
- package/utils/versions.ts +20 -16
- package/utils/workspace.js +25 -6
- package/utils/workspace.js.map +1 -1
- package/utils/workspace.ts +15 -0
- package/view/index.js +1 -1
- package/view/index.js.map +1 -1
- package/view/schema.json +2 -7
- package/ng-update/upgrade-rules/v11/files-tpl/main.js +0 -31
- package/ng-update/upgrade-rules/v11/files-tpl/main.js.map +0 -1
- package/ng-update/upgrade-rules/v11/files-tpl/main.ts +0 -28
- package/ng-update/upgrade-rules/v11/hmr.js +0 -103
- package/ng-update/upgrade-rules/v11/hmr.js.map +0 -1
- package/ng-update/upgrade-rules/v11/hmr.ts +0 -109
- package/ng-update/upgrade-rules/v11/index.js +0 -72
- package/ng-update/upgrade-rules/v11/index.js.map +0 -1
- package/ng-update/upgrade-rules/v11/index.spec.ts +0 -51
- package/ng-update/upgrade-rules/v11/index.ts +0 -80
- package/ng-update/upgrade-rules/v11/layout.js +0 -39
- package/ng-update/upgrade-rules/v11/layout.js.map +0 -1
- package/ng-update/upgrade-rules/v11/layout.ts +0 -47
- package/ng-update/upgrade-rules/v117/index.js +0 -82
- package/ng-update/upgrade-rules/v117/index.js.map +0 -1
- package/ng-update/upgrade-rules/v117/index.spec.ts +0 -58
- package/ng-update/upgrade-rules/v117/index.ts +0 -71
- package/plugin/files/ie/tsconfig-es5.app.js +0 -9
- package/plugin/files/ie/tsconfig-es5.app.js.map +0 -1
- package/plugin/files/ie/tsconfig-es5.spec.js +0 -9
- package/plugin/files/ie/tsconfig-es5.spec.js.map +0 -1
- package/plugin/plugin.ie.js +0 -128
- package/plugin/plugin.ie.js.map +0 -1
- package/plugin/plugin.ie.spec.ts +0 -35
- package/plugin/plugin.ie.ts +0 -144
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.v13Rule = void 0;
|
|
13
|
+
const color_1 = require("@angular/cli/utilities/color");
|
|
14
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
16
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
17
|
+
const utils_1 = require("../../../utils");
|
|
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
|
+
}
|
|
39
|
+
function removeIE() {
|
|
40
|
+
return (tree, context) => {
|
|
41
|
+
const pkg = (0, utils_1.readPackage)(tree);
|
|
42
|
+
if (pkg.scripts && !pkg.scripts['ie:start'])
|
|
43
|
+
return;
|
|
44
|
+
context.logger.warn(color_1.colors.yellow(`TIPS: Starting from NG-ALAIN 13 will no longer support IE`));
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
function addYarn(context) {
|
|
48
|
+
return (0, workspace_1.updateWorkspace)((workspace) => __awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
const cli = workspace.extensions.cli;
|
|
50
|
+
if (cli && cli.packageManager)
|
|
51
|
+
return;
|
|
52
|
+
if (cli == null)
|
|
53
|
+
workspace.extensions.cli = {};
|
|
54
|
+
workspace.extensions.cli['packageManager'] = 'yarn';
|
|
55
|
+
(0, utils_1.logStart)(context, `Configuration optimization using Yarn to install dependencies`);
|
|
56
|
+
}));
|
|
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
|
+
}
|
|
72
|
+
function upgradeThirdVersion() {
|
|
73
|
+
return (tree, context) => {
|
|
74
|
+
(0, utils_1.addPackage)(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
|
|
75
|
+
(0, utils_1.logStart)(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
function finished() {
|
|
79
|
+
return (_tree, 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`));
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
function v13Rule() {
|
|
85
|
+
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
86
|
+
(0, utils_1.logStart)(context, `Upgrade @delon/* version number`);
|
|
87
|
+
(0, versions_1.UpgradeMainVersions)(tree);
|
|
88
|
+
return (0, schematics_1.chain)([
|
|
89
|
+
removeIE(),
|
|
90
|
+
addStylePreprocessorOptions(),
|
|
91
|
+
fixLessResolver(),
|
|
92
|
+
upgradeKarmaCoverage(),
|
|
93
|
+
upgradeThirdVersion(),
|
|
94
|
+
addYarn(context),
|
|
95
|
+
finished()
|
|
96
|
+
]);
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
exports.v13Rule = v13Rule;
|
|
100
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
|
|
2
|
+
|
|
3
|
+
import { createAlainApp, migrationCollection } from '../../../utils/testing';
|
|
4
|
+
|
|
5
|
+
describe('Schematic: ng-update: v13Rule', () => {
|
|
6
|
+
let runner: SchematicTestRunner;
|
|
7
|
+
let tree: UnitTestTree;
|
|
8
|
+
const logs: string[] = [];
|
|
9
|
+
|
|
10
|
+
beforeEach(async () => {
|
|
11
|
+
({ runner, tree } = await createAlainApp());
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
async function runMigration(): Promise<void> {
|
|
15
|
+
logs.length = 0;
|
|
16
|
+
runner = new SchematicTestRunner('schematics', migrationCollection);
|
|
17
|
+
runner.logger.subscribe(e => logs.push(e.message));
|
|
18
|
+
await runner.runSchematicAsync('migration-v13', {}, tree).toPromise();
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
it(`should be working`, async () => {
|
|
22
|
+
tree.create(
|
|
23
|
+
`1.less`,
|
|
24
|
+
`@import '~@delon/theme/index';
|
|
25
|
+
@import '~ng-zorro-antd/';`
|
|
26
|
+
);
|
|
27
|
+
await runMigration();
|
|
28
|
+
const content = tree.readContent('angular.json');
|
|
29
|
+
expect(content).toContain(`stylePreprocessorOptions`);
|
|
30
|
+
expect(content).toContain(`"packageManager": "yarn"`);
|
|
31
|
+
expect(tree.readContent('1.less')).not.toContain(`@import '~@delon`);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it(`should be tips not support ie`, async () => {
|
|
35
|
+
tree.overwrite(`package.json`, JSON.stringify({ scripts: { 'ie:start': 'npm' } }));
|
|
36
|
+
await runMigration();
|
|
37
|
+
expect(logs.join('')).toContain(`TIPS: Starting from NG-ALAIN 13 will no longer support IE`);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { colors } from '@angular/cli/utilities/color';
|
|
2
|
+
|
|
3
|
+
import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
4
|
+
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
5
|
+
import { updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
6
|
+
|
|
7
|
+
import {
|
|
8
|
+
addPackage,
|
|
9
|
+
addStylePreprocessorOptionsToAllProject,
|
|
10
|
+
logStart,
|
|
11
|
+
readContent,
|
|
12
|
+
readPackage,
|
|
13
|
+
writePackage
|
|
14
|
+
} from '../../../utils';
|
|
15
|
+
import { UpgradeMainVersions } from '../../../utils/versions';
|
|
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
|
+
|
|
42
|
+
function removeIE(): Rule {
|
|
43
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
44
|
+
const pkg = readPackage(tree);
|
|
45
|
+
if (pkg.scripts && !pkg.scripts['ie:start']) return;
|
|
46
|
+
|
|
47
|
+
context.logger.warn(colors.yellow(`TIPS: Starting from NG-ALAIN 13 will no longer support IE`));
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function addYarn(context: SchematicContext): Rule {
|
|
52
|
+
return updateWorkspace(async workspace => {
|
|
53
|
+
const cli = workspace.extensions.cli as Record<string, unknown>;
|
|
54
|
+
if (cli && cli.packageManager) return;
|
|
55
|
+
if (cli == null) workspace.extensions.cli = {};
|
|
56
|
+
workspace.extensions.cli['packageManager'] = 'yarn';
|
|
57
|
+
logStart(context, `Configuration optimization using Yarn to install dependencies`);
|
|
58
|
+
});
|
|
59
|
+
}
|
|
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
|
+
|
|
78
|
+
function upgradeThirdVersion(): Rule {
|
|
79
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
80
|
+
addPackage(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
|
|
81
|
+
logStart(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function finished(): Rule {
|
|
86
|
+
return (_tree: Tree, context: SchematicContext) => {
|
|
87
|
+
context.addTask(new NodePackageInstallTask());
|
|
88
|
+
|
|
89
|
+
context.logger.info(
|
|
90
|
+
colors.green(
|
|
91
|
+
` ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2174`
|
|
92
|
+
)
|
|
93
|
+
);
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
export function v13Rule(): Rule {
|
|
98
|
+
return async (tree: Tree, context: SchematicContext) => {
|
|
99
|
+
logStart(context, `Upgrade @delon/* version number`);
|
|
100
|
+
UpgradeMainVersions(tree);
|
|
101
|
+
return chain([
|
|
102
|
+
removeIE(),
|
|
103
|
+
addStylePreprocessorOptions(),
|
|
104
|
+
fixLessResolver(),
|
|
105
|
+
upgradeKarmaCoverage(),
|
|
106
|
+
upgradeThirdVersion(),
|
|
107
|
+
addYarn(context),
|
|
108
|
+
finished()
|
|
109
|
+
]);
|
|
110
|
+
};
|
|
111
|
+
}
|
package/package.json
CHANGED
package/plugin/index.js
CHANGED
|
@@ -17,7 +17,6 @@ const plugin_code_style_1 = require("./plugin.code-style");
|
|
|
17
17
|
const plugin_default_language_1 = require("./plugin.default-language");
|
|
18
18
|
const plugin_docker_1 = require("./plugin.docker");
|
|
19
19
|
const plugin_icon_1 = require("./plugin.icon");
|
|
20
|
-
const plugin_ie_1 = require("./plugin.ie");
|
|
21
20
|
const plugin_network_env_1 = require("./plugin.network-env");
|
|
22
21
|
const plugin_rtl_1 = require("./plugin.rtl");
|
|
23
22
|
const plugin_sts_1 = require("./plugin.sts");
|
|
@@ -28,7 +27,7 @@ function installPackages() {
|
|
|
28
27
|
}
|
|
29
28
|
function default_1(options) {
|
|
30
29
|
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const res = yield utils_1.getProject(tree, options.project);
|
|
30
|
+
const res = yield (0, utils_1.getProject)(tree, options.project);
|
|
32
31
|
const project = res.project;
|
|
33
32
|
const pluginOptions = {
|
|
34
33
|
type: options.type,
|
|
@@ -41,36 +40,33 @@ function default_1(options) {
|
|
|
41
40
|
const rules = [];
|
|
42
41
|
switch (options.name) {
|
|
43
42
|
case 'codeStyle':
|
|
44
|
-
rules.push(plugin_code_style_1.pluginCodeStyle(pluginOptions), installPackages());
|
|
43
|
+
rules.push((0, plugin_code_style_1.pluginCodeStyle)(pluginOptions), installPackages());
|
|
45
44
|
break;
|
|
46
45
|
case 'networkEnv':
|
|
47
|
-
rules.push(plugin_network_env_1.pluginNetworkEnv(Object.assign(Object.assign({}, pluginOptions), { packageManager: options.packageManager })));
|
|
46
|
+
rules.push((0, plugin_network_env_1.pluginNetworkEnv)(Object.assign(Object.assign({}, pluginOptions), { packageManager: options.packageManager })));
|
|
48
47
|
break;
|
|
49
48
|
case 'docker':
|
|
50
|
-
rules.push(plugin_docker_1.pluginDocker(pluginOptions));
|
|
49
|
+
rules.push((0, plugin_docker_1.pluginDocker)(pluginOptions));
|
|
51
50
|
break;
|
|
52
51
|
case 'defaultLanguage':
|
|
53
|
-
rules.push(plugin_default_language_1.pluginDefaultLanguage(Object.assign(Object.assign({}, pluginOptions), { defaultLanguage: options.defaultLanguage })));
|
|
52
|
+
rules.push((0, plugin_default_language_1.pluginDefaultLanguage)(Object.assign(Object.assign({}, pluginOptions), { defaultLanguage: options.defaultLanguage })));
|
|
54
53
|
break;
|
|
55
54
|
case 'icon':
|
|
56
|
-
rules.push(plugin_icon_1.pluginIcon(pluginOptions));
|
|
55
|
+
rules.push((0, plugin_icon_1.pluginIcon)(pluginOptions));
|
|
57
56
|
break;
|
|
58
57
|
case 'sts':
|
|
59
|
-
rules.push(...plugin_sts_1.pluginSTS(pluginOptions));
|
|
60
|
-
break;
|
|
61
|
-
case 'ie':
|
|
62
|
-
rules.push(plugin_ie_1.pluginIE(pluginOptions));
|
|
58
|
+
rules.push(...(0, plugin_sts_1.pluginSTS)(pluginOptions));
|
|
63
59
|
break;
|
|
64
60
|
case 'rtl':
|
|
65
|
-
rules.push(plugin_rtl_1.pluginRTL(pluginOptions));
|
|
61
|
+
rules.push((0, plugin_rtl_1.pluginRTL)(pluginOptions));
|
|
66
62
|
break;
|
|
67
63
|
case 'asdf':
|
|
68
|
-
rules.push(plugin_asdf_1.pluginAsdf());
|
|
64
|
+
rules.push((0, plugin_asdf_1.pluginAsdf)());
|
|
69
65
|
break;
|
|
70
66
|
default:
|
|
71
67
|
throw new schematics_1.SchematicsException(`Could not find plugin name: ${options.name}`);
|
|
72
68
|
}
|
|
73
|
-
return schematics_1.chain(rules);
|
|
69
|
+
return (0, schematics_1.chain)(rules);
|
|
74
70
|
});
|
|
75
71
|
}
|
|
76
72
|
exports.default = default_1;
|
package/plugin/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/plugin/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAsG;AACtG,4DAA0E;AAE1E,oCAAsC;AAEtC,+CAA2C;AAC3C,2DAAsD;AACtD,uEAAkE;AAClE,mDAA+C;AAC/C,+CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/plugin/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAsG;AACtG,4DAA0E;AAE1E,oCAAsC;AAEtC,+CAA2C;AAC3C,2DAAsD;AACtD,uEAAkE;AAClE,mDAA+C;AAC/C,+CAA2C;AAC3C,6DAAwD;AACxD,6CAAyC;AACzC,6CAAyC;AAGzC,SAAS,eAAe;IACtB,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED,mBAAyB,OAAqB;IAC5C,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,IAAA,kBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,aAAa,GAAkB;YACnC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,aAAa,EAAE,OAAO,CAAC,MAAM;YAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,QAAQ,OAAO,CAAC,IAAI,EAAE;YACpB,KAAK,WAAW;gBACd,KAAK,CAAC,IAAI,CAAC,IAAA,mCAAe,EAAC,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;gBAC9D,MAAM;YACR,KAAK,YAAY;gBACf,KAAK,CAAC,IAAI,CAAC,IAAA,qCAAgB,kCAAM,aAAa,KAAE,cAAc,EAAE,OAAO,CAAC,cAAc,IAAG,CAAC,CAAC;gBAC3F,MAAM;YACR,KAAK,QAAQ;gBACX,KAAK,CAAC,IAAI,CAAC,IAAA,4BAAY,EAAC,aAAa,CAAC,CAAC,CAAC;gBACxC,MAAM;YACR,KAAK,iBAAiB;gBACpB,KAAK,CAAC,IAAI,CACR,IAAA,+CAAqB,kCAChB,aAAa,KAChB,eAAe,EAAE,OAAO,CAAC,eAAe,IACxC,CACH,CAAC;gBACF,MAAM;YACR,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,IAAA,wBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;gBACtC,MAAM;YACR,KAAK,KAAK;gBACR,KAAK,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,aAAa,CAAC,CAAC,CAAC;gBACxC,MAAM;YACR,KAAK,KAAK;gBACR,KAAK,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,aAAa,CAAC,CAAC,CAAC;gBACrC,MAAM;YACR,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,IAAA,wBAAU,GAAE,CAAC,CAAC;gBACzB,MAAM;YACR;gBACE,MAAM,IAAI,gCAAmB,CAAC,+BAA+B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SAChF;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC;AAlDD,4BAkDC"}
|
package/plugin/index.ts
CHANGED
|
@@ -8,7 +8,6 @@ import { pluginCodeStyle } from './plugin.code-style';
|
|
|
8
8
|
import { pluginDefaultLanguage } from './plugin.default-language';
|
|
9
9
|
import { pluginDocker } from './plugin.docker';
|
|
10
10
|
import { pluginIcon } from './plugin.icon';
|
|
11
|
-
import { pluginIE } from './plugin.ie';
|
|
12
11
|
import { pluginNetworkEnv } from './plugin.network-env';
|
|
13
12
|
import { pluginRTL } from './plugin.rtl';
|
|
14
13
|
import { pluginSTS } from './plugin.sts';
|
|
@@ -58,9 +57,6 @@ export default function (options: PluginSchema): Rule {
|
|
|
58
57
|
case 'sts':
|
|
59
58
|
rules.push(...pluginSTS(pluginOptions));
|
|
60
59
|
break;
|
|
61
|
-
case 'ie':
|
|
62
|
-
rules.push(pluginIE(pluginOptions));
|
|
63
|
-
break;
|
|
64
60
|
case 'rtl':
|
|
65
61
|
rules.push(pluginRTL(pluginOptions));
|
|
66
62
|
break;
|
|
@@ -5,7 +5,7 @@ const utils_1 = require("../utils");
|
|
|
5
5
|
const code_style_1 = require("../utils/code-style");
|
|
6
6
|
function pluginCodeStyle(options) {
|
|
7
7
|
return (tree) => {
|
|
8
|
-
const json = utils_1.readPackage(tree);
|
|
8
|
+
const json = (0, utils_1.readPackage)(tree);
|
|
9
9
|
if (json == null)
|
|
10
10
|
return;
|
|
11
11
|
if (options.type === 'add') {
|
|
@@ -14,7 +14,7 @@ function pluginCodeStyle(options) {
|
|
|
14
14
|
else {
|
|
15
15
|
delete json[code_style_1.LINT_STAGED];
|
|
16
16
|
}
|
|
17
|
-
utils_1.writePackage(tree, json);
|
|
17
|
+
(0, utils_1.writePackage)(tree, json);
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
exports.pluginCodeStyle = pluginCodeStyle;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.code-style.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.code-style.ts"],"names":[],"mappings":";;;AAEA,oCAAqD;AACrD,oDAAsE;AAGtE,SAAgB,eAAe,CAAC,OAAsB;IACpD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,IAAI,GAAG,mBAAW,
|
|
1
|
+
{"version":3,"file":"plugin.code-style.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.code-style.ts"],"names":[],"mappings":";;;AAEA,oCAAqD;AACrD,oDAAsE;AAGtE,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;YAC1B,IAAI,CAAC,wBAAW,CAAC,GAAG,+BAAkB,CAAC;SACxC;aAAM;YACL,OAAO,IAAI,CAAC,wBAAW,CAAC,CAAC;SAC1B;QAED,IAAA,oBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAbD,0CAaC"}
|
|
@@ -21,12 +21,12 @@ function pluginDefaultLanguage(options) {
|
|
|
21
21
|
if (options.defaultLanguage == null) {
|
|
22
22
|
throw new schematics_1.SchematicsException(`Must be specified the "defaultLanguage" parameter`);
|
|
23
23
|
}
|
|
24
|
-
const project = (yield utils_1.getProject(tree, options.project)).project;
|
|
24
|
+
const project = (yield (0, utils_1.getProject)(tree, options.project)).project;
|
|
25
25
|
const modulePath = `${project.sourceRoot}/app/app.module.ts`;
|
|
26
26
|
if (!tree.exists(modulePath)) {
|
|
27
27
|
throw new schematics_1.SchematicsException(`AppModule file (${modulePath}) not found`);
|
|
28
28
|
}
|
|
29
|
-
let content = tree.
|
|
29
|
+
let content = tree.read(modulePath).toString('utf-8');
|
|
30
30
|
const start = content.indexOf(`#region default language`);
|
|
31
31
|
if (start === -1) {
|
|
32
32
|
console.warn(`[#region default language] area not found`);
|
|
@@ -37,7 +37,7 @@ function pluginDefaultLanguage(options) {
|
|
|
37
37
|
if (oldLang === options.defaultLanguage) {
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
|
-
const targetLang = lang_config_1.getLangConfig(options.defaultLanguage);
|
|
40
|
+
const targetLang = (0, lang_config_1.getLangConfig)(options.defaultLanguage);
|
|
41
41
|
if (targetLang == null) {
|
|
42
42
|
console.warn(`Target language not supported, refer to https://ng-alain.com/cli/plugin#defaultLanguage`);
|
|
43
43
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.default-language.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.default-language.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAA6E;AAE7E,qDAAoD;AACpD,oCAAsC;AAGtC,SAAgB,qBAAqB,CAAC,OAAsB;IAC1D,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YAC1B,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;SAC1E;QACD,IAAI,OAAO,CAAC,eAAe,IAAI,IAAI,EAAE;YACnC,MAAM,IAAI,gCAAmB,CAAC,mDAAmD,CAAC,CAAC;SACpF;QACD,MAAM,OAAO,GAAG,CAAC,MAAM,kBAAU,
|
|
1
|
+
{"version":3,"file":"plugin.default-language.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.default-language.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAA6E;AAE7E,qDAAoD;AACpD,oCAAsC;AAGtC,SAAgB,qBAAqB,CAAC,OAAsB;IAC1D,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YAC1B,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;SAC1E;QACD,IAAI,OAAO,CAAC,eAAe,IAAI,IAAI,EAAE;YACnC,MAAM,IAAI,gCAAmB,CAAC,mDAAmD,CAAC,CAAC;SACpF;QACD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAA,kBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,UAAU,oBAAoB,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,gCAAmB,CAAC,mBAAmB,UAAU,aAAa,CAAC,CAAC;SAC3E;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;YAC1D,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,IAAI,OAAO,KAAK,OAAO,CAAC,eAAe,EAAE;YACvC,OAAO;SACR;QACD,MAAM,UAAU,GAAG,IAAA,2BAAa,EAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC1D,IAAI,UAAU,IAAI,IAAI,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,yFAAyF,CAAC,CAAC;YACxG,OAAO;SACR;QACD,OAAO,CAAC,GAAG,CAAC,6BAA6B,OAAO,SAAS,OAAO,CAAC,eAAe,GAAG,CAAC,CAAC;QACrF,UAAU;QACV,OAAO,GAAG,OAAO;aACd,OAAO,CAAC,oCAAoC,EAAE,2BAA2B,OAAO,CAAC,eAAe,EAAE,CAAC;aACnG,OAAO,CAAC,gBAAgB,EAAE,UAAU,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;QAClE,QAAQ;QACR,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,EAAE,YAAY,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9E,QAAQ;QACR,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,EAAE,iBAAiB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC;AAxCD,sDAwCC"}
|
|
@@ -17,7 +17,7 @@ export function pluginDefaultLanguage(options: PluginOptions): Rule {
|
|
|
17
17
|
if (!tree.exists(modulePath)) {
|
|
18
18
|
throw new SchematicsException(`AppModule file (${modulePath}) not found`);
|
|
19
19
|
}
|
|
20
|
-
let content = tree.
|
|
20
|
+
let content = tree.read(modulePath).toString('utf-8');
|
|
21
21
|
const start = content.indexOf(`#region default language`);
|
|
22
22
|
if (start === -1) {
|
|
23
23
|
console.warn(`[#region default language] area not found`);
|
package/plugin/plugin.docker.js
CHANGED
|
@@ -5,7 +5,7 @@ const utils_1 = require("../utils");
|
|
|
5
5
|
function setIgnore(tree, options) {
|
|
6
6
|
const filePath = `${options.root}/.dockerignore`;
|
|
7
7
|
if (options.type === 'add') {
|
|
8
|
-
utils_1.tryAddFile(tree, filePath, `node_modules
|
|
8
|
+
(0, utils_1.tryAddFile)(tree, filePath, `node_modules
|
|
9
9
|
npm-debug.log
|
|
10
10
|
Dockerfile*
|
|
11
11
|
docker-compose*
|
|
@@ -17,13 +17,13 @@ LICENSE
|
|
|
17
17
|
.vscode`);
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
|
-
utils_1.tryDelFile(tree, filePath);
|
|
20
|
+
(0, utils_1.tryDelFile)(tree, filePath);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
function setCompose(tree, options) {
|
|
24
24
|
const filePath = `${options.root}/docker-compose.yml`;
|
|
25
25
|
if (options.type === 'add') {
|
|
26
|
-
utils_1.tryAddFile(tree, filePath, `version: '2.1'
|
|
26
|
+
(0, utils_1.tryAddFile)(tree, filePath, `version: '2.1'
|
|
27
27
|
|
|
28
28
|
services:
|
|
29
29
|
${options.name}:
|
|
@@ -36,13 +36,13 @@ services:
|
|
|
36
36
|
`);
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
|
-
utils_1.tryDelFile(tree, filePath);
|
|
39
|
+
(0, utils_1.tryDelFile)(tree, filePath);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
function setDockerfile(tree, options) {
|
|
43
43
|
const filePath = `${options.root}/Dockerfile`;
|
|
44
44
|
if (options.type === 'add') {
|
|
45
|
-
utils_1.tryAddFile(tree, filePath, `# STEP 1: Build
|
|
45
|
+
(0, utils_1.tryAddFile)(tree, filePath, `# STEP 1: Build
|
|
46
46
|
FROM node:10 as builder
|
|
47
47
|
|
|
48
48
|
LABEL authors="cipchk <cipchk@qq.com>"
|
|
@@ -72,7 +72,7 @@ CMD [ "nginx", "-g", "daemon off;"]
|
|
|
72
72
|
`);
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
utils_1.tryDelFile(tree, filePath);
|
|
75
|
+
(0, utils_1.tryDelFile)(tree, filePath);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
function setNginx(tree, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.docker.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.docker.ts"],"names":[],"mappings":";;;AAEA,oCAAkD;AAGlD,SAAS,SAAS,CAAC,IAAU,EAAE,OAAsB;IACnD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,gBAAgB,CAAC;IACjD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;QAC1B,kBAAU,
|
|
1
|
+
{"version":3,"file":"plugin.docker.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.docker.ts"],"names":[],"mappings":";;;AAEA,oCAAkD;AAGlD,SAAS,SAAS,CAAC,IAAU,EAAE,OAAsB;IACnD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,gBAAgB,CAAC;IACjD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;QAC1B,IAAA,kBAAU,EACR,IAAI,EACJ,QAAQ,EACR;;;;;;;;;QASE,CACH,CAAC;KACH;SAAM;QACL,IAAA,kBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAsB;IACpD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,qBAAqB,CAAC;IACtD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;QAC1B,IAAA,kBAAU,EACR,IAAI,EACJ,QAAQ,EACR;;;IAGF,OAAO,CAAC,IAAI;aACH,OAAO,CAAC,IAAI;;;;;;CAMxB,CACI,CAAC;KACH;SAAM;QACL,IAAA,kBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAU,EAAE,OAAsB;IACvD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC;IAC9C,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;QAC1B,IAAA,kBAAU,EACR,IAAI,EACJ,QAAQ,EACR;;;;;;;;sBAQgB,OAAO,CAAC,IAAI,8BAA8B,OAAO,CAAC,IAAI;;WAEjE,OAAO,CAAC,IAAI;;;;;;;;;uBASA,OAAO,CAAC,IAAI;yBACV,OAAO,CAAC,IAAI;;;;uBAId,OAAO,CAAC,IAAI;;;CAGlC,CACI,CAAC;KACH;SAAM;QACL,IAAA,kBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAsB;IAClD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,sBAAsB,CAAC;IACvD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACpD,IAAI,CAAC,MAAM,CACT,QAAQ,EACR;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BL,CACI,CAAC;KACH;AACH,CAAC;AAED,SAAgB,YAAY,CAAC,OAAsB;IACjD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,iBAAiB;QACjB,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,oBAAoB;QACpB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,gBAAgB;QAChB,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,kBAAkB;QAClB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AAXD,oCAWC"}
|
package/plugin/plugin.icon.js
CHANGED
|
@@ -75,7 +75,7 @@ ATTRIBUTE_NAMES.forEach(key => {
|
|
|
75
75
|
});
|
|
76
76
|
function findIcons(html) {
|
|
77
77
|
const res = [];
|
|
78
|
-
const doc = parse5_1.parseFragment(html);
|
|
78
|
+
const doc = (0, parse5_1.parseFragment)(html);
|
|
79
79
|
const visitNodes = (nodes) => {
|
|
80
80
|
nodes.forEach(node => {
|
|
81
81
|
if (node.attrs) {
|
|
@@ -149,9 +149,9 @@ function getNgValue(attr) {
|
|
|
149
149
|
// type="{{value ? 'icon' : 'icon' }}"
|
|
150
150
|
// type="align-{{value ? 'icon' : 'icon' }}"
|
|
151
151
|
if (!attr.name.startsWith('[')) {
|
|
152
|
-
const prefix = templatVarIndex > 0 ? str.
|
|
152
|
+
const prefix = templatVarIndex > 0 ? str.substring(0, templatVarIndex) : '';
|
|
153
153
|
if (templatVarIndex !== -1) {
|
|
154
|
-
return fixValue(str.
|
|
154
|
+
return fixValue(str.substring(templatVarIndex), prefix);
|
|
155
155
|
}
|
|
156
156
|
return [str];
|
|
157
157
|
}
|
|
@@ -171,8 +171,8 @@ function fixValue(str, prefix) {
|
|
|
171
171
|
return null;
|
|
172
172
|
}
|
|
173
173
|
function fixTs(tree, path) {
|
|
174
|
-
const source = utils_1.getSourceFile(tree, path);
|
|
175
|
-
const nodes = ast_utils_1.getDecoratorMetadata(source, 'Component', '@angular/core');
|
|
174
|
+
const source = (0, utils_1.getSourceFile)(tree, path);
|
|
175
|
+
const nodes = (0, ast_utils_1.getDecoratorMetadata)(source, 'Component', '@angular/core');
|
|
176
176
|
if (nodes.length === 0) {
|
|
177
177
|
return [];
|
|
178
178
|
}
|
|
@@ -250,9 +250,9 @@ export const ICONS = [ ];
|
|
|
250
250
|
`);
|
|
251
251
|
return;
|
|
252
252
|
}
|
|
253
|
-
const source = utils_1.getSourceFile(tree, path);
|
|
253
|
+
const source = (0, utils_1.getSourceFile)(tree, path);
|
|
254
254
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
255
|
-
const allImports = ast_utils_1.findNodes(source, ts.SyntaxKind.ImportDeclaration);
|
|
255
|
+
const allImports = (0, ast_utils_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
256
256
|
const iconImport = allImports.find((w) => w.moduleSpecifier.getText().includes('@ant-design/icons-angular/icons'));
|
|
257
257
|
if (!iconImport)
|
|
258
258
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.icon.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.icon.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAE/C,qEAAwF;AACxF,mCAA2D;AAC3D,iCAAiC;AAEjC,oCAAyC;AAGzC,oCAAoC;AACpC,MAAM,WAAW,GAAG;IAClB,0FAA0F;IAC1F,uIAAuI;IACvI,aAAa;IACb,iBAAiB;IACjB,eAAe;IACf,kBAAkB;IAClB,aAAa;IACb,gBAAgB;IAChB,iBAAiB;IACjB,oBAAoB;IACpB,cAAc;IACd,oBAAoB;IACpB,iBAAiB;IACjB,oBAAoB;IACpB,cAAc;IACd,aAAa;IACb,mBAAmB;IACnB,oBAAoB;IACpB,aAAa;IACb,aAAa;IACb,iBAAiB;IACjB,uBAAuB;IACvB,0BAA0B;IAC1B,YAAY;IACZ,UAAU;IACV,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,kBAAkB;IAClB,uBAAuB;IACvB,cAAc;IACd,mBAAmB;IACnB,oBAAoB;IACpB,eAAe;IACf,UAAU;IACV,kBAAkB;IAClB,eAAe;IACf,WAAW;IACX,yBAAyB;IACzB,eAAe;IACf,gBAAgB;IAChB,iGAAiG;IACjG,aAAa;IACb,eAAe;IACf,aAAa;IACb,cAAc;CACf,CAAC;AAEF,MAAM,UAAU,GAAG;IACjB,gBAAgB,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,CAAC;IAC3F,WAAW,EAAE,CAAC,QAAQ,CAAC;IACvB,YAAY,EAAE,CAAC,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAChD,kDAAkD;AAClD,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;IAC5B,MAAM,GAAG,GAAa,EAAE,CAAC;IACxB,UAAU,CAAC,GAAG,CAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,GAAG,GAAG,sBAAa,
|
|
1
|
+
{"version":3,"file":"plugin.icon.js","sourceRoot":"","sources":["../../../schematics/plugin/plugin.icon.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAE/C,qEAAwF;AACxF,mCAA2D;AAC3D,iCAAiC;AAEjC,oCAAyC;AAGzC,oCAAoC;AACpC,MAAM,WAAW,GAAG;IAClB,0FAA0F;IAC1F,uIAAuI;IACvI,aAAa;IACb,iBAAiB;IACjB,eAAe;IACf,kBAAkB;IAClB,aAAa;IACb,gBAAgB;IAChB,iBAAiB;IACjB,oBAAoB;IACpB,cAAc;IACd,oBAAoB;IACpB,iBAAiB;IACjB,oBAAoB;IACpB,cAAc;IACd,aAAa;IACb,mBAAmB;IACnB,oBAAoB;IACpB,aAAa;IACb,aAAa;IACb,iBAAiB;IACjB,uBAAuB;IACvB,0BAA0B;IAC1B,YAAY;IACZ,UAAU;IACV,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,kBAAkB;IAClB,uBAAuB;IACvB,cAAc;IACd,mBAAmB;IACnB,oBAAoB;IACpB,eAAe;IACf,UAAU;IACV,kBAAkB;IAClB,eAAe;IACf,WAAW;IACX,yBAAyB;IACzB,eAAe;IACf,gBAAgB;IAChB,iGAAiG;IACjG,aAAa;IACb,eAAe;IACf,aAAa;IACb,cAAc;CACf,CAAC;AAEF,MAAM,UAAU,GAAG;IACjB,gBAAgB,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,CAAC;IAC3F,WAAW,EAAE,CAAC,QAAQ,CAAC;IACvB,YAAY,EAAE,CAAC,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAChD,kDAAkD;AAClD,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;IAC5B,MAAM,GAAG,GAAa,EAAE,CAAC;IACxB,UAAU,CAAC,GAAG,CAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,GAAG,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,CAAC,KAAgB,EAAQ,EAAE;QAC5C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,SAAS;oBAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,QAAQ;oBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;gBACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;gBACtC,IAAI,QAAQ;oBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;aACrC;YAED,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,UAAU,CAAC,IAAI,CAAC,UAAuB,CAAC,CAAC;aAC1C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,CAAC,UAAuB,CAAC,CAAC;IACxC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CAAC,IAAa;IAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IACtD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,SAAS,CAAC,IAAa;IAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACnG,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,UAAU,CAAC,KAAM,CAAC,CAAC;IAClC,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAExD,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,cAAc,CAAC,IAAa;IACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAE1D,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAE/B,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CAAC,IAAe;IACjC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9B,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE;QAC1B,yEAAyE;QACzE,MAAM,QAAQ,GAAG,yCAAyC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SACnC;KACF;IAED,cAAc;IACd,sCAAsC;IACtC,4CAA4C;IAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,MAAM,GAAG,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE;YAC1B,OAAO,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;SACzD;QACD,OAAO,CAAC,GAAG,CAAC,CAAC;KACd;IAED,eAAe;IACf,IAAI,eAAe,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAExC,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,MAAc;IAC3C,0BAA0B;IAC1B,kEAAkE;IAClE,SAAS;IACT,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;IAC5F,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;KAC3D;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,KAAK,CAAC,IAAU,EAAE,IAAY;IACrC,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,YAAY,GAAI,KAAK,CAAC,CAAC,CAAgC,CAAC,UAAU,CAAC,IAAI,CAC3E,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAK,CAAC,OAAO,EAAE,KAAK,UAAU,CACb,CAAC;IAC3B,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;QACtE,OAAO,EAAE,CAAC;KACX;IAED,OAAO,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC3C,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAE1E,IAAI,KAAK,KAAK,cAAc,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC5B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;KAC3C;IACD,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACrC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;KACxC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC/B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;KAC3C;SAAM,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC5B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACrC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC/B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;KAC3C;SAAM;QACL,GAAG,GAAG,GAAG,GAAG,UAAU,CAAC;KACxB;IAED,OAAO,cAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,QAAQ,CAAC,OAAsB,EAAE,IAAU;IAClD,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YAAE,OAAO;QAC1F,IAAI,GAAG,GAAa,EAAE,CAAC;QACvB,IAAI;YACF,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACxB,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACzB;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC1B,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC9C;SACF;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,4BAA4B,EAAE,EAAE,CAAC,CAAC;SAClE;QACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;YAC7D,aAAa,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,aAAa;SACV,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAClD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAc,CAAC;AAChD,CAAC;AAED,SAAS,cAAc,CAAC,OAAsB,EAAE,IAAU;IACxD,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,UAAU,iBAAiB,CAAC;IACpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,IAAI,CAAC,MAAM,CACT,IAAI,EACJ;;;;;CAKL,CACI,CAAC;QACF,OAAO;KACR;IACD,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAA,qBAAS,EAAC,MAAa,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAuB,EAAE,EAAE,CAC7D,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAChD,CAAC;IAC1B,IAAI,CAAC,UAAU;QAAE,OAAO;IACvB,UAAU,CAAC,YAAa,CAAC,aAAkC,CAAC,QAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACjF,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,CACrC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,OAAsB,EAAE,IAAU,EAAE,KAAe;IACtE,MAAM,OAAO,GAAG;;;;;IAKd,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;;;;IAInB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;;CAEtB,CAAC;IACA,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,UAAU,sBAAsB,CAAC;IAC7D,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAChC;AACH,CAAC;AAED,SAAgB,UAAU,CAAC,OAAsB;IAC/C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,CACT,2GAA2G,CAC5G,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC;AAbD,gCAaC"}
|
package/plugin/plugin.icon.ts
CHANGED
|
@@ -156,9 +156,9 @@ function getNgValue(attr: Attribute): string[] | null {
|
|
|
156
156
|
// type="{{value ? 'icon' : 'icon' }}"
|
|
157
157
|
// type="align-{{value ? 'icon' : 'icon' }}"
|
|
158
158
|
if (!attr.name.startsWith('[')) {
|
|
159
|
-
const prefix = templatVarIndex > 0 ? str.
|
|
159
|
+
const prefix = templatVarIndex > 0 ? str.substring(0, templatVarIndex) : '';
|
|
160
160
|
if (templatVarIndex !== -1) {
|
|
161
|
-
return fixValue(str.
|
|
161
|
+
return fixValue(str.substring(templatVarIndex), prefix);
|
|
162
162
|
}
|
|
163
163
|
return [str];
|
|
164
164
|
}
|