Skip to content

Commit cb1f7c0

Browse files
chore(package): Just Update Prettier™
1 parent e6d93f7 commit cb1f7c0

File tree

13 files changed

+64
-65
lines changed

13 files changed

+64
-65
lines changed

artifacts.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
{
2-
"ARTIFACTS": [
3-
"lib",
4-
"lib-esm",
5-
"release",
6-
"package.json"
7-
]
2+
"ARTIFACTS": ["lib", "lib-esm", "release", "package.json"]
83
}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
"karma-super-dots-reporter": "^0.2.0",
9797
"karma-webpack": "^3.0.5",
9898
"lodash": "^4.17.11",
99-
"prettier": "^1.14.2",
100-
"pretty-quick": "^1.6.0",
99+
"prettier": "^1.15.3",
100+
"pretty-quick": "^1.8.0",
101101
"rollup": "^0.65.2",
102102
"rollup-plugin-node-resolve": "^3.4.0",
103103
"rollup-plugin-sourcemaps": "^0.4.2",

rollup.config.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
119119
const CONFIG = RESOLVE
120120
? RESOLVE_CONFIG
121121
: EVENTS
122-
? EVENTS_CONFIG
123-
: MONOLITHIC
124-
? MONOLITHIC_ROUTER_CONFIG
125-
: ROUTER
126-
? ROUTER_CONFIG
127-
: ROUTER_CONFIG;
122+
? EVENTS_CONFIG
123+
: MONOLITHIC
124+
? MONOLITHIC_ROUTER_CONFIG
125+
: ROUTER
126+
? ROUTER_CONFIG
127+
: ROUTER_CONFIG;
128128

129129
export default CONFIG;

src/templateFactory.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ export class TemplateFactory implements TemplateFactoryProvider {
7070
return isDefined(config.template)
7171
? asTemplate(this.fromString(config.template, params))
7272
: isDefined(config.templateUrl)
73-
? asTemplate(this.fromUrl(config.templateUrl, params))
74-
: isDefined(config.templateProvider)
75-
? asTemplate(this.fromProvider(config.templateProvider, params, context))
76-
: isDefined(config.component)
77-
? asComponent(config.component)
78-
: isDefined(config.componentProvider)
79-
? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
80-
: asTemplate(defaultTemplate);
73+
? asTemplate(this.fromUrl(config.templateUrl, params))
74+
: isDefined(config.templateProvider)
75+
? asTemplate(this.fromProvider(config.templateProvider, params, context))
76+
: isDefined(config.component)
77+
? asComponent(config.component)
78+
: isDefined(config.componentProvider)
79+
? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
80+
: asTemplate(defaultTemplate);
8181
}
8282

8383
/**

test/tsconfig.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
"moduleResolution": "node",
66
"module": "commonjs",
77
"target": "es5",
8-
"lib": [ "es6", "dom" ],
8+
"lib": ["es6", "dom"],
99
"allowSyntheticDefaultImports": true,
1010
"outDir": "../.testlib",
1111
"declaration": false,
1212
"sourceMap": false
1313
},
14-
"include": [
15-
"*.ts"
16-
]
14+
"include": ["*.ts"]
1715
}

test/typescript2.2/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"lib": [ "es6", "dom" ],
5+
"lib": ["es6", "dom"],
66
"noImplicitAny": true,
77
"noEmit": true,
88
"target": "es5",
99
"typeRoots": ["node_modules/@types"]
1010
},
11-
"files": [ "index.ts" ]
11+
"files": ["index.ts"]
1212
}

test/typescript2.3/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"lib": [ "es6", "dom" ],
5+
"lib": ["es6", "dom"],
66
"noImplicitAny": true,
77
"noEmit": true,
88
"target": "es5",
99
"typeRoots": ["node_modules/@types"]
1010
},
11-
"files": [ "index.ts" ]
11+
"files": ["index.ts"]
1212
}

test/typescript2.4/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"lib": [ "es6", "dom" ],
5+
"lib": ["es6", "dom"],
66
"noImplicitAny": true,
77
"noEmit": true,
88
"target": "es5",
99
"typeRoots": ["node_modules/@types"]
1010
},
11-
"files": [ "index.ts" ]
11+
"files": ["index.ts"]
1212
}

test/typescript2.5/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"lib": [ "es6", "dom" ],
5+
"lib": ["es6", "dom"],
66
"noImplicitAny": true,
77
"noEmit": true,
88
"target": "es5",
99
"typeRoots": ["node_modules/@types"]
1010
},
11-
"files": [ "index.ts" ]
11+
"files": ["index.ts"]
1212
}

test/typescript2.6/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"lib": [ "es6", "dom" ],
5+
"lib": ["es6", "dom"],
66
"noImplicitAny": true,
77
"noEmit": true,
88
"target": "es5",
99
"typeRoots": ["node_modules/@types"]
1010
},
11-
"files": [ "index.ts" ]
11+
"files": ["index.ts"]
1212
}

tsconfig.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
"moduleResolution": "node",
66
"module": "commonjs",
77
"target": "es5",
8-
"lib": [ "es6", "dom" ],
8+
"lib": ["es6", "dom"],
99
"allowSyntheticDefaultImports": true,
1010
"outDir": "lib",
1111
"declaration": true,
1212
"skipLibCheck": true,
1313
"sourceMap": true,
1414
"inlineSources": true
1515
},
16-
"files": [
17-
"src/index.ts",
18-
"src/legacy/stateEvents.ts",
19-
"src/legacy/resolveService.ts"
20-
]
16+
"files": ["src/index.ts", "src/legacy/stateEvents.ts", "src/legacy/resolveService.ts"]
2117
}

tslint.json

+25-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
2-
"extends": [ "tslint-eslint-rules" ],
2+
"extends": ["tslint-eslint-rules"],
33
"rules": {
44
"align": [true, "parameters", "statements"],
55
"ban": false,
66
"class-name": true,
7-
"comment-format": [ true, "check-space" ],
7+
"comment-format": [true, "check-space"],
88
"curly": false,
99
"eofline": true,
1010
"forin": true,
11-
"indent": [ true, "spaces" ],
11+
"indent": [true, "spaces"],
1212
"label-position": true,
1313
"max-line-length": [true, 180],
1414
"member-access": false,
15-
"member-ordering": [ true, "static-before-instance", "variables-before-functions" ],
15+
"member-ordering": [true, "static-before-instance", "variables-before-functions"],
1616
"no-arg": true,
1717
"no-bitwise": true,
1818
"no-conditional-assignment": true,
19-
"no-console": [ true, "log", "warn", "debug", "info", "time", "timeEnd", "trace" ],
19+
"no-console": [true, "log", "warn", "debug", "info", "time", "timeEnd", "trace"],
2020
"no-construct": true,
2121
"no-debugger": true,
2222
"no-duplicate-variable": true,
@@ -27,25 +27,33 @@
2727
"no-string-literal": false,
2828
"no-switch-case-fall-through": true,
2929
"no-trailing-whitespace": true,
30-
"no-unused-expression": [ true, "allow-fast-null-checks" ],
30+
"no-unused-expression": [true, "allow-fast-null-checks"],
3131
"no-unused-variable": true,
3232
"no-use-before-declare": true,
3333
"no-var-keyword": true,
3434
"object-curly-spacing": "always",
3535
"object-literal-sort-keys": false,
36-
"one-line": [ true, "check-catch", "check-else", "check-open-brace", "check-whitespace" ],
37-
"prefer-const": [ true, { "destructuring": "all" } ],
38-
"quotemark": [ true, "single", "avoid-escape", "jsx-double" ],
36+
"one-line": [true, "check-catch", "check-else", "check-open-brace", "check-whitespace"],
37+
"prefer-const": [true, { "destructuring": "all" }],
38+
"quotemark": [true, "single", "avoid-escape", "jsx-double"],
3939
"radix": true,
40-
"semicolon": [ true, "always", "ignore-bound-class-methods", "ignore-interfaces" ],
41-
"trailing-comma": [true, {"multiline": "always", "singleline": "never"}],
42-
"triple-equals": [ true, "allow-null-check" ],
43-
"typedef": [ "call-signature", "property-declaration" ],
44-
"typedef-whitespace": [ true, { "call-signature": "nospace", "index-signature": "nospace", "parameter": "nospace", "property-declaration": "nospace", "variable-declaration": "nospace" } ],
45-
"variable-name": [ true, "ban-keywords", "allow-leading-underscore" ],
46-
"whitespace": [ true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type" ],
40+
"semicolon": [true, "always", "ignore-bound-class-methods", "ignore-interfaces"],
41+
"trailing-comma": [true, { "multiline": "always", "singleline": "never" }],
42+
"triple-equals": [true, "allow-null-check"],
43+
"typedef": ["call-signature", "property-declaration"],
44+
"typedef-whitespace": [
45+
true,
46+
{
47+
"call-signature": "nospace",
48+
"index-signature": "nospace",
49+
"parameter": "nospace",
50+
"property-declaration": "nospace",
51+
"variable-declaration": "nospace"
52+
}
53+
],
54+
"variable-name": [true, "ban-keywords", "allow-leading-underscore"],
55+
"whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
4756
"jsx-no-multiline-js": false,
4857
"jsx-no-lambda": false
4958
}
5059
}
51-

yarn.lock

+8-6
Original file line numberDiff line numberDiff line change
@@ -4094,17 +4094,19 @@ preserve@^0.2.0:
40944094
version "0.2.0"
40954095
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
40964096

4097-
prettier@^1.14.2:
4098-
version "1.14.2"
4099-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
4097+
prettier@^1.15.3:
4098+
version "1.15.3"
4099+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
4100+
integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
41004101

41014102
pretty-bytes@^4.0.2:
41024103
version "4.0.2"
41034104
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
41044105

4105-
pretty-quick@^1.6.0:
4106-
version "1.6.0"
4107-
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.6.0.tgz#afc3591eb5c4cf37614a305d489a8a40e57c9258"
4106+
pretty-quick@^1.8.0:
4107+
version "1.8.0"
4108+
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.8.0.tgz#067ebe744ddb4e1ed4e1ee1af9648815121f78fc"
4109+
integrity sha512-qV25sQF/ivJpdZ5efwemQYkQJa7sp3HqT/Vf/7z5vGYMcq1VrT2lDpFKAxJPf6219N1YAdR8mGkIhPAZ1odTmQ==
41084110
dependencies:
41094111
chalk "^2.3.0"
41104112
execa "^0.8.0"

0 commit comments

Comments
 (0)