From 8f8819e34ae586c7a93aa45a598327188170fdc6 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Mon, 7 Jul 2025 10:46:11 +0200 Subject: [PATCH 1/3] General cleanup --- packages/common/src/util/stringUtils.ts | 2 +- .../cursorless-org-docs/docusaurus.config.mts | 2 +- packages/cursorless-org-docs/sidebar.js | 4 +-- .../src/plugins/tailwind-plugin.js | 9 ------- .../src/plugins/tailwind-plugin.ts | 20 +++++++++++++++ .../src/updateLanguageScopeSupportConfig.ts | 25 ------------------- 6 files changed, 23 insertions(+), 39 deletions(-) delete mode 100644 packages/cursorless-org-docs/src/plugins/tailwind-plugin.js create mode 100644 packages/cursorless-org-docs/src/plugins/tailwind-plugin.ts delete mode 100644 packages/meta-updater/src/updateLanguageScopeSupportConfig.ts diff --git a/packages/common/src/util/stringUtils.ts b/packages/common/src/util/stringUtils.ts index 037e182bc1..5bccc78d45 100644 --- a/packages/common/src/util/stringUtils.ts +++ b/packages/common/src/util/stringUtils.ts @@ -10,7 +10,7 @@ */ export function camelCaseToAllDown(input: string): string { return input - .replace(/([A-Z])/g, " $1") + .replace(/(?<=[a-z0-9])([A-Z])/g, " $1") .split(" ") .map((word) => word.toLowerCase()) .join(" "); diff --git a/packages/cursorless-org-docs/docusaurus.config.mts b/packages/cursorless-org-docs/docusaurus.config.mts index caa2891f51..e96a0adaad 100644 --- a/packages/cursorless-org-docs/docusaurus.config.mts +++ b/packages/cursorless-org-docs/docusaurus.config.mts @@ -146,7 +146,7 @@ const config: Config = { }, ], ], - plugins: ["./src/plugins/tailwind-plugin.js"], + plugins: ["./src/plugins/tailwind-plugin.ts"], themeConfig: { navbar: { diff --git a/packages/cursorless-org-docs/sidebar.js b/packages/cursorless-org-docs/sidebar.js index 7d2ad5d0c4..a3f8b9bc3c 100644 --- a/packages/cursorless-org-docs/sidebar.js +++ b/packages/cursorless-org-docs/sidebar.js @@ -1,9 +1,7 @@ // @ts-check /** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ -const sidebars = { +export default { user: [{ type: "autogenerated", dirName: "user" }], contributing: [{ type: "autogenerated", dirName: "contributing" }], }; - -export default sidebars; diff --git a/packages/cursorless-org-docs/src/plugins/tailwind-plugin.js b/packages/cursorless-org-docs/src/plugins/tailwind-plugin.js deleted file mode 100644 index 2effd7d567..0000000000 --- a/packages/cursorless-org-docs/src/plugins/tailwind-plugin.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = function tailwindPlugin(context, options) { - return { - name: "tailwind-plugin", - configurePostCss(postcssOptions) { - postcssOptions.plugins.push(require("tailwindcss")); - return postcssOptions; - }, - }; -}; diff --git a/packages/cursorless-org-docs/src/plugins/tailwind-plugin.ts b/packages/cursorless-org-docs/src/plugins/tailwind-plugin.ts new file mode 100644 index 0000000000..890b305ecb --- /dev/null +++ b/packages/cursorless-org-docs/src/plugins/tailwind-plugin.ts @@ -0,0 +1,20 @@ +import type { + LoadContext, + PluginOptions, + PostCssOptions, +} from "@docusaurus/types"; +import tailwindcss from "tailwindcss"; + +export default function tailwindPlugin( + _context: LoadContext, + _options: PluginOptions, +) { + return { + name: "tailwind-plugin", + + configurePos1tCss(postcssOptions: PostCssOptions): PostCssOptions { + postcssOptions.plugins.push(tailwindcss); + return postcssOptions; + }, + }; +} diff --git a/packages/meta-updater/src/updateLanguageScopeSupportConfig.ts b/packages/meta-updater/src/updateLanguageScopeSupportConfig.ts deleted file mode 100644 index 57c3b6e82c..0000000000 --- a/packages/meta-updater/src/updateLanguageScopeSupportConfig.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { FormatPluginFnOptions } from "@pnpm/meta-updater"; - -export function updateLanguageMdxConfig( - languageId: string, - actual: string | null, - options: FormatPluginFnOptions, -): string | null { - if (options.manifest.name !== "@cursorless/cursorless-org-docs") { - return null; - } - - if (actual != null) { - return actual; - } - - const expected = ` -import { Language } from "./components/Language"; - -# ${languageId} - - -`.trimStart(); - - return expected; -} From 3ceabbf9dd7c4e9be0a4ff596612ff21047f0af3 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Mon, 7 Jul 2025 10:52:23 +0200 Subject: [PATCH 2/3] sidebar --- packages/cursorless-org-docs/docusaurus.config.mts | 2 +- packages/cursorless-org-docs/{sidebar.js => sidebar.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/cursorless-org-docs/{sidebar.js => sidebar.ts} (100%) diff --git a/packages/cursorless-org-docs/docusaurus.config.mts b/packages/cursorless-org-docs/docusaurus.config.mts index e96a0adaad..b02c36c226 100644 --- a/packages/cursorless-org-docs/docusaurus.config.mts +++ b/packages/cursorless-org-docs/docusaurus.config.mts @@ -135,7 +135,7 @@ const config: Config = { routeBasePath: "/", editUrl: "https://github.com/cursorless-dev/cursorless/edit/main/packages/cursorless-org-docs/", - sidebarPath: require.resolve("./sidebar.js"), + sidebarPath: require.resolve("./sidebar.ts"), beforeDefaultRemarkPlugins: [ remarkPluginFixLinksToRepositoryArtifacts, ], diff --git a/packages/cursorless-org-docs/sidebar.js b/packages/cursorless-org-docs/sidebar.ts similarity index 100% rename from packages/cursorless-org-docs/sidebar.js rename to packages/cursorless-org-docs/sidebar.ts From 9c62df05e9534e78fb79078e716ecfa1dc5c3397 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Mon, 7 Jul 2025 10:55:11 +0200 Subject: [PATCH 3/3] Make sidebar javascript again --- packages/cursorless-org-docs/docusaurus.config.mts | 2 +- packages/cursorless-org-docs/{sidebar.ts => sidebar.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/cursorless-org-docs/{sidebar.ts => sidebar.js} (100%) diff --git a/packages/cursorless-org-docs/docusaurus.config.mts b/packages/cursorless-org-docs/docusaurus.config.mts index b02c36c226..e96a0adaad 100644 --- a/packages/cursorless-org-docs/docusaurus.config.mts +++ b/packages/cursorless-org-docs/docusaurus.config.mts @@ -135,7 +135,7 @@ const config: Config = { routeBasePath: "/", editUrl: "https://github.com/cursorless-dev/cursorless/edit/main/packages/cursorless-org-docs/", - sidebarPath: require.resolve("./sidebar.ts"), + sidebarPath: require.resolve("./sidebar.js"), beforeDefaultRemarkPlugins: [ remarkPluginFixLinksToRepositoryArtifacts, ], diff --git a/packages/cursorless-org-docs/sidebar.ts b/packages/cursorless-org-docs/sidebar.js similarity index 100% rename from packages/cursorless-org-docs/sidebar.ts rename to packages/cursorless-org-docs/sidebar.js