Skip to content

Commit 58c1a71

Browse files
committed
updating the d.ts for the cli config
1 parent ad486df commit 58c1a71

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

addon/ng2/models/json-schema/schema-class-factory.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ abstract class NonLeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
132132
}
133133

134134
// Helper function to create a child based on its schema.
135-
protected _createChildProperty<T>(
136-
name: string, value: T, forward: SchemaTreeNode<T>, schema: Object,
137-
define = true): SchemaTreeNode<T> {
135+
protected _createChildProperty<T>(name: string, value: T, forward: SchemaTreeNode<T>,
136+
schema: Object, define = true): SchemaTreeNode<T> {
138137
const type = schema['type'];
139138
let Klass: TreeNodeConstructor = null;
140139

@@ -174,7 +173,6 @@ class ObjectSchemaTreeNode extends NonLeafSchemaTreeNode<Object> {
174173
}
175174
this._children = Object.create(null);
176175
this._value = Object.create(null);
177-
this._value[kSchemaNode] = this;
178176

179177
if (schema['properties']) {
180178
for (const name of Object.keys(schema['properties'])) {
@@ -238,7 +236,6 @@ class ArraySchemaTreeNode extends NonLeafSchemaTreeNode<Array> {
238236
}
239237
this._items = [];
240238
this._value = [];
241-
this._value[kSchemaNode] = this;
242239

243240
for (let index = 0; index < value.length; index++) {
244241
this._items[index] = this._createChildProperty(

addon/ng2/models/json-schema/schema-tree.ts

Whitespace-only changes.

addon/ng2/models/webpack-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class NgCliWebpackConfig {
3030
this.webpackDevConfigPartial = getWebpackDevConfigPartial(this.ngCliProject.root, appConfig);
3131
this.webpackProdConfigPartial = getWebpackProdConfigPartial(this.ngCliProject.root, appConfig);
3232

33-
if (CliConfig.fromProject().config.apps[0].mobile){
33+
if (appConfig.mobile){
3434
this.webpackMobileConfigPartial = getWebpackMobileConfigPartial(this.ngCliProject.root, appConfig);
3535
this.webpackMobileProdConfigPartial = getWebpackMobileProdConfigPartial(this.ngCliProject.root, appConfig);
3636
this.webpackBaseConfig = webpackMerge(this.webpackBaseConfig, this.webpackMobileConfigPartial);

lib/config/schema.d.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ export interface CliConfig {
2020
prefix?: string;
2121
mobile?: boolean;
2222
/**
23-
* Additional files to be included in the build.
23+
* Global styles to be included in the build.
2424
*/
25-
additionalEntries?: (string | {
26-
input?: string;
27-
output?: string;
28-
})[];
25+
styles?: string[];
26+
/**
27+
* Global scripts to be included in the build.
28+
*/
29+
scripts?: string[];
2930
/**
3031
* Name and corresponding file for environment config.
3132
*/

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"sinon": "^1.17.3",
122122
"through": "^2.3.8",
123123
"tree-kill": "^1.0.0",
124-
"ts-node": "^1.2.3",
125124
"tslint": "^3.8.1",
126125
"walk-sync": "^0.2.6"
127126
}

0 commit comments

Comments
 (0)