Merge pull request #9565 from guardian/sndrs/remove-yarn@1-pt3

Author: sndrs

dotcom-rendering/README.md

@@ -191,7 +191,13 @@ We recommend you update your workspace settings to automatically fix formatting
     >Preferences: Open Settings (JSON)
     ```
 
-2. Add the key value `"tslint.autoFixOnSave": true,`
+2. Add the following:
+
+    ```
+    "editor.codeActionsOnSave": {
+    	"source.fixAll.eslint": true
+    }
+    ```
 
 If you prefer not to use an editor like VSCode then you can use the following commands to manage formatting and (try to fix) linting errors:
 

dotcom-rendering/docs/contributing/code-style.md

@@ -20,7 +20,7 @@
 
 ## TypeScript
 
-We use TSlint and [Prettier](https://prettier.io/) to enforce our TypeScript code style.
+We use ESlint and [Prettier](https://prettier.io/) to enforce our TypeScript code style.
 Running `make fix` after making any changes will fix most things.
 
 There are some styles the linter can't pick up. If you are unsure of anything, [Excel Micro's fork of AirBnB's style

dotcom-rendering/package.json

@@ -139,7 +139,6 @@
 		"@types/yarnpkg__lockfile": "1.1.6",
 		"@types/youtube": "0.0.47",
 		"@typescript-eslint/eslint-plugin": "5.61.0",
-		"@typescript-eslint/eslint-plugin-tslint": "5.61.0",
 		"@typescript-eslint/parser": "5.61.0",
 		"@yarnpkg/lockfile": "1.1.0",
 		"ajv": "8.12.0",
@@ -250,8 +249,9 @@
 		"trusted-types": "2.0.0",
 		"ts-loader": "9.4.3",
 		"ts-unused-exports": "8.0.5",
-		"tslib": "2.5.3",
+		"tslib": "2.6.2",
 		"type-fest": "4.6.0",
+		"typescript": "5.1.3",
 		"typescript-json-schema": "0.58.1",
 		"unified": "10.1.2",
 		"uuid": "9.0.1",

dotcom-rendering/src/components/Discussion/Dropdown.stories.tsx

@@ -82,12 +82,10 @@ const optionsWithNoneActive = [
 	{ ...threadOptions[2] },
 ];
 
-/* tslint:disable */
 export default {
 	component: Dropdown,
 	title: 'Discussion/Dropdown',
 };
-/* tslint:enable */
 
 export const DropdownActive = () => (
 	<Container>

package.json

@@ -41,8 +41,7 @@
 		"lint-staged": "13.2.1",
 		"npm-run-all": "^4.1.5",
 		"prettier": "3.0.3",
-		"tslib": "2.5.3",
-		"typescript": "5.1.3"
+		"tslib": "2.6.2"
 	},
 	"resolutions": {
 		"**/crypto-js": "4.2.0"

yarn.lock

@@ -869,7 +869,7 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@^7.21.3", "@babel/core@^7.23.2":
+"@babel/core@^7.16.7", "@babel/core@^7.21.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
   integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
@@ -6978,13 +6978,6 @@
   resolved "https://registry.yarnpkg.com/@types/youtube/-/youtube-0.0.47.tgz#b6e24385ef3b8a6c972d7316d93e8e27c12d0e7c"
   integrity sha512-uwqm0DUeg+2pff/8y9b22JJb+qWKOcG5aCn2yyT7hmLdK/M8+VECcK6QuNqdAR93IAqTmZeqK2nizTlQg5j+XA==
 
-"@typescript-eslint/[email protected]":
-  version "5.61.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-5.61.0.tgz#122d1eb3349cafebd656b8dd14585e29190013f3"
-  integrity sha512-jfcNlcn1YyLlyETaNDOu6QAXpRu1/08ZYLebntf8BvqFfLEIODWB2/BI8JQKZhib4uML/72UrVFl/hvfVgr1FQ==
-  dependencies:
-    "@typescript-eslint/utils" "5.61.0"
-
 "@typescript-eslint/[email protected]":
   version "5.46.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz#098abb4c9354e19f460d57ab18bff1f676a6cff0"
@@ -9336,7 +9329,7 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-[email protected], crypto-js@^4.2.0:
+[email protected], crypto-js@^3.3.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
@@ -15627,7 +15620,7 @@ prebid.js@guardian/prebid.js#0b4cccd55ab4e170b36bb944e9bdd2807a9da1c5:
   version "7.54.5"
   resolved "https://codeload.github.com/guardian/prebid.js/tar.gz/0b4cccd55ab4e170b36bb944e9bdd2807a9da1c5"
   dependencies:
-    "@babel/core" "^7.23.2"
+    "@babel/core" "^7.16.7"
     "@babel/plugin-transform-runtime" "^7.18.9"
     "@babel/preset-env" "^7.16.8"
     "@babel/runtime" "^7.18.9"
@@ -17934,10 +17927,10 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
-  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
+tslib@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tslib@^1.11.1, tslib@^1.13.0, tslib@^1.8.1:
   version "1.14.1"