From 9439b6efc32f37b9e348c9aeff91c2670ba71246 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 19 Jul 2024 07:50:38 -0400 Subject: [PATCH 1/3] chore(website): correct version to be v8, not latest merged v7 --- packages/website/docusaurus.config.mts | 4 ++-- packages/website/src/components/OptionsSelector.tsx | 2 +- packages/website/webpack.plugin.js | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/website/docusaurus.config.mts b/packages/website/docusaurus.config.mts index 369a6fd7210b..214b715b5979 100644 --- a/packages/website/docusaurus.config.mts +++ b/packages/website/docusaurus.config.mts @@ -91,8 +91,8 @@ const themeConfig: AlgoliaThemeConfig & ThemeCommonConfig = { }, { position: 'right', - href: `https://github.com/typescript-eslint/typescript-eslint/releases/tag/v${version}`, - label: `v${version}`, + href: `https://github.com/blog/announcing-typescript-eslint-v8-beta`, + label: `v8`, }, { to: 'play', diff --git a/packages/website/src/components/OptionsSelector.tsx b/packages/website/src/components/OptionsSelector.tsx index aa31f79ad702..d809ff6c8345 100644 --- a/packages/website/src/components/OptionsSelector.tsx +++ b/packages/website/src/components/OptionsSelector.tsx @@ -74,7 +74,7 @@ function OptionsSelectorContent({ /> {process.env.ESLINT_VERSION} - {process.env.TS_ESLINT_VERSION} + {process.env.TS_ESLINT_VERSION} diff --git a/packages/website/webpack.plugin.js b/packages/website/webpack.plugin.js index ab5dd29767fd..d79c8e1f6d4a 100644 --- a/packages/website/webpack.plugin.js +++ b/packages/website/webpack.plugin.js @@ -21,9 +21,7 @@ module.exports = function (/*context, options*/) { 'process.env.ESLINT_VERSION': JSON.stringify( require('eslint/package.json').version, ), - 'process.env.TS_ESLINT_VERSION': JSON.stringify( - require('@typescript-eslint/eslint-plugin/package.json').version, - ), + 'process.env.TS_ESLINT_VERSION': JSON.stringify('v8'), }), new CopyPlugin({ patterns: [ From 9b875a01d132de4313c18aca5955f1d5ed55773e Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 19 Jul 2024 07:58:15 -0400 Subject: [PATCH 2/3] Correct docusaurus.config.mts --- packages/website/docusaurus.config.mts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/website/docusaurus.config.mts b/packages/website/docusaurus.config.mts index 214b715b5979..43d23cba1a1f 100644 --- a/packages/website/docusaurus.config.mts +++ b/packages/website/docusaurus.config.mts @@ -8,7 +8,6 @@ import type { UserThemeConfig as ThemeCommonConfig } from '@docusaurus/theme-com import type { UserThemeConfig as AlgoliaThemeConfig } from '@docusaurus/theme-search-algolia'; import type { Config } from '@docusaurus/types'; -import { version } from './package.json'; import { blogFooter } from './plugins/blog-footer'; import { generatedRuleDocs } from './plugins/generated-rule-docs'; import { rulesMeta } from './rulesMeta'; @@ -91,7 +90,7 @@ const themeConfig: AlgoliaThemeConfig & ThemeCommonConfig = { }, { position: 'right', - href: `https://github.com/blog/announcing-typescript-eslint-v8-beta`, + href: `/blog/announcing-typescript-eslint-v8-beta`, label: `v8`, }, { From 5456ea95539f37bc2b62670b7a3b10800806b4e5 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 19 Jul 2024 09:42:45 -0400 Subject: [PATCH 3/3] TODOs --- packages/website/docusaurus.config.mts | 1 + packages/website/webpack.plugin.js | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/website/docusaurus.config.mts b/packages/website/docusaurus.config.mts index 43d23cba1a1f..46b162fcbfb7 100644 --- a/packages/website/docusaurus.config.mts +++ b/packages/website/docusaurus.config.mts @@ -91,6 +91,7 @@ const themeConfig: AlgoliaThemeConfig & ThemeCommonConfig = { { position: 'right', href: `/blog/announcing-typescript-eslint-v8-beta`, + // TODO: Move back to package.json's version shortly after v8 launches label: `v8`, }, { diff --git a/packages/website/webpack.plugin.js b/packages/website/webpack.plugin.js index d79c8e1f6d4a..ab36087b3242 100644 --- a/packages/website/webpack.plugin.js +++ b/packages/website/webpack.plugin.js @@ -21,6 +21,7 @@ module.exports = function (/*context, options*/) { 'process.env.ESLINT_VERSION': JSON.stringify( require('eslint/package.json').version, ), + // TODO: Move back to package.json's version shortly after v8 launches 'process.env.TS_ESLINT_VERSION': JSON.stringify('v8'), }), new CopyPlugin({