Skip to content

Commit

Permalink
chore(package): Just Update Prettier™
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Jan 10, 2019
1 parent e6d93f7 commit cb1f7c0
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 65 deletions.
7 changes: 1 addition & 6 deletions artifacts.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"ARTIFACTS": [
"lib",
"lib-esm",
"release",
"package.json"
]
"ARTIFACTS": ["lib", "lib-esm", "release", "package.json"]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
"karma-super-dots-reporter": "^0.2.0",
"karma-webpack": "^3.0.5",
"lodash": "^4.17.11",
"prettier": "^1.14.2",
"pretty-quick": "^1.6.0",
"prettier": "^1.15.3",
"pretty-quick": "^1.8.0",
"rollup": "^0.65.2",
"rollup-plugin-node-resolve": "^3.4.0",
"rollup-plugin-sourcemaps": "^0.4.2",
Expand Down
12 changes: 6 additions & 6 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
const CONFIG = RESOLVE
? RESOLVE_CONFIG
: EVENTS
? EVENTS_CONFIG
: MONOLITHIC
? MONOLITHIC_ROUTER_CONFIG
: ROUTER
? ROUTER_CONFIG
: ROUTER_CONFIG;
? EVENTS_CONFIG
: MONOLITHIC
? MONOLITHIC_ROUTER_CONFIG
: ROUTER
? ROUTER_CONFIG
: ROUTER_CONFIG;

export default CONFIG;
16 changes: 8 additions & 8 deletions src/templateFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ export class TemplateFactory implements TemplateFactoryProvider {
return isDefined(config.template)
? asTemplate(this.fromString(config.template, params))
: isDefined(config.templateUrl)
? asTemplate(this.fromUrl(config.templateUrl, params))
: isDefined(config.templateProvider)
? asTemplate(this.fromProvider(config.templateProvider, params, context))
: isDefined(config.component)
? asComponent(config.component)
: isDefined(config.componentProvider)
? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
: asTemplate(defaultTemplate);
? asTemplate(this.fromUrl(config.templateUrl, params))
: isDefined(config.templateProvider)
? asTemplate(this.fromProvider(config.templateProvider, params, context))
: isDefined(config.component)
? asComponent(config.component)
: isDefined(config.componentProvider)
? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
: asTemplate(defaultTemplate);
}

/**
Expand Down
6 changes: 2 additions & 4 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
"moduleResolution": "node",
"module": "commonjs",
"target": "es5",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"allowSyntheticDefaultImports": true,
"outDir": "../.testlib",
"declaration": false,
"sourceMap": false
},
"include": [
"*.ts"
]
"include": ["*.ts"]
}
4 changes: 2 additions & 2 deletions test/typescript2.2/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"compilerOptions": {
"moduleResolution": "node",
"module": "commonjs",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"noImplicitAny": true,
"noEmit": true,
"target": "es5",
"typeRoots": ["node_modules/@types"]
},
"files": [ "index.ts" ]
"files": ["index.ts"]
}
4 changes: 2 additions & 2 deletions test/typescript2.3/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"compilerOptions": {
"moduleResolution": "node",
"module": "commonjs",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"noImplicitAny": true,
"noEmit": true,
"target": "es5",
"typeRoots": ["node_modules/@types"]
},
"files": [ "index.ts" ]
"files": ["index.ts"]
}
4 changes: 2 additions & 2 deletions test/typescript2.4/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"compilerOptions": {
"moduleResolution": "node",
"module": "commonjs",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"noImplicitAny": true,
"noEmit": true,
"target": "es5",
"typeRoots": ["node_modules/@types"]
},
"files": [ "index.ts" ]
"files": ["index.ts"]
}
4 changes: 2 additions & 2 deletions test/typescript2.5/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"compilerOptions": {
"moduleResolution": "node",
"module": "commonjs",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"noImplicitAny": true,
"noEmit": true,
"target": "es5",
"typeRoots": ["node_modules/@types"]
},
"files": [ "index.ts" ]
"files": ["index.ts"]
}
4 changes: 2 additions & 2 deletions test/typescript2.6/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"compilerOptions": {
"moduleResolution": "node",
"module": "commonjs",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"noImplicitAny": true,
"noEmit": true,
"target": "es5",
"typeRoots": ["node_modules/@types"]
},
"files": [ "index.ts" ]
"files": ["index.ts"]
}
8 changes: 2 additions & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
"moduleResolution": "node",
"module": "commonjs",
"target": "es5",
"lib": [ "es6", "dom" ],
"lib": ["es6", "dom"],
"allowSyntheticDefaultImports": true,
"outDir": "lib",
"declaration": true,
"skipLibCheck": true,
"sourceMap": true,
"inlineSources": true
},
"files": [
"src/index.ts",
"src/legacy/stateEvents.ts",
"src/legacy/resolveService.ts"
]
"files": ["src/index.ts", "src/legacy/stateEvents.ts", "src/legacy/resolveService.ts"]
}
42 changes: 25 additions & 17 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"extends": [ "tslint-eslint-rules" ],
"extends": ["tslint-eslint-rules"],
"rules": {
"align": [true, "parameters", "statements"],
"ban": false,
"class-name": true,
"comment-format": [ true, "check-space" ],
"comment-format": [true, "check-space"],
"curly": false,
"eofline": true,
"forin": true,
"indent": [ true, "spaces" ],
"indent": [true, "spaces"],
"label-position": true,
"max-line-length": [true, 180],
"member-access": false,
"member-ordering": [ true, "static-before-instance", "variables-before-functions" ],
"member-ordering": [true, "static-before-instance", "variables-before-functions"],
"no-arg": true,
"no-bitwise": true,
"no-conditional-assignment": true,
"no-console": [ true, "log", "warn", "debug", "info", "time", "timeEnd", "trace" ],
"no-console": [true, "log", "warn", "debug", "info", "time", "timeEnd", "trace"],
"no-construct": true,
"no-debugger": true,
"no-duplicate-variable": true,
Expand All @@ -27,25 +27,33 @@
"no-string-literal": false,
"no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
"no-unused-expression": [ true, "allow-fast-null-checks" ],
"no-unused-expression": [true, "allow-fast-null-checks"],
"no-unused-variable": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-curly-spacing": "always",
"object-literal-sort-keys": false,
"one-line": [ true, "check-catch", "check-else", "check-open-brace", "check-whitespace" ],
"prefer-const": [ true, { "destructuring": "all" } ],
"quotemark": [ true, "single", "avoid-escape", "jsx-double" ],
"one-line": [true, "check-catch", "check-else", "check-open-brace", "check-whitespace"],
"prefer-const": [true, { "destructuring": "all" }],
"quotemark": [true, "single", "avoid-escape", "jsx-double"],
"radix": true,
"semicolon": [ true, "always", "ignore-bound-class-methods", "ignore-interfaces" ],
"trailing-comma": [true, {"multiline": "always", "singleline": "never"}],
"triple-equals": [ true, "allow-null-check" ],
"typedef": [ "call-signature", "property-declaration" ],
"typedef-whitespace": [ true, { "call-signature": "nospace", "index-signature": "nospace", "parameter": "nospace", "property-declaration": "nospace", "variable-declaration": "nospace" } ],
"variable-name": [ true, "ban-keywords", "allow-leading-underscore" ],
"whitespace": [ true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type" ],
"semicolon": [true, "always", "ignore-bound-class-methods", "ignore-interfaces"],
"trailing-comma": [true, { "multiline": "always", "singleline": "never" }],
"triple-equals": [true, "allow-null-check"],
"typedef": ["call-signature", "property-declaration"],
"typedef-whitespace": [
true,
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
}
],
"variable-name": [true, "ban-keywords", "allow-leading-underscore"],
"whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
"jsx-no-multiline-js": false,
"jsx-no-lambda": false
}
}

14 changes: 8 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4094,17 +4094,19 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"

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

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

pretty-quick@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.6.0.tgz#afc3591eb5c4cf37614a305d489a8a40e57c9258"
pretty-quick@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.8.0.tgz#067ebe744ddb4e1ed4e1ee1af9648815121f78fc"
integrity sha512-qV25sQF/ivJpdZ5efwemQYkQJa7sp3HqT/Vf/7z5vGYMcq1VrT2lDpFKAxJPf6219N1YAdR8mGkIhPAZ1odTmQ==
dependencies:
chalk "^2.3.0"
execa "^0.8.0"
Expand Down

0 comments on commit cb1f7c0

Please sign in to comment.