diff --git a/.prettierrc b/.prettierrc index 5e5702b65..ac7f3d77c 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,8 +2,7 @@ "semi": false, "singleQuote": true, "printWidth": 100, - "parser": "typescript", "trailingComma": "none", "arrowParens": "avoid", - "endOfLine": "lf" + "endOfLine": "auto" } diff --git a/package.json b/package.json index 4b5d98a63..7408b58ea 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "jest-html-reporter": "^3.2.0", "jsdoc": "3.6.11", "jsdom": "^19.0.0", - "prettier": "^3.5.2", + "prettier": "^3.6.2", "ts-jest": "^29.0.0", "typescript": "^4.0.3", "typescript-eslint": "^8.8.1" diff --git a/renovate.json b/renovate.json index 5c3be5909..014af916a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,16 +1,12 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base", ":dependencyDashboard", "group:allNonMajor", ":label(dependencies)" - ], - "major": { - "dependencyDashboardApproval": true - }, + "extends": ["config:recommended", ":dependencyDashboard", ":label(dependencies)"], "packageRules": [ - { - "matchPackagePatterns": ["*"], - "rangeStrategy": "update-lockfile" - } + { + "rangeStrategy": "update-lockfile", + "matchPackageNames": ["*"], + "minimumReleaseAge": "5 days" + } ], "enabledManagers": ["npm"] } diff --git a/src/createContext.ts b/src/createContext.ts index 2b526a320..84e74c51c 100644 --- a/src/createContext.ts +++ b/src/createContext.ts @@ -277,7 +277,7 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn if (s.length === 1 && s[0] !== undefined && typeof s[0] !== 'string') { throw new TypeError('display expects the second argument to be a string') } - return rawDisplay(stringify(v), s[0]), v + return (rawDisplay(stringify(v), s[0]), v) } const displayList = (v: Value, ...s: string[]) => { if (s.length === 1 && s[0] !== undefined && typeof s[0] !== 'string') { diff --git a/yarn.lock b/yarn.lock index f165ce6e4..fa64dd9a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5377,7 +5377,7 @@ __metadata: jsdoc: "npm:3.6.11" jsdom: "npm:^19.0.0" lodash: "npm:^4.17.21" - prettier: "npm:^3.5.2" + prettier: "npm:^3.6.2" source-map: "npm:0.7.3" ts-jest: "npm:^29.0.0" typescript: "npm:^4.0.3" @@ -6456,12 +6456,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.5.2": - version: 3.5.2 - resolution: "prettier@npm:3.5.2" +"prettier@npm:^3.6.2": + version: 3.6.2 + resolution: "prettier@npm:3.6.2" bin: prettier: bin/prettier.cjs - checksum: 10c0/d7b597ed33f39c32ace675896ad187f06a3e48dc8a1e80051b5c5f0dae3586d53981704b8fda5ac3b080e6c2e0e197d239131b953702674f044351621ca5e1ac + checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812 languageName: node linkType: hard