Skip to content

Commit d391c97

Browse files
Merge pull request #114 from ember-codemods/dependabot/npm_and_yarn/prettier-1.18.2
2 parents bae1373 + bb13c57 commit d391c97

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"eslint-plugin-prettier": "^3.1.0",
3333
"execa": "^1.0.0",
3434
"jest": "^24.8.0",
35-
"prettier": "^1.17.1"
35+
"prettier": "^1.18.2"
3636
},
3737
"engines": {
3838
"node": "8.* || 10.* || >= 12.*"

transforms/helpers/parse-helper.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,7 @@ function replaceEmberObjectExpressions(j, root, filePath, options = {}) {
259259

260260
if (options.type && !isFileOfType(filePath, options.type)) {
261261
logger.warn(
262-
`[${filePath}]: FAILURE Type mismatch, expected type '${
263-
options.type
264-
}' did not match type of file`
262+
`[${filePath}]: FAILURE Type mismatch, expected type '${options.type}' did not match type of file`
265263
);
266264
return;
267265
}

transforms/helpers/validation-helper.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ function hasValidProps(
6565
!["actions", "queryParams"].includes(instanceProp.name)
6666
) {
6767
errors.push(
68-
`[${
69-
instanceProp.name
70-
}]: Transform not supported - value is of type object. For more details: eslint-plugin-ember/avoid-leaking-state-in-ember-objects`
68+
`[${instanceProp.name}]: Transform not supported - value is of type object. For more details: eslint-plugin-ember/avoid-leaking-state-in-ember-objects`
7169
);
7270
}
7371

@@ -83,27 +81,19 @@ function hasValidProps(
8381
(instanceProp.isCallExpression && !instanceProp.hasDecorators)
8482
) {
8583
errors.push(
86-
`[${
87-
instanceProp.name
88-
}]: Transform not supported - need option '--decorators=true' or the property type ${
89-
instanceProp.type
90-
} can not be transformed`
84+
`[${instanceProp.name}]: Transform not supported - need option '--decorators=true' or the property type ${instanceProp.type} can not be transformed`
9185
);
9286
}
9387

9488
if (instanceProp.hasModifierWithArgs) {
9589
errors.push(
96-
`[${
97-
instanceProp.name
98-
}]: Transform not supported - value has modifiers like 'property' or 'meta'`
90+
`[${instanceProp.name}]: Transform not supported - value has modifiers like 'property' or 'meta'`
9991
);
10092
}
10193

10294
if (instanceProp.hasVolatile && instanceProp.hasMetaDecorator) {
10395
errors.push(
104-
`[${
105-
instanceProp.name
106-
}]: Transform not supported - value has 'volatile' modifier with computed meta ('@ember/object/computed') is not supported`
96+
`[${instanceProp.name}]: Transform not supported - value has 'volatile' modifier with computed meta ('@ember/object/computed') is not supported`
10797
);
10898
}
10999
return errors;

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4116,10 +4116,10 @@ prettier-linter-helpers@^1.0.0:
41164116
dependencies:
41174117
fast-diff "^1.1.2"
41184118

4119-
prettier@^1.17.1:
4120-
version "1.17.1"
4121-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
4122-
integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
4119+
prettier@^1.18.2:
4120+
version "1.18.2"
4121+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
4122+
integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
41234123

41244124
pretty-format@^24.8.0:
41254125
version "24.8.0"

0 commit comments

Comments
 (0)