devextreme-schematics 1.3.1 → 1.4.0
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +8 -7
- package/src/add-app-template/README.md +1 -1
- package/src/add-app-template/index.js +19 -5
- package/src/add-app-template/index.js.map +1 -1
- package/src/add-app-template/index.ts +20 -1
- package/src/add-app-template/schema.json +1 -1
- package/src/add-layout/README.md +2 -2
- package/src/add-layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.scss +1 -16
- package/src/add-layout/files/src/app/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.component.scss +0 -9
- package/src/add-layout/files/src/dx-styles.scss +12 -0
- package/src/add-layout/index.js +43 -41
- package/src/add-layout/index.js.map +1 -1
- package/src/add-layout/index.ts +5 -2
- package/src/add-layout/index_spec.js +5 -5
- package/src/add-layout/index_spec.js.map +1 -1
- package/src/add-layout/index_spec.ts +2 -2
- package/src/add-layout/schema.json +1 -1
- package/src/add-sample-views/index.js +15 -15
- package/src/add-sample-views/index.js.map +1 -1
- package/src/add-view/README.md +2 -2
- package/src/add-view/index.js +21 -21
- package/src/add-view/index.js.map +1 -1
- package/src/add-view/index.ts +1 -1
- package/src/install/index.js +10 -10
- package/src/install/index.js.map +1 -1
- package/src/install/index.ts +3 -2
- package/src/install/schema.json +1 -1
- package/src/utility/change.d.ts +1 -1
- package/src/utility/change.ts +1 -1
- package/src/utility/latest-versions.js +2 -2
- package/src/utility/latest-versions.ts +2 -2
- package/src/utility/modify-json-file.js +1 -1
- package/src/utility/modify-json-file.js.map +1 -1
- package/src/utility/project.js +3 -3
- package/src/utility/project.js.map +1 -1
- package/src/utility/routing.d.ts +1 -1
- package/src/utility/routing.js +2 -2
- package/src/utility/routing.js.map +1 -1
- package/src/utility/routing.ts +1 -1
- package/src/utility/source.d.ts +1 -1
- package/src/utility/source.js +2 -2
- package/src/utility/source.js.map +1 -1
- package/src/utility/source.ts +1 -1
- package/src/utility/styles.js +1 -1
- package/src/utility/styles.js.map +1 -1
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "devextreme-schematics",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.4.0",
|
4
4
|
"description": "DevExtreme schematics",
|
5
5
|
"scripts": {
|
6
6
|
"build": "tsc -p tsconfig.json",
|
@@ -24,15 +24,16 @@
|
|
24
24
|
"dependencies": {
|
25
25
|
"@angular-devkit/core": "^12.0.0",
|
26
26
|
"@angular-devkit/schematics": "^12.0.0",
|
27
|
-
"@schematics/angular": "^12.0.0"
|
28
|
-
"rxjs": "~6.4.0",
|
29
|
-
"typescript": "~4.3.1"
|
27
|
+
"@schematics/angular": "^12.0.0"
|
30
28
|
},
|
31
29
|
"devDependencies": {
|
32
30
|
"@types/jasmine": "~3.10.3",
|
33
|
-
"@types/node": "
|
31
|
+
"@types/node": "ts4.3",
|
32
|
+
"@types/semver": "^7.3.9",
|
34
33
|
"jasmine": "^2.8.0",
|
35
|
-
"
|
34
|
+
"rxjs": "^6.0.0",
|
35
|
+
"tslint": "^5.15.0",
|
36
|
+
"typescript": "^4.3.1"
|
36
37
|
},
|
37
|
-
"gitHead": "
|
38
|
+
"gitHead": "555ce7269749c1c6586a09062044da0477505bc9"
|
38
39
|
}
|
@@ -16,5 +16,5 @@ A schematic that adds a DevExtreme layout template to an Angular application.
|
|
16
16
|
- empty (Boolean)
|
17
17
|
Specifies whether to skip sample views generation
|
18
18
|
|
19
|
-
-
|
19
|
+
- resolve-conflicts (string)
|
20
20
|
Specifies whether to override the existing app component or create a component with another name
|
@@ -1,27 +1,41 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
4
|
+
const path_1 = require("path");
|
5
|
+
const child_process_1 = require("child_process");
|
4
6
|
function default_1(options) {
|
5
7
|
const rules = [
|
6
|
-
schematics_1.schematic('install', {
|
8
|
+
(0, schematics_1.schematic)('install', {
|
7
9
|
dxversion: options.dxversion,
|
8
10
|
project: options.project
|
9
11
|
}),
|
10
|
-
schematics_1.schematic('add-layout', {
|
12
|
+
(0, schematics_1.schematic)('add-layout', {
|
11
13
|
layout: options.layout,
|
12
14
|
resolveConflicts: options.resolveConflicts,
|
13
15
|
project: options.project,
|
14
16
|
skipInstall: true,
|
15
17
|
updateBudgets: options.updateBudgets,
|
16
18
|
globalNgCliVersion: options.globalNgCliVersion
|
17
|
-
})
|
19
|
+
}),
|
20
|
+
// schematics installed packages with flag --ignore-scripts
|
21
|
+
// @angular/cli@14 add option allowScript to NodePackageInstallTask
|
22
|
+
(host) => {
|
23
|
+
const isWin = /^win/.test(process.platform);
|
24
|
+
const resPath = (0, path_1.resolve)((0, path_1.join)('.', 'node_modules', 'sass-embedded'));
|
25
|
+
(0, child_process_1.spawnSync)('npm', ['run', 'postinstall'], {
|
26
|
+
cwd: resPath,
|
27
|
+
windowsVerbatimArguments: true,
|
28
|
+
shell: isWin ? false : true
|
29
|
+
});
|
30
|
+
return host;
|
31
|
+
}
|
18
32
|
];
|
19
33
|
if (!options.empty) {
|
20
|
-
rules.push(schematics_1.schematic('add-sample-views', {
|
34
|
+
rules.push((0, schematics_1.schematic)('add-sample-views', {
|
21
35
|
project: options.project
|
22
36
|
}));
|
23
37
|
}
|
24
|
-
return schematics_1.chain(rules);
|
38
|
+
return (0, schematics_1.chain)(rules);
|
25
39
|
}
|
26
40
|
exports.default = default_1;
|
27
41
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,2DAKoC;AAEpC,+BAAqC;AAErC,iDAA0C;AAE1C,mBAAwB,OAAY;IAClC,MAAM,KAAK,GAAG;QACZ,IAAA,sBAAS,EAAC,SAAS,EAAE;YACnB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QACF,IAAA,sBAAS,EAAC,YAAY,EAAE;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC;QACF,2DAA2D;QAC3D,mEAAmE;QACnE,CAAC,IAAU,EAAE,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YAEpE,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE;gBACvC,GAAG,EAAE,OAAO;gBACZ,wBAAwB,EAAE,IAAI;gBAC9B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;aAC5B,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,kBAAkB,EAAE;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC,CAAC;KACL;IAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AArCD,4BAqCC"}
|
@@ -2,8 +2,13 @@ import {
|
|
2
2
|
Rule,
|
3
3
|
chain,
|
4
4
|
schematic,
|
5
|
+
Tree,
|
5
6
|
} from '@angular-devkit/schematics';
|
6
7
|
|
8
|
+
import { resolve, join } from 'path';
|
9
|
+
|
10
|
+
import { spawnSync } from 'child_process';
|
11
|
+
|
7
12
|
export default function(options: any): Rule {
|
8
13
|
const rules = [
|
9
14
|
schematic('install', {
|
@@ -17,7 +22,21 @@ export default function(options: any): Rule {
|
|
17
22
|
skipInstall: true,
|
18
23
|
updateBudgets: options.updateBudgets,
|
19
24
|
globalNgCliVersion: options.globalNgCliVersion
|
20
|
-
})
|
25
|
+
}),
|
26
|
+
// schematics installed packages with flag --ignore-scripts
|
27
|
+
// @angular/cli@14 add option allowScript to NodePackageInstallTask
|
28
|
+
(host: Tree) => {
|
29
|
+
const isWin = /^win/.test(process.platform);
|
30
|
+
const resPath = resolve(join('.', 'node_modules', 'sass-embedded'));
|
31
|
+
|
32
|
+
spawnSync('npm', ['run', 'postinstall'], {
|
33
|
+
cwd: resPath,
|
34
|
+
windowsVerbatimArguments: true,
|
35
|
+
shell: isWin ? false : true
|
36
|
+
});
|
37
|
+
|
38
|
+
return host;
|
39
|
+
}
|
21
40
|
];
|
22
41
|
|
23
42
|
if (!options.empty) {
|
package/src/add-layout/README.md
CHANGED
@@ -10,9 +10,9 @@ A schematic that adds a DevExtreme layout to a DevExtreme Angular application.
|
|
10
10
|
- project (string)
|
11
11
|
The name of a project to modify
|
12
12
|
|
13
|
-
-
|
13
|
+
- resolve-conflicts (string)
|
14
14
|
Specifies whether to override the existing app component or create a component with another name
|
15
15
|
|
16
|
-
-
|
16
|
+
- skip-install (boolean)
|
17
17
|
Specifies whether to skip the dependency package installation
|
18
18
|
|
@@ -2,21 +2,6 @@
|
|
2
2
|
width: 100%;
|
3
3
|
}
|
4
4
|
|
5
|
-
.container {
|
6
|
-
height: 100%;
|
7
|
-
flex-direction: column;
|
8
|
-
display: flex;
|
9
|
-
}
|
10
|
-
|
11
|
-
.layout-body {
|
12
|
-
flex: 1;
|
13
|
-
min-height: 0;
|
14
|
-
}
|
15
|
-
|
16
|
-
.content {
|
17
|
-
flex-grow: 1;
|
18
|
-
}
|
19
|
-
|
20
5
|
#navigation-header {
|
21
6
|
@import "../../../themes/generated/variables.additional.scss";
|
22
7
|
background-color: $base-accent;
|
@@ -29,7 +14,7 @@
|
|
29
14
|
:host-context(.screen-x-small) & {
|
30
15
|
padding-left: 20px;
|
31
16
|
}
|
32
|
-
|
17
|
+
|
33
18
|
:host-context(.dx-theme-generic) & {
|
34
19
|
padding-top: 10px;
|
35
20
|
padding-bottom: 10px;
|
@@ -10,6 +10,7 @@ html, body {
|
|
10
10
|
|
11
11
|
.content {
|
12
12
|
line-height: 1.5;
|
13
|
+
flex-grow: 1;
|
13
14
|
|
14
15
|
h2 {
|
15
16
|
font-size: 30px;
|
@@ -18,6 +19,17 @@ html, body {
|
|
18
19
|
}
|
19
20
|
}
|
20
21
|
|
22
|
+
.container {
|
23
|
+
height: 100%;
|
24
|
+
flex-direction: column;
|
25
|
+
display: flex;
|
26
|
+
}
|
27
|
+
|
28
|
+
.layout-body {
|
29
|
+
flex: 1;
|
30
|
+
min-height: 0;
|
31
|
+
}
|
32
|
+
|
21
33
|
.side-nav-outer-toolbar .dx-drawer {
|
22
34
|
height: calc(100% - 56px)
|
23
35
|
}
|
package/src/add-layout/index.js
CHANGED
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const schematics_1 = require("@angular-devkit/schematics");
|
13
13
|
const core_1 = require("@angular-devkit/core");
|
14
14
|
const path_1 = require("path");
|
15
|
+
const semver_1 = require("semver");
|
15
16
|
const project_1 = require("../utility/project");
|
16
17
|
const string_1 = require("../utility/string");
|
17
18
|
const styles_1 = require("../utility/styles");
|
@@ -41,7 +42,7 @@ function addScriptSafe(scripts, name, value) {
|
|
41
42
|
}
|
42
43
|
function addBuildThemeScript() {
|
43
44
|
return (host) => {
|
44
|
-
modify_json_file_1.modifyJSONFile(host, './package.json', config => {
|
45
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './package.json', config => {
|
45
46
|
const scripts = config['scripts'];
|
46
47
|
addScriptSafe(scripts, 'build-themes', 'devextreme build');
|
47
48
|
addScriptSafe(scripts, 'postinstall', 'npm run build-themes');
|
@@ -52,23 +53,23 @@ function addBuildThemeScript() {
|
|
52
53
|
}
|
53
54
|
function addCustomThemeStyles(host, options, sourcePath = '') {
|
54
55
|
return __awaiter(this, void 0, void 0, function* () {
|
55
|
-
const projectName = yield project_1.getProjectName(host, options.project);
|
56
|
-
modify_json_file_1.modifyJSONFile(host, './angular.json', config => {
|
56
|
+
const projectName = yield (0, project_1.getProjectName)(host, options.project);
|
57
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './angular.json', config => {
|
57
58
|
const stylesList = [
|
58
59
|
`${sourcePath}/dx-styles.scss`,
|
59
60
|
`${sourcePath}/themes/generated/theme.additional.css`,
|
60
61
|
`${sourcePath}/themes/generated/theme.base.css`,
|
61
62
|
'node_modules/devextreme/dist/css/dx.common.css'
|
62
63
|
];
|
63
|
-
return styles_1.addStylesToApp(projectName, config, stylesList);
|
64
|
+
return (0, styles_1.addStylesToApp)(projectName, config, stylesList);
|
64
65
|
});
|
65
66
|
return host;
|
66
67
|
});
|
67
68
|
}
|
68
69
|
function updateBudgets(host, options) {
|
69
70
|
return __awaiter(this, void 0, void 0, function* () {
|
70
|
-
const projectName = yield project_1.getProjectName(host, options.project);
|
71
|
-
modify_json_file_1.modifyJSONFile(host, './angular.json', config => {
|
71
|
+
const projectName = yield (0, project_1.getProjectName)(host, options.project);
|
72
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './angular.json', config => {
|
72
73
|
const budgets = config.projects[projectName].architect.build.configurations.production.budgets;
|
73
74
|
const budget = budgets.find((item) => item.type === 'initial');
|
74
75
|
if (budget) {
|
@@ -82,7 +83,7 @@ function updateBudgets(host, options) {
|
|
82
83
|
}
|
83
84
|
function addViewportToBody(sourcePath = '') {
|
84
85
|
return (host) => {
|
85
|
-
const indexPath = path_1.join(sourcePath, 'index.html');
|
86
|
+
const indexPath = (0, path_1.join)(sourcePath, 'index.html');
|
86
87
|
let indexContent = host.read(indexPath).toString();
|
87
88
|
indexContent = indexContent.replace(/<body>/, '<body class="dx-viewport">');
|
88
89
|
host.overwrite(indexPath, indexContent);
|
@@ -91,24 +92,24 @@ function addViewportToBody(sourcePath = '') {
|
|
91
92
|
}
|
92
93
|
function modifyFileRule(path, callback) {
|
93
94
|
return (host) => {
|
94
|
-
const source = source_1.getSourceFile(host, path);
|
95
|
+
const source = (0, source_1.getSourceFile)(host, path);
|
95
96
|
if (!source) {
|
96
97
|
return host;
|
97
98
|
}
|
98
99
|
const changes = callback(source);
|
99
|
-
return change_1.applyChanges(host, changes, path);
|
100
|
+
return (0, change_1.applyChanges)(host, changes, path);
|
100
101
|
};
|
101
102
|
}
|
102
103
|
function updateAppModule(host, sourcePath) {
|
103
104
|
const appModulePath = sourcePath + 'app.module.ts';
|
104
105
|
const importSetter = (importName, path) => {
|
105
106
|
return (source) => {
|
106
|
-
return ast_utils_1.addImportToModule(source, appModulePath, importName, path);
|
107
|
+
return (0, ast_utils_1.addImportToModule)(source, appModulePath, importName, path);
|
107
108
|
};
|
108
109
|
};
|
109
110
|
const providerSetter = (importName, path) => {
|
110
111
|
return (source) => {
|
111
|
-
return ast_utils_1.addProviderToModule(source, appModulePath, importName, path);
|
112
|
+
return (0, ast_utils_1.addProviderToModule)(source, appModulePath, importName, path);
|
112
113
|
};
|
113
114
|
};
|
114
115
|
const rules = [
|
@@ -128,7 +129,7 @@ function updateAppModule(host, sourcePath) {
|
|
128
129
|
if (!hasRoutingModule(host, sourcePath)) {
|
129
130
|
rules.push(modifyFileRule(appModulePath, importSetter('AppRoutingModule', './app-routing.module')));
|
130
131
|
}
|
131
|
-
return schematics_1.chain(rules);
|
132
|
+
return (0, schematics_1.chain)(rules);
|
132
133
|
}
|
133
134
|
function getComponentName(host, sourcePath) {
|
134
135
|
let name = '';
|
@@ -148,11 +149,12 @@ function hasRoutingModule(host, sourcePath) {
|
|
148
149
|
return host.exists(sourcePath + 'app-routing.module.ts');
|
149
150
|
}
|
150
151
|
function addPackagesToDependency(globalNgCliVersion) {
|
152
|
+
const version = new semver_1.SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
|
151
153
|
return (host) => {
|
152
|
-
dependencies_1.addPackageJsonDependency(host, {
|
154
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
153
155
|
type: dependencies_1.NodeDependencyType.Default,
|
154
156
|
name: '@angular/cdk',
|
155
|
-
version:
|
157
|
+
version: `~${version.major}.${version.minor}.0`
|
156
158
|
});
|
157
159
|
return host;
|
158
160
|
};
|
@@ -160,7 +162,7 @@ function addPackagesToDependency(globalNgCliVersion) {
|
|
160
162
|
function modifyContentByTemplate(sourcePath = '', templateSourcePath, filePath, templateOptions = {}, modifyContent) {
|
161
163
|
return (host, context) => {
|
162
164
|
const modifyIfExists = (fileEntry) => {
|
163
|
-
const fileEntryPath = path_1.join(sourcePath, fileEntry.path.toString());
|
165
|
+
const fileEntryPath = (0, path_1.join)(sourcePath, fileEntry.path.toString());
|
164
166
|
if (!host.exists(fileEntryPath)) {
|
165
167
|
return fileEntry;
|
166
168
|
}
|
@@ -177,16 +179,16 @@ function modifyContentByTemplate(sourcePath = '', templateSourcePath, filePath,
|
|
177
179
|
return null;
|
178
180
|
};
|
179
181
|
const rules = [
|
180
|
-
schematics_1.filter(path => {
|
181
|
-
return !filePath || path_1.join('./', path) === path_1.join('./', filePath);
|
182
|
+
(0, schematics_1.filter)(path => {
|
183
|
+
return !filePath || (0, path_1.join)('./', path) === (0, path_1.join)('./', filePath);
|
182
184
|
}),
|
183
|
-
schematics_1.template(templateOptions),
|
184
|
-
schematics_1.forEach(modifyIfExists),
|
185
|
-
schematics_1.move(sourcePath)
|
185
|
+
(0, schematics_1.template)(templateOptions),
|
186
|
+
(0, schematics_1.forEach)(modifyIfExists),
|
187
|
+
(0, schematics_1.move)(sourcePath)
|
186
188
|
];
|
187
|
-
const modifiedSource = schematics_1.apply(schematics_1.url(templateSourcePath), rules);
|
188
|
-
const resultRule = schematics_1.mergeWith(modifiedSource);
|
189
|
-
return schematics_1.callRule(resultRule, host, context);
|
189
|
+
const modifiedSource = (0, schematics_1.apply)((0, schematics_1.url)(templateSourcePath), rules);
|
190
|
+
const resultRule = (0, schematics_1.mergeWith)(modifiedSource);
|
191
|
+
return (0, schematics_1.callRule)(resultRule, host, context);
|
190
192
|
};
|
191
193
|
}
|
192
194
|
function updateDevextremeConfig(sourcePath = '') {
|
@@ -204,28 +206,28 @@ function updateDevextremeConfig(sourcePath = '') {
|
|
204
206
|
}
|
205
207
|
const modifyRoutingModule = (host, routingModulePath) => {
|
206
208
|
// TODO: Try to use the isolated host to generate the result string
|
207
|
-
let source = source_1.getSourceFile(host, routingModulePath);
|
208
|
-
const importChange = ast_utils_1.insertImport(source, routingModulePath, 'LoginFormComponent', './shared/components');
|
209
|
-
const providerChanges = ast_utils_1.addProviderToModule(source, routingModulePath, 'AuthGuardService', './shared/services');
|
210
|
-
change_1.applyChanges(host, [importChange, ...providerChanges], routingModulePath);
|
211
|
-
source = source_1.getSourceFile(host, routingModulePath);
|
212
|
-
const routes = routing_1.findRoutesInSource(source);
|
213
|
-
if (!routing_1.hasComponentInRoutes(routes, 'login-form')) {
|
214
|
-
const loginFormRoute = routing_1.getRoute('login-form');
|
215
|
-
change_1.insertItemToArray(host, routingModulePath, routes, loginFormRoute);
|
209
|
+
let source = (0, source_1.getSourceFile)(host, routingModulePath);
|
210
|
+
const importChange = (0, ast_utils_1.insertImport)(source, routingModulePath, 'LoginFormComponent', './shared/components');
|
211
|
+
const providerChanges = (0, ast_utils_1.addProviderToModule)(source, routingModulePath, 'AuthGuardService', './shared/services');
|
212
|
+
(0, change_1.applyChanges)(host, [importChange, ...providerChanges], routingModulePath);
|
213
|
+
source = (0, source_1.getSourceFile)(host, routingModulePath);
|
214
|
+
const routes = (0, routing_1.findRoutesInSource)(source);
|
215
|
+
if (!(0, routing_1.hasComponentInRoutes)(routes, 'login-form')) {
|
216
|
+
const loginFormRoute = (0, routing_1.getRoute)('login-form');
|
217
|
+
(0, change_1.insertItemToArray)(host, routingModulePath, routes, loginFormRoute);
|
216
218
|
}
|
217
219
|
};
|
218
220
|
function default_1(options) {
|
219
221
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
220
222
|
const ngConfig = host.read('./angular.json').toString();
|
221
|
-
const defaultProjectName = modify_json_file_1.parseJson(ngConfig).defaultProject;
|
222
|
-
const project = yield project_1.getProjectName(host, options.project);
|
223
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
223
|
+
const defaultProjectName = (0, modify_json_file_1.parseJson)(ngConfig).defaultProject;
|
224
|
+
const project = yield (0, project_1.getProjectName)(host, options.project);
|
225
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
224
226
|
const ngProject = workspace.projects.get(project);
|
225
227
|
const prefix = ngProject === null || ngProject === void 0 ? void 0 : ngProject.prefix;
|
226
|
-
const title = string_1.humanize(project);
|
227
|
-
const appPath = yield project_1.getApplicationPath(host, project);
|
228
|
-
const sourcePath = yield project_1.getSourceRootPath(host, project);
|
228
|
+
const title = (0, string_1.humanize)(project);
|
229
|
+
const appPath = yield (0, project_1.getApplicationPath)(host, project);
|
230
|
+
const sourcePath = yield (0, project_1.getSourceRootPath)(host, project);
|
229
231
|
const layout = options.layout;
|
230
232
|
const override = options.resolveConflicts === 'override';
|
231
233
|
const componentName = override ? 'app' : getComponentName(host, appPath);
|
@@ -239,10 +241,10 @@ function default_1(options) {
|
|
239
241
|
prefix
|
240
242
|
};
|
241
243
|
const modifyContent = (templateContent, currentContent, filePath) => {
|
242
|
-
if (path_1.basename(filePath) === 'styles.scss') {
|
244
|
+
if ((0, path_1.basename)(filePath) === 'styles.scss') {
|
243
245
|
return `${currentContent}\n${templateContent}`;
|
244
246
|
}
|
245
|
-
if (path_1.basename(filePath) === 'app-routing.module.ts' && hasRoutingModule(host, appPath)) {
|
247
|
+
if ((0, path_1.basename)(filePath) === 'app-routing.module.ts' && hasRoutingModule(host, appPath)) {
|
246
248
|
modifyRoutingModule(host, filePath);
|
247
249
|
return currentContent;
|
248
250
|
}
|
@@ -271,7 +273,7 @@ function default_1(options) {
|
|
271
273
|
rules.push(modifyContentByTemplate('./', workspaceFilesSource, 'e2e/src/app.po.ts'));
|
272
274
|
}
|
273
275
|
}
|
274
|
-
return schematics_1.chain(rules);
|
276
|
+
return (0, schematics_1.chain)(rules);
|
275
277
|
});
|
276
278
|
}
|
277
279
|
exports.default = default_1;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAcoC;AAMpC,+CAA+C;AAE/C,+BAAsC;AAEtC,gDAI6B;AAE7B,8CAE2B;AAE3B,8CAE4B;AAE5B,kEAGsC;AAEtC,2EAGkD;AAElD,4DAE0C;AAE1C,8CAAkD;AAElD,8CAG2B;AAE3B,gDAI4B;AAE5B,qEAE+C;AAE/C,qEAAqE;AAGrE,MAAM,kBAAkB,GAAG,aAAa,CAAC;AACzC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAEvC,SAAS,aAAa,CAAC,OAAY,EAAE,IAAY,EAAE,KAAa;IAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACtB,OAAO;KACR;IAED,MAAM,SAAS,GAAG,UAAU,IAAI,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,WAAW,SAAS,OAAO,KAAK,EAAE,CAAC;IAErD,IAAI,YAAY,KAAK,KAAK,IAAI,YAAY,KAAK,SAAS,EAAE;QACxD,OAAO;KACR;IAED,OAAO,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;IAClC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;AAC5B,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,iCAAc,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-layout/index.ts
CHANGED
@@ -16,12 +16,14 @@ import {
|
|
16
16
|
|
17
17
|
import {
|
18
18
|
SourceFile
|
19
|
-
} from 'typescript';
|
19
|
+
} from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
20
20
|
|
21
21
|
import { strings } from '@angular-devkit/core';
|
22
22
|
|
23
23
|
import { join, basename } from 'path';
|
24
24
|
|
25
|
+
import { SemVer } from 'semver';
|
26
|
+
|
25
27
|
import {
|
26
28
|
getApplicationPath,
|
27
29
|
getSourceRootPath,
|
@@ -226,11 +228,12 @@ function hasRoutingModule(host: Tree, sourcePath: string) {
|
|
226
228
|
}
|
227
229
|
|
228
230
|
function addPackagesToDependency(globalNgCliVersion: string) {
|
231
|
+
const version = new SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
|
229
232
|
return (host: Tree) => {
|
230
233
|
addPackageJsonDependency(host, {
|
231
234
|
type: NodeDependencyType.Default,
|
232
235
|
name: '@angular/cdk',
|
233
|
-
version:
|
236
|
+
version: `~${version.major}.${version.minor}.0`
|
234
237
|
});
|
235
238
|
|
236
239
|
return host;
|
@@ -32,7 +32,7 @@ describe('layout', () => {
|
|
32
32
|
const options = {
|
33
33
|
layout: 'side-nav-outer-toolbar',
|
34
34
|
resolveConflicts: 'override',
|
35
|
-
globalNgCliVersion: '^
|
35
|
+
globalNgCliVersion: '^12.2.0'
|
36
36
|
};
|
37
37
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
38
38
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
@@ -117,8 +117,8 @@ describe('layout', () => {
|
|
117
117
|
expect(packageConfig.scripts['postinstall']).toBe('npm run build-themes');
|
118
118
|
}));
|
119
119
|
it('should set static flag', () => __awaiter(void 0, void 0, void 0, function* () {
|
120
|
-
dependencies_1.removePackageJsonDependency(appTree, '@angular/core');
|
121
|
-
dependencies_1.addPackageJsonDependency(appTree, {
|
120
|
+
(0, dependencies_1.removePackageJsonDependency)(appTree, '@angular/core');
|
121
|
+
(0, dependencies_1.addPackageJsonDependency)(appTree, {
|
122
122
|
type: dependencies_1.NodeDependencyType.Default,
|
123
123
|
name: '@angular/core',
|
124
124
|
version: '7.0.0'
|
@@ -129,7 +129,7 @@ describe('layout', () => {
|
|
129
129
|
expect(navigationMenu).toContain('@ViewChild(DxTreeViewComponent, { static: true })');
|
130
130
|
}));
|
131
131
|
it('should add npm scripts safely', () => __awaiter(void 0, void 0, void 0, function* () {
|
132
|
-
modify_json_file_1.modifyJSONFile(appTree, './package.json', config => {
|
132
|
+
(0, modify_json_file_1.modifyJSONFile)(appTree, './package.json', config => {
|
133
133
|
const scripts = config['scripts'];
|
134
134
|
scripts['build-themes'] = 'prev value 1';
|
135
135
|
scripts['postinstall'] = 'prev value 2';
|
@@ -153,7 +153,7 @@ describe('layout', () => {
|
|
153
153
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
154
154
|
const tree = yield runner.runSchematicAsync('add-layout', options, appTree).toPromise();
|
155
155
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
156
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('
|
156
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('~12.2.0');
|
157
157
|
}));
|
158
158
|
it('should update budgets if updateBudgets option is true', () => __awaiter(void 0, void 0, void 0, function* () {
|
159
159
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
@@ -31,7 +31,7 @@ describe('layout', () => {
|
|
31
31
|
const options: any = {
|
32
32
|
layout: 'side-nav-outer-toolbar',
|
33
33
|
resolveConflicts: 'override',
|
34
|
-
globalNgCliVersion: '^
|
34
|
+
globalNgCliVersion: '^12.2.0'
|
35
35
|
};
|
36
36
|
|
37
37
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
@@ -181,7 +181,7 @@ describe('layout', () => {
|
|
181
181
|
const tree = await runner.runSchematicAsync('add-layout', options, appTree).toPromise();
|
182
182
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
183
183
|
|
184
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('
|
184
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('~12.2.0');
|
185
185
|
});
|
186
186
|
|
187
187
|
it('should update budgets if updateBudgets option is true', async () => {
|
@@ -63,52 +63,52 @@ const navigations = [
|
|
63
63
|
];
|
64
64
|
function addImportsToRoutingModule(isView, routingPath, options) {
|
65
65
|
return (host) => {
|
66
|
-
const source = source_1.getSourceFile(host, routingPath);
|
66
|
+
const source = (0, source_1.getSourceFile)(host, routingPath);
|
67
67
|
if (!source) {
|
68
68
|
return host;
|
69
69
|
}
|
70
70
|
let changes;
|
71
71
|
if (isView) {
|
72
|
-
changes = ast_utils_1.addDeclarationToModule(source, routingPath, options.componentName, options.relativePath);
|
72
|
+
changes = (0, ast_utils_1.addDeclarationToModule)(source, routingPath, options.componentName, options.relativePath);
|
73
73
|
}
|
74
74
|
else {
|
75
|
-
changes = ast_utils_1.addImportToModule(source, routingPath, options.componentName, options.relativePath);
|
75
|
+
changes = (0, ast_utils_1.addImportToModule)(source, routingPath, options.componentName, options.relativePath);
|
76
76
|
}
|
77
|
-
return change_1.applyChanges(host, changes, routingPath);
|
77
|
+
return (0, change_1.applyChanges)(host, changes, routingPath);
|
78
78
|
};
|
79
79
|
}
|
80
80
|
function addDefaultNavigation(rootPath) {
|
81
81
|
return (host) => {
|
82
82
|
const navigationPath = rootPath + 'app-navigation.ts';
|
83
83
|
navigations.forEach((navigation) => {
|
84
|
-
const navigationSource = source_1.getSourceFile(host, navigationPath);
|
85
|
-
change_1.insertItemToArray(host, navigationPath, navigationSource, navigation, { location: 'end' });
|
84
|
+
const navigationSource = (0, source_1.getSourceFile)(host, navigationPath);
|
85
|
+
(0, change_1.insertItemToArray)(host, navigationPath, navigationSource, navigation, { location: 'end' });
|
86
86
|
});
|
87
87
|
return host;
|
88
88
|
};
|
89
89
|
}
|
90
90
|
function default_1(options) {
|
91
91
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
92
|
-
const project = yield project_1.getProjectName(host, options.project);
|
93
|
-
const rootPath = yield project_1.getApplicationPath(host, project);
|
92
|
+
const project = yield (0, project_1.getProjectName)(host, options.project);
|
93
|
+
const rootPath = yield (0, project_1.getApplicationPath)(host, project);
|
94
94
|
const routingPath = rootPath + 'app-routing.module.ts';
|
95
95
|
const rules = [];
|
96
|
-
const templateSource = schematics_1.apply(schematics_1.url('./files'), [
|
97
|
-
schematics_1.template({
|
98
|
-
project: string_1.humanize(project)
|
96
|
+
const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
|
97
|
+
(0, schematics_1.template)({
|
98
|
+
project: (0, string_1.humanize)(project)
|
99
99
|
}),
|
100
|
-
schematics_1.move(rootPath)
|
100
|
+
(0, schematics_1.move)(rootPath)
|
101
101
|
]);
|
102
|
-
rules.push(schematics_1.mergeWith(templateSource));
|
102
|
+
rules.push((0, schematics_1.mergeWith)(templateSource));
|
103
103
|
sampleViewOptions.forEach((viewOptions) => {
|
104
|
-
rules.push(add_view_1.addViewToRouting({ name: viewOptions.name, project, module: 'app-routing' }));
|
104
|
+
rules.push((0, add_view_1.addViewToRouting)({ name: viewOptions.name, project, module: 'app-routing' }));
|
105
105
|
rules.push(addImportsToRoutingModule(true, routingPath, viewOptions));
|
106
106
|
});
|
107
107
|
devextremeOptions.forEach((moduleOptions) => {
|
108
108
|
rules.push(addImportsToRoutingModule(false, routingPath, moduleOptions));
|
109
109
|
});
|
110
110
|
rules.push(addDefaultNavigation(rootPath));
|
111
|
-
return schematics_1.chain(rules);
|
111
|
+
return (0, schematics_1.chain)(rules);
|
112
112
|
});
|
113
113
|
}
|
114
114
|
exports.default = default_1;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DASoC;AAEpC,qEAG+C;AAE/C,0CAA+C;AAE/C,gDAG6B;AAE7B,8CAA6C;AAE7C,8CAG4B;AAE5B,8CAAkD;AAElD,MAAM,iBAAiB,GAAG;IACxB;QACE,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,eAAe;QAC9B,YAAY,EAAE,6BAA6B;KAC5C,EAAE;QACD,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,kBAAkB;QACjC,YAAY,EAAE,mCAAmC;KAClD,EAAE;QACD,IAAI,EAAE,OAAO;QACb,aAAa,EAAE,gBAAgB;QAC/B,YAAY,EAAE,+BAA+B;KAChD;CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG;IACxB;QACE,aAAa,EAAE,kBAAkB;QACjC,YAAY,EAAE,oBAAoB;KACnC,EAAE;QACD,aAAa,EAAE,cAAc;QAC7B,YAAY,EAAE,oBAAoB;KACrC;CAAC,CAAC;AAEH,MAAM,WAAW,GAAG;IAClB;;;;IAIE;IACF;;;;;;;;;;;;;IAaE;CACH,CAAC;AAEF,SAAS,yBAAyB,CAAC,MAAe,EAAE,WAAmB,EAAE,OAAY;IACnF,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,sBAAa,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-view/README.md
CHANGED
@@ -7,7 +7,7 @@ Add a view to a DevExtreme Angular application.
|
|
7
7
|
- name (string)
|
8
8
|
The view name
|
9
9
|
|
10
|
-
-
|
10
|
+
- add-route (Boolean)
|
11
11
|
Specifies whether to register a route for the view
|
12
12
|
|
13
13
|
- icon (string)
|
@@ -22,7 +22,7 @@ Add a view to a DevExtreme Angular application.
|
|
22
22
|
- spec (Boolean)
|
23
23
|
Specifies whether to generate a spec file
|
24
24
|
|
25
|
-
-
|
25
|
+
- inline-style (Boolean)
|
26
26
|
Specifies whether to define styles in the ts file
|
27
27
|
|
28
28
|
- prefix (string)
|
package/src/add-view/index.js
CHANGED
@@ -20,9 +20,9 @@ const project_1 = require("../utility/project");
|
|
20
20
|
const string_1 = require("../utility/string");
|
21
21
|
function getPathToFile(host, projectName, moduleName) {
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
23
|
-
const rootPath = yield project_1.getApplicationPath(host, projectName);
|
23
|
+
const rootPath = yield (0, project_1.getApplicationPath)(host, projectName);
|
24
24
|
try {
|
25
|
-
return find_module_1.findModuleFromOptions(host, { name: moduleName, path: rootPath, module: moduleName });
|
25
|
+
return (0, find_module_1.findModuleFromOptions)(host, { name: moduleName, path: rootPath, module: moduleName });
|
26
26
|
}
|
27
27
|
catch (error) {
|
28
28
|
return;
|
@@ -36,31 +36,31 @@ function addViewToNavigation(options) {
|
|
36
36
|
if (!navigationFilePath) {
|
37
37
|
return;
|
38
38
|
}
|
39
|
-
const source = source_1.getSourceFile(host, navigationFilePath);
|
39
|
+
const source = (0, source_1.getSourceFile)(host, navigationFilePath);
|
40
40
|
const pagePath = core_1.strings.dasherize(options.name);
|
41
|
-
const name = core_1.strings.dasherize(core_1.basename(core_1.normalize(options.name)));
|
42
|
-
const title = string_1.humanize(name);
|
41
|
+
const name = core_1.strings.dasherize((0, core_1.basename)((0, core_1.normalize)(options.name)));
|
42
|
+
const title = (0, string_1.humanize)(name);
|
43
43
|
const navigationItem = ` {
|
44
44
|
text: '${title}',
|
45
45
|
path: '/${pagePath}',
|
46
46
|
icon: '${options.icon}'
|
47
47
|
}`;
|
48
|
-
change_1.insertItemToArray(host, navigationFilePath, source, navigationItem, { location: 'end' });
|
48
|
+
(0, change_1.insertItemToArray)(host, navigationFilePath, source, navigationItem, { location: 'end' });
|
49
49
|
return host;
|
50
50
|
});
|
51
51
|
}
|
52
52
|
function addRedirectRoute(host, routingModulePath, page) {
|
53
|
-
const source = source_1.getSourceFile(host, routingModulePath);
|
53
|
+
const source = (0, source_1.getSourceFile)(host, routingModulePath);
|
54
54
|
const content = source.getText();
|
55
55
|
if (content.match(/path:\s*'\*\*'/g)) {
|
56
56
|
return;
|
57
57
|
}
|
58
|
-
const routes = routing_1.findRoutesInSource(source);
|
58
|
+
const routes = (0, routing_1.findRoutesInSource)(source);
|
59
59
|
const redirectRoute = ` {
|
60
60
|
path: '**',
|
61
61
|
redirectTo: '${core_1.strings.dasherize(page)}'
|
62
62
|
}`;
|
63
|
-
change_1.insertItemToArray(host, routingModulePath, routes, redirectRoute, { location: 'end' });
|
63
|
+
(0, change_1.insertItemToArray)(host, routingModulePath, routes, redirectRoute, { location: 'end' });
|
64
64
|
}
|
65
65
|
function addViewToRouting(options) {
|
66
66
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
@@ -69,14 +69,14 @@ function addViewToRouting(options) {
|
|
69
69
|
throw new schematics_1.SchematicsException('Specified module does not exist.');
|
70
70
|
}
|
71
71
|
addRedirectRoute(host, routingModulePath, options.name);
|
72
|
-
const source = source_1.getSourceFile(host, routingModulePath);
|
73
|
-
const routes = routing_1.findRoutesInSource(source);
|
72
|
+
const source = (0, source_1.getSourceFile)(host, routingModulePath);
|
73
|
+
const routes = (0, routing_1.findRoutesInSource)(source);
|
74
74
|
if (!routes) {
|
75
75
|
throw new schematics_1.SchematicsException('No routes found.');
|
76
76
|
}
|
77
|
-
if (!routing_1.hasComponentInRoutes(routes, options.name)) {
|
78
|
-
const route = routing_1.getRoute(options.name);
|
79
|
-
change_1.insertItemToArray(host, routingModulePath, routes, route);
|
77
|
+
if (!(0, routing_1.hasComponentInRoutes)(routes, options.name)) {
|
78
|
+
const route = (0, routing_1.getRoute)(options.name);
|
79
|
+
(0, change_1.insertItemToArray)(host, routingModulePath, routes, route);
|
80
80
|
}
|
81
81
|
return host;
|
82
82
|
});
|
@@ -96,10 +96,10 @@ function getModuleName(addRoute, moduleName) {
|
|
96
96
|
}
|
97
97
|
function addContentToView(options) {
|
98
98
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
99
|
-
const name = core_1.strings.dasherize(core_1.basename(core_1.normalize(options.name)));
|
100
|
-
const path = `${core_1.dirname(options.name)}/${name}`;
|
101
|
-
const title = string_1.humanize(name);
|
102
|
-
const componentPath = `/${yield project_1.getApplicationPath(host, options.project)}${path}/${name}.component.html`;
|
99
|
+
const name = core_1.strings.dasherize((0, core_1.basename)((0, core_1.normalize)(options.name)));
|
100
|
+
const path = `${(0, core_1.dirname)(options.name)}/${name}`;
|
101
|
+
const title = (0, string_1.humanize)(name);
|
102
|
+
const componentPath = `/${yield (0, project_1.getApplicationPath)(host, options.project)}${path}/${name}.component.html`;
|
103
103
|
if (host.exists(componentPath)) {
|
104
104
|
host.overwrite(componentPath, `<h2 class="content-block">${title}</h2>
|
105
105
|
<div class="content-block">
|
@@ -113,10 +113,10 @@ function addContentToView(options) {
|
|
113
113
|
function default_1(options) {
|
114
114
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
115
115
|
const addRoute = options.addRoute;
|
116
|
-
const project = yield project_1.getProjectName(host, options);
|
116
|
+
const project = yield (0, project_1.getProjectName)(host, options.project);
|
117
117
|
const module = getModuleName(addRoute, options.module);
|
118
118
|
const name = getPathForView(options.name);
|
119
|
-
const rules = [schematics_1.externalSchematic('@schematics/angular', 'component', {
|
119
|
+
const rules = [(0, schematics_1.externalSchematic)('@schematics/angular', 'component', {
|
120
120
|
name,
|
121
121
|
project,
|
122
122
|
module,
|
@@ -130,7 +130,7 @@ function default_1(options) {
|
|
130
130
|
rules.push(addViewToRouting({ name, project, module }));
|
131
131
|
rules.push(addViewToNavigation({ name, icon: options.icon, project }));
|
132
132
|
}
|
133
|
-
return schematics_1.chain(rules);
|
133
|
+
return (0, schematics_1.chain)(rules);
|
134
134
|
});
|
135
135
|
}
|
136
136
|
exports.default = default_1;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAMoC;AAEpC,yEAEiD;AAEjD,8CAE2B;AAE3B,gDAI4B;AAE5B,8CAAkD;AAElD,+CAA6E;AAE7E,gDAG4B;AAC5B,8CAA6C;AAE7C,SAAe,aAAa,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB;;QAC9E,MAAM,QAAQ,GAAG,MAAM,4BAAkB,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-view/index.ts
CHANGED
@@ -142,7 +142,7 @@ function addContentToView(options: any) {
|
|
142
142
|
export default function(options: any): Rule {
|
143
143
|
return async (host: Tree) => {
|
144
144
|
const addRoute = options.addRoute;
|
145
|
-
const project = await getProjectName(host, options);
|
145
|
+
const project = await getProjectName(host, options.project);
|
146
146
|
const module = getModuleName(addRoute, options.module);
|
147
147
|
const name = getPathForView(options.name);
|
148
148
|
|
package/src/install/index.js
CHANGED
@@ -17,33 +17,33 @@ const latest_versions_1 = require("../utility/latest-versions");
|
|
17
17
|
const modify_json_file_1 = require("../utility/modify-json-file");
|
18
18
|
const project_1 = require("../utility/project");
|
19
19
|
function default_1(options) {
|
20
|
-
return schematics_1.chain([
|
20
|
+
return (0, schematics_1.chain)([
|
21
21
|
(host) => addDevExtremeDependency(host, { dxversion: options.dxversion }),
|
22
22
|
(host) => addDevExtremeCSS(host, { project: options.project }),
|
23
23
|
(host) => reqisterJSZip(host),
|
24
24
|
(_, context) => {
|
25
25
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
26
|
-
}
|
26
|
+
},
|
27
27
|
]);
|
28
28
|
}
|
29
29
|
exports.default = default_1;
|
30
30
|
function addDevExtremeDependency(host, options) {
|
31
|
-
dependencies_1.addPackageJsonDependency(host, {
|
31
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
32
32
|
type: dependencies_1.NodeDependencyType.Default,
|
33
33
|
name: 'devextreme',
|
34
34
|
version: options.dxversion || latest_versions_1.latestVersions['devextreme']
|
35
35
|
});
|
36
|
-
dependencies_1.addPackageJsonDependency(host, {
|
36
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
37
37
|
type: dependencies_1.NodeDependencyType.Default,
|
38
38
|
name: 'devextreme-angular',
|
39
39
|
version: options.dxversion || latest_versions_1.latestVersions['devextreme-angular']
|
40
40
|
});
|
41
|
-
dependencies_1.addPackageJsonDependency(host, {
|
41
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
42
42
|
type: dependencies_1.NodeDependencyType.Dev,
|
43
43
|
name: 'devextreme-cli',
|
44
44
|
version: latest_versions_1.latestVersions['devextreme-cli']
|
45
45
|
});
|
46
|
-
dependencies_1.addPackageJsonDependency(host, {
|
46
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
47
47
|
type: dependencies_1.NodeDependencyType.Dev,
|
48
48
|
name: 'devextreme-themebuilder',
|
49
49
|
version: options.dxversion || latest_versions_1.latestVersions['devextreme']
|
@@ -52,15 +52,15 @@ function addDevExtremeDependency(host, options) {
|
|
52
52
|
}
|
53
53
|
function addDevExtremeCSS(host, options) {
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
55
|
-
const projectName = yield project_1.getProjectName(host, options.project);
|
56
|
-
modify_json_file_1.modifyJSONFile(host, './angular.json', config => {
|
57
|
-
return styles_1.addStylesToApp(projectName, config);
|
55
|
+
const projectName = yield (0, project_1.getProjectName)(host, options.project);
|
56
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './angular.json', config => {
|
57
|
+
return (0, styles_1.addStylesToApp)(projectName, config);
|
58
58
|
});
|
59
59
|
return host;
|
60
60
|
});
|
61
61
|
}
|
62
62
|
function reqisterJSZip(host) {
|
63
|
-
modify_json_file_1.modifyJSONFile(host, './tsconfig.app.json', config => {
|
63
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './tsconfig.app.json', config => {
|
64
64
|
const compilerOptions = config['compilerOptions'];
|
65
65
|
let paths = compilerOptions['paths'];
|
66
66
|
if (!paths) {
|
package/src/install/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAKoC;AAEpC,8CAAmD;AAEnD,2EAGkD;AAElD,4DAE0C;AAE1C,gEAA4D;AAC5D,kEAA6D;AAC7D,gDAAoD;AAEpD,mBAAwB,OAAY;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAKoC;AAEpC,8CAAmD;AAEnD,2EAGkD;AAElD,4DAE0C;AAE1C,gEAA4D;AAC5D,kEAA6D;AAC7D,gDAAoD;AAEpD,mBAAwB,OAAY;IAElC,OAAO,IAAA,kBAAK,EAAC;QACX,CAAC,IAAU,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;QAC/E,CAAC,IAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QACpE,CAAC,IAAU,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;QACnC,CAAC,CAAC,EAAE,OAAyB,EAAE,EAAE;YAC/B,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAChD,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAVD,4BAUC;AAED,SAAS,uBAAuB,CAAC,IAAU,EAAE,OAAY;IACvD,IAAA,uCAAwB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;QAChC,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO,CAAC,SAAS,IAAI,gCAAc,CAAC,YAAY,CAAC;KAC3D,CAAC,CAAC;IACH,IAAA,uCAAwB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;QAChC,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,OAAO,CAAC,SAAS,IAAI,gCAAc,CAAC,oBAAoB,CAAC;KACnE,CAAC,CAAC;IACH,IAAA,uCAAwB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iCAAkB,CAAC,GAAG;QAC5B,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,gCAAc,CAAC,gBAAgB,CAAC;KAC1C,CAAC,CAAC;IACH,IAAA,uCAAwB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iCAAkB,CAAC,GAAG;QAC5B,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,OAAO,CAAC,SAAS,IAAI,gCAAc,CAAC,YAAY,CAAC;KAC3D,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAe,gBAAgB,CAAC,IAAU,EAAE,OAAY;;QACtD,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,IAAA,iCAAc,EAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE;YAE9C,OAAO,IAAA,uBAAc,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,IAAU;IAC/B,IAAA,iCAAc,EAAC,IAAI,EAAE,qBAAqB,EAAE,MAAM,CAAC,EAAE;QACnD,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAClD,IAAI,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,EAAE,CAAC;SACZ;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YACnB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;SAC3D;QAED,eAAe,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAEjC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/src/install/index.ts
CHANGED
@@ -9,7 +9,7 @@ import { addStylesToApp } from '../utility/styles';
|
|
9
9
|
|
10
10
|
import {
|
11
11
|
NodeDependencyType,
|
12
|
-
addPackageJsonDependency
|
12
|
+
addPackageJsonDependency,
|
13
13
|
} from '@schematics/angular/utility/dependencies';
|
14
14
|
|
15
15
|
import {
|
@@ -21,13 +21,14 @@ import { modifyJSONFile } from '../utility/modify-json-file';
|
|
21
21
|
import { getProjectName } from '../utility/project';
|
22
22
|
|
23
23
|
export default function(options: any): Rule {
|
24
|
+
|
24
25
|
return chain([
|
25
26
|
(host: Tree) => addDevExtremeDependency(host, { dxversion: options.dxversion }),
|
26
27
|
(host: Tree) => addDevExtremeCSS(host, { project: options.project }),
|
27
28
|
(host: Tree) => reqisterJSZip(host),
|
28
29
|
(_, context: SchematicContext) => {
|
29
30
|
context.addTask(new NodePackageInstallTask());
|
30
|
-
}
|
31
|
+
},
|
31
32
|
]);
|
32
33
|
}
|
33
34
|
|
package/src/install/schema.json
CHANGED
package/src/utility/change.d.ts
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import { Tree } from '@angular-devkit/schematics';
|
2
2
|
import { Change } from '@schematics/angular/utility/change';
|
3
|
-
import { Node } from 'typescript';
|
3
|
+
import { Node } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
4
4
|
export declare function applyChanges(host: Tree, changes: Change[], filePath: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
|
5
5
|
export declare function insertItemToArray(host: Tree, filePath: string, node: Node, item: string, options?: {
|
6
6
|
location: 'start' | 'end';
|
package/src/utility/change.ts
CHANGED
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.latestVersions = void 0;
|
4
4
|
// TODO: implement
|
5
5
|
exports.latestVersions = {
|
6
|
-
'devextreme': '^
|
7
|
-
'devextreme-angular': '^
|
6
|
+
'devextreme': '^22.1.3',
|
7
|
+
'devextreme-angular': '^22.1.3',
|
8
8
|
'devextreme-cli': 'latest'
|
9
9
|
};
|
10
10
|
//# sourceMappingURL=latest-versions.js.map
|
@@ -7,7 +7,7 @@ const parseJson = (str) => {
|
|
7
7
|
exports.parseJson = parseJson;
|
8
8
|
function modifyJSONFile(host, path, callback) {
|
9
9
|
const serializedConfig = host.read(path).toString();
|
10
|
-
let obj = exports.parseJson(serializedConfig);
|
10
|
+
let obj = (0, exports.parseJson)(serializedConfig);
|
11
11
|
obj = callback(obj);
|
12
12
|
host.overwrite(path, `${JSON.stringify(obj, null, 2)}\n`);
|
13
13
|
return host;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"modify-json-file.js","sourceRoot":"","sources":["modify-json-file.ts"],"names":[],"mappings":";;;AAEO,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AAEF,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAY,EAAE,QAA2B;IAClF,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC;IACrD,IAAI,GAAG,GAAG,iBAAS,
|
1
|
+
{"version":3,"file":"modify-json-file.js","sourceRoot":"","sources":["modify-json-file.ts"],"names":[],"mappings":";;;AAEO,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AAEF,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAY,EAAE,QAA2B;IAClF,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC;IACrD,IAAI,GAAG,GAAG,IAAA,iBAAS,EAAC,gBAAgB,CAAC,CAAC;IAEtC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEpB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,IAAI,CAAC;AACd,CAAC;AATD,wCASC"}
|
package/src/utility/project.js
CHANGED
@@ -14,7 +14,7 @@ const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
14
14
|
function getProjectName(host, projectName) {
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
16
16
|
const projects = [];
|
17
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
17
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
18
18
|
/* tslint:disable-next-line:variable-name */
|
19
19
|
workspace.projects.forEach((_v, k) => {
|
20
20
|
projects.push(k);
|
@@ -32,7 +32,7 @@ function getApplicationPath(host, projectName) {
|
|
32
32
|
exports.getApplicationPath = getApplicationPath;
|
33
33
|
function getSourceRootPath(host, projectName) {
|
34
34
|
return __awaiter(this, void 0, void 0, function* () {
|
35
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
35
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
36
36
|
const project = workspace.projects.get(projectName);
|
37
37
|
return project && (project.sourceRoot || project.root);
|
38
38
|
});
|
@@ -40,7 +40,7 @@ function getSourceRootPath(host, projectName) {
|
|
40
40
|
exports.getSourceRootPath = getSourceRootPath;
|
41
41
|
function getRootPath(host, projectName) {
|
42
42
|
return __awaiter(this, void 0, void 0, function* () {
|
43
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
43
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
44
44
|
const project = workspace.projects.get(projectName);
|
45
45
|
return project && project.root;
|
46
46
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["project.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAqE;AAErE,SAAsB,cAAc,CAAC,IAAU,EAAE,WAAmB;;QAClE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,wBAAY,
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["project.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAqE;AAErE,SAAsB,cAAc,CAAC,IAAU,EAAE,WAAmB;;QAClE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,4CAA4C;QAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YACnC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACnF,CAAC;CAAA;AATD,wCASC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,WAAmB;;QACtE,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9D,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;IACxD,CAAC;CAAA;AAHD,gDAGC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,WAAmB;;QACrE,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,OAAO,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;CAAA;AAJD,8CAIC;AAED,SAAsB,WAAW,CAAC,IAAU,EAAE,WAAmB;;QAC/D,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,OAAO,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IACjC,CAAC;CAAA;AAJD,kCAIC"}
|
package/src/utility/routing.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Node, SourceFile } from 'typescript';
|
1
|
+
import { Node, SourceFile } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
2
2
|
export declare function hasComponentInRoutes(routes: Node, name: string): boolean;
|
3
3
|
export declare function getRoute(name: string): string;
|
4
4
|
export declare function findRoutesInSource(source: SourceFile): Node | undefined;
|
package/src/utility/routing.js
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.findRoutesInSource = exports.getRoute = exports.hasComponentInRoutes = void 0;
|
4
|
-
const typescript_1 = require("typescript");
|
4
|
+
const typescript_1 = require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript");
|
5
5
|
const core_1 = require("@angular-devkit/core");
|
6
6
|
function getRouteComponentName(pageName) {
|
7
|
-
return `${core_1.strings.classify(core_1.basename(core_1.normalize(pageName)))}Component`;
|
7
|
+
return `${core_1.strings.classify((0, core_1.basename)((0, core_1.normalize)(pageName)))}Component`;
|
8
8
|
}
|
9
9
|
function hasComponentInRoutes(routes, name) {
|
10
10
|
const routesText = routes.getText();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"routing.js","sourceRoot":"","sources":["routing.ts"],"names":[],"mappings":";;;AAAA
|
1
|
+
{"version":3,"file":"routing.js","sourceRoot":"","sources":["routing.ts"],"names":[],"mappings":";;;AAAA,+GAIwF;AAExF,+CAI8B;AAE9B,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAA,gBAAS,EAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC;AACvE,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAY,EAAE,IAAY;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IACpC,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AAClD,CAAC;AAJD,oDAIC;AAED,SAAgB,QAAQ,CAAC,IAAY;IACnC,OAAO;aACI,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC;iBACnB,qBAAqB,CAAC,IAAI,CAAC;;IAExC,CAAC;AACL,CAAC;AAND,4BAMC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,IAAY;IAC7C,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,iBAAiB;QAC/C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AACtC,CAAC;AAEH,SAAgB,kBAAkB,CAAC,MAAkB;IACnD,uCAAuC;IACvC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AARD,gDAQC"}
|
package/src/utility/routing.ts
CHANGED
package/src/utility/source.d.ts
CHANGED
@@ -1,3 +1,3 @@
|
|
1
1
|
import { Tree } from '@angular-devkit/schematics';
|
2
|
-
import { SourceFile } from 'typescript';
|
2
|
+
import { SourceFile } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
3
3
|
export declare function getSourceFile(host: Tree, filePath: string): SourceFile | undefined;
|
package/src/utility/source.js
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getSourceFile = void 0;
|
4
|
-
const typescript_1 = require("typescript");
|
4
|
+
const typescript_1 = require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript");
|
5
5
|
function getSourceFile(host, filePath) {
|
6
6
|
const buffer = host.read(filePath);
|
7
7
|
if (!buffer) {
|
8
8
|
return;
|
9
9
|
}
|
10
10
|
const serializedFile = host.read(filePath).toString();
|
11
|
-
return typescript_1.createSourceFile(filePath, serializedFile, typescript_1.ScriptTarget.Latest, true);
|
11
|
+
return (0, typescript_1.createSourceFile)(filePath, serializedFile, typescript_1.ScriptTarget.Latest, true);
|
12
12
|
}
|
13
13
|
exports.getSourceFile = getSourceFile;
|
14
14
|
//# sourceMappingURL=source.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"source.js","sourceRoot":"","sources":["source.ts"],"names":[],"mappings":";;;AACA
|
1
|
+
{"version":3,"file":"source.js","sourceRoot":"","sources":["source.ts"],"names":[],"mappings":";;;AACA,+GAIwF;AAExF,SAAgB,aAAa,CAAC,IAAU,EAAE,QAAgB;IACxD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,QAAQ,EAAE,CAAC;IACvD,OAAO,IAAA,6BAAgB,EAAC,QAAQ,EAAE,cAAc,EAAE,yBAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC;AARD,sCAQC"}
|
package/src/utility/source.ts
CHANGED
@@ -3,7 +3,7 @@ import {
|
|
3
3
|
createSourceFile,
|
4
4
|
ScriptTarget,
|
5
5
|
SourceFile
|
6
|
-
} from 'typescript';
|
6
|
+
} from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
7
7
|
|
8
8
|
export function getSourceFile(host: Tree, filePath: string): SourceFile | undefined {
|
9
9
|
const buffer = host.read(filePath);
|
package/src/utility/styles.js
CHANGED
@@ -23,7 +23,7 @@ function addStylesToApp(project, config, styles) {
|
|
23
23
|
styles.forEach((style) => {
|
24
24
|
projectStyles.unshift(style);
|
25
25
|
});
|
26
|
-
projectBuildOptopns['styles'] = array_1.makeArrayUnique(projectStyles);
|
26
|
+
projectBuildOptopns['styles'] = (0, array_1.makeArrayUnique)(projectStyles);
|
27
27
|
return config;
|
28
28
|
}
|
29
29
|
exports.addStylesToApp = addStylesToApp;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["styles.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,SAAS,WAAW,CAAC,aAAyB,EAAE,aAAkB;IAChE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpC,OAAO,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,cAAc,CAAC,OAAe,EAAE,MAAW,EAAE,MAAmB;IAC9E,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG;QACpB,+CAA+C;QAC/C,gDAAgD;KACjD,CAAC;IACF,IAAI,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,aAAa,CAAC;KACxB;SAAM;QACL,aAAa,GAAG,WAAW,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;KAC3D;IAED,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,mBAAmB,CAAC,QAAQ,CAAC,GAAG,uBAAe,
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["styles.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,SAAS,WAAW,CAAC,aAAyB,EAAE,aAAkB;IAChE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpC,OAAO,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,cAAc,CAAC,OAAe,EAAE,MAAW,EAAE,MAAmB;IAC9E,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG;QACpB,+CAA+C;QAC/C,gDAAgD;KACjD,CAAC;IACF,IAAI,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,aAAa,CAAC;KACxB;SAAM;QACL,aAAa,GAAG,WAAW,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;KAC3D;IAED,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,mBAAmB,CAAC,QAAQ,CAAC,GAAG,IAAA,uBAAe,EAAC,aAAa,CAAC,CAAC;IAE/D,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC"}
|