devextreme-schematics 1.4.1 → 1.4.2
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +4 -4
- package/src/add-app-template/index.js +14 -7
- package/src/add-app-template/index.js.map +1 -1
- package/src/add-app-template/index.ts +16 -9
- package/src/add-layout/index.js +2 -2
- package/src/add-layout/index.js.map +1 -1
- package/src/add-layout/index.ts +3 -5
- package/src/install/index.js +2 -2
- package/src/install/index.js.map +1 -1
- package/src/install/index.ts +3 -5
- package/src/utility/patch.d.ts +4 -0
- package/src/utility/patch.js +20 -0
- package/src/utility/patch.js.map +1 -0
- package/src/utility/patch.ts +14 -0
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "devextreme-schematics",
|
3
|
-
"version": "1.4.
|
3
|
+
"version": "1.4.2",
|
4
4
|
"description": "DevExtreme schematics",
|
5
5
|
"scripts": {
|
6
6
|
"build": "tsc -p tsconfig.json",
|
@@ -27,13 +27,13 @@
|
|
27
27
|
"@schematics/angular": "^12.0.0"
|
28
28
|
},
|
29
29
|
"devDependencies": {
|
30
|
-
"@types/jasmine": "~3.10.
|
30
|
+
"@types/jasmine": "~3.10.6",
|
31
31
|
"@types/node": "ts4.3",
|
32
|
-
"@types/semver": "^7.3.
|
32
|
+
"@types/semver": "^7.3.10",
|
33
33
|
"jasmine": "^2.8.0",
|
34
34
|
"rxjs": "^6.0.0",
|
35
35
|
"tslint": "^5.15.0",
|
36
36
|
"typescript": "^4.3.1"
|
37
37
|
},
|
38
|
-
"gitHead": "
|
38
|
+
"gitHead": "b48e36220ea219b061fb6db3aa58f48dbae70e5a"
|
39
39
|
}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
4
|
+
const fs_1 = require("fs");
|
4
5
|
const path_1 = require("path");
|
5
6
|
const child_process_1 = require("child_process");
|
6
7
|
function default_1(options) {
|
@@ -20,13 +21,7 @@ function default_1(options) {
|
|
20
21
|
// schematics installed packages with flag --ignore-scripts
|
21
22
|
// @angular/cli@14 add option allowScript to NodePackageInstallTask
|
22
23
|
(host) => {
|
23
|
-
|
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
|
-
});
|
24
|
+
postinstallScripts();
|
30
25
|
return host;
|
31
26
|
}
|
32
27
|
];
|
@@ -38,4 +33,16 @@ function default_1(options) {
|
|
38
33
|
return (0, schematics_1.chain)(rules);
|
39
34
|
}
|
40
35
|
exports.default = default_1;
|
36
|
+
const postinstallScripts = () => {
|
37
|
+
const isWin = /^win/.test(process.platform);
|
38
|
+
const sassEmbeddedPath = (0, path_1.resolve)('node_modules', 'sass-embedded');
|
39
|
+
const sassVendorPath = (0, path_1.join)(sassEmbeddedPath, 'dist', 'lib', 'src', 'vendor', 'dart-sass-embedded');
|
40
|
+
if (!(0, fs_1.existsSync)(sassVendorPath)) {
|
41
|
+
(0, child_process_1.spawnSync)('npm', ['run', 'postinstall'], {
|
42
|
+
cwd: (0, path_1.resolve)((0, path_1.join)('node_modules', 'sass-embedded')),
|
43
|
+
windowsVerbatimArguments: true,
|
44
|
+
shell: isWin ? false : true
|
45
|
+
});
|
46
|
+
}
|
47
|
+
};
|
41
48
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
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,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,2DAKoC;AAEpC,2BAAgC;AAChC,+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,kBAAkB,EAAE,CAAC;YACrB,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;AA7BD,4BA6BC;AAED,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,gBAAgB,GAAG,IAAA,cAAO,EAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IACpG,IAAI,CAAC,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;QAC/B,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE;YACvC,GAAG,EAAE,IAAA,cAAO,EAAC,IAAA,WAAI,EAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YACnD,wBAAwB,EAAE,IAAI;YAC9B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SAC5B,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}
|
@@ -5,6 +5,7 @@ import {
|
|
5
5
|
Tree,
|
6
6
|
} from '@angular-devkit/schematics';
|
7
7
|
|
8
|
+
import { existsSync } from 'fs';
|
8
9
|
import { resolve, join } from 'path';
|
9
10
|
|
10
11
|
import { spawnSync } from 'child_process';
|
@@ -26,15 +27,7 @@ export default function(options: any): Rule {
|
|
26
27
|
// schematics installed packages with flag --ignore-scripts
|
27
28
|
// @angular/cli@14 add option allowScript to NodePackageInstallTask
|
28
29
|
(host: Tree) => {
|
29
|
-
|
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
|
-
|
30
|
+
postinstallScripts();
|
38
31
|
return host;
|
39
32
|
}
|
40
33
|
];
|
@@ -47,3 +40,17 @@ export default function(options: any): Rule {
|
|
47
40
|
|
48
41
|
return chain(rules);
|
49
42
|
}
|
43
|
+
|
44
|
+
const postinstallScripts = () => {
|
45
|
+
const isWin = /^win/.test(process.platform);
|
46
|
+
|
47
|
+
const sassEmbeddedPath = resolve('node_modules', 'sass-embedded');
|
48
|
+
const sassVendorPath = join(sassEmbeddedPath, 'dist', 'lib', 'src', 'vendor', 'dart-sass-embedded');
|
49
|
+
if (!existsSync(sassVendorPath)) {
|
50
|
+
spawnSync('npm', ['run', 'postinstall'], {
|
51
|
+
cwd: resolve(join('node_modules', 'sass-embedded')),
|
52
|
+
windowsVerbatimArguments: true,
|
53
|
+
shell: isWin ? false : true
|
54
|
+
});
|
55
|
+
}
|
56
|
+
};
|
package/src/add-layout/index.js
CHANGED
@@ -18,12 +18,12 @@ const string_1 = require("../utility/string");
|
|
18
18
|
const styles_1 = require("../utility/styles");
|
19
19
|
const modify_json_file_1 = require("../utility/modify-json-file");
|
20
20
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
21
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
22
21
|
const source_1 = require("../utility/source");
|
23
22
|
const change_1 = require("../utility/change");
|
24
23
|
const routing_1 = require("../utility/routing");
|
25
24
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
26
25
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
26
|
+
const patch_1 = require("../utility/patch");
|
27
27
|
const projectFilesSource = './files/src';
|
28
28
|
const workspaceFilesSource = './files';
|
29
29
|
function addScriptSafe(scripts, name, value) {
|
@@ -264,7 +264,7 @@ function default_1(options) {
|
|
264
264
|
}
|
265
265
|
if (!options.skipInstall) {
|
266
266
|
rules.push((_, context) => {
|
267
|
-
context.addTask(new
|
267
|
+
context.addTask(new patch_1.PatchNodePackageInstallTask());
|
268
268
|
});
|
269
269
|
}
|
270
270
|
if (override) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAcoC;AAMpC,+CAA+C;AAE/C,+BAAsC;AAEtC,mCAAgC;AAEhC,gDAI6B;AAE7B,8CAE2B;AAE3B,8CAE4B;AAE5B,kEAGsC;AAEtC,2EAGkD;AAElD,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-layout/index.ts
CHANGED
@@ -48,10 +48,6 @@ import {
|
|
48
48
|
addPackageJsonDependency
|
49
49
|
} from '@schematics/angular/utility/dependencies';
|
50
50
|
|
51
|
-
import {
|
52
|
-
NodePackageInstallTask
|
53
|
-
} from '@angular-devkit/schematics/tasks';
|
54
|
-
|
55
51
|
import { getSourceFile } from '../utility/source';
|
56
52
|
|
57
53
|
import {
|
@@ -72,6 +68,8 @@ import {
|
|
72
68
|
import { getWorkspace } from '@schematics/angular/utility/workspace';
|
73
69
|
import { Change } from '@schematics/angular/utility/change';
|
74
70
|
|
71
|
+
import { PatchNodePackageInstallTask } from '../utility/patch';
|
72
|
+
|
75
73
|
const projectFilesSource = './files/src';
|
76
74
|
const workspaceFilesSource = './files';
|
77
75
|
|
@@ -371,7 +369,7 @@ export default function(options: any): Rule {
|
|
371
369
|
|
372
370
|
if (!options.skipInstall) {
|
373
371
|
rules.push((_: Tree, context: SchematicContext) => {
|
374
|
-
context.addTask(new
|
372
|
+
context.addTask(new PatchNodePackageInstallTask());
|
375
373
|
});
|
376
374
|
}
|
377
375
|
|
package/src/install/index.js
CHANGED
@@ -12,17 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const schematics_1 = require("@angular-devkit/schematics");
|
13
13
|
const styles_1 = require("../utility/styles");
|
14
14
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
15
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
16
15
|
const latest_versions_1 = require("../utility/latest-versions");
|
17
16
|
const modify_json_file_1 = require("../utility/modify-json-file");
|
18
17
|
const project_1 = require("../utility/project");
|
18
|
+
const patch_1 = require("../utility/patch");
|
19
19
|
function default_1(options) {
|
20
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
|
-
context.addTask(new
|
25
|
+
context.addTask(new patch_1.PatchNodePackageInstallTask());
|
26
26
|
},
|
27
27
|
]);
|
28
28
|
}
|
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,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAKoC;AAEpC,8CAAmD;AAEnD,2EAGkD;AAElD,gEAA4D;AAC5D,kEAA6D;AAC7D,gDAAoD;AAEpD,4CAA+D;AAE/D,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,mCAA2B,EAAE,CAAC,CAAC;QACrD,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
@@ -12,14 +12,12 @@ import {
|
|
12
12
|
addPackageJsonDependency,
|
13
13
|
} from '@schematics/angular/utility/dependencies';
|
14
14
|
|
15
|
-
import {
|
16
|
-
NodePackageInstallTask
|
17
|
-
} from '@angular-devkit/schematics/tasks';
|
18
|
-
|
19
15
|
import { latestVersions } from '../utility/latest-versions';
|
20
16
|
import { modifyJSONFile } from '../utility/modify-json-file';
|
21
17
|
import { getProjectName } from '../utility/project';
|
22
18
|
|
19
|
+
import { PatchNodePackageInstallTask } from '../utility/patch';
|
20
|
+
|
23
21
|
export default function(options: any): Rule {
|
24
22
|
|
25
23
|
return chain([
|
@@ -27,7 +25,7 @@ export default function(options: any): Rule {
|
|
27
25
|
(host: Tree) => addDevExtremeCSS(host, { project: options.project }),
|
28
26
|
(host: Tree) => reqisterJSZip(host),
|
29
27
|
(_, context: SchematicContext) => {
|
30
|
-
context.addTask(new
|
28
|
+
context.addTask(new PatchNodePackageInstallTask());
|
31
29
|
},
|
32
30
|
]);
|
33
31
|
}
|
@@ -0,0 +1,20 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.PatchNodePackageInstallTask = void 0;
|
4
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
5
|
+
class PatchNodePackageInstallTask extends tasks_1.NodePackageInstallTask {
|
6
|
+
constructor() {
|
7
|
+
super(...arguments);
|
8
|
+
this.toConfiguration = () => {
|
9
|
+
const rootConfigurations = super.toConfiguration();
|
10
|
+
const customOptions = Object.assign({}, rootConfigurations.options, { allowScripts: true });
|
11
|
+
return {
|
12
|
+
name: rootConfigurations.name,
|
13
|
+
dependencies: rootConfigurations.dependencies,
|
14
|
+
options: customOptions
|
15
|
+
};
|
16
|
+
};
|
17
|
+
}
|
18
|
+
}
|
19
|
+
exports.PatchNodePackageInstallTask = PatchNodePackageInstallTask;
|
20
|
+
//# sourceMappingURL=patch.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"patch.js","sourceRoot":"","sources":["patch.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAE1E,MAAa,2BAA4B,SAAQ,8BAAsB;IAAvE;;QACI,oBAAe,GAAG,GAAQ,EAAE;YACxB,MAAM,kBAAkB,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5F,OAAO;gBACH,IAAI,EAAE,kBAAkB,CAAC,IAAI;gBAC7B,YAAY,EAAE,kBAAkB,CAAC,YAAY;gBAC7C,OAAO,EAAE,aAAa;aACzB,CAAC;QACN,CAAC,CAAA;IACL,CAAC;CAAA;AAXD,kEAWC"}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
2
|
+
|
3
|
+
export class PatchNodePackageInstallTask extends NodePackageInstallTask {
|
4
|
+
toConfiguration = (): any => {
|
5
|
+
const rootConfigurations = super.toConfiguration();
|
6
|
+
const customOptions = Object.assign({}, rootConfigurations.options, { allowScripts: true });
|
7
|
+
|
8
|
+
return {
|
9
|
+
name: rootConfigurations.name,
|
10
|
+
dependencies: rootConfigurations.dependencies,
|
11
|
+
options: customOptions
|
12
|
+
};
|
13
|
+
}
|
14
|
+
}
|