feat: catppuccin

Signed-off-by: jolheiser <john.olheiser@gmail.com>
0.10.3
2023-11-07 17:59:50 -06:00 · 2023-11-02 09:58:08 -04:00 · 2023-11-01 13:14:05 -04:00 · 2023-11-01 10:48:40 -04:00 · 2023-11-01 10:48:29 -04:00 · 2023-10-31 10:37:56 -04:00
11 changed files with 112 additions and 26 deletions
--- a/flake.lock
+++ b/flake.lock
@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1699343069,
+        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@ -0,0 +1,39 @@
+{
+  description = "TailwindCSS LSP + Catppuccin";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+  }: let
+    pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    version = "0.0.14";
+  in {
+    packages.x86_64-linux.default = with pkgs;
+      buildNpmPackage {
+        pname = "tailwindcss-language-server";
+        inherit version;
+
+        src = ./.;
+
+        makeCacheWritable = true;
+        npmDepsHash = "sha256-SH0BaGDtmc+hUoe8CSmiZjTcETUaeSFiN5cl5JmJeaY=";
+        npmWorkspace = "packages/tailwindcss-language-server";
+
+        buildInputs = [libsecret] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Security AppKit]);
+
+        nativeBuildInputs = [python3 pkg-config];
+
+        meta = with lib; {
+          description = "Intelligent Tailwind CSS tooling for Visual Studio Code";
+          homepage = "https://github.com/tailwindlabs/tailwindcss-intellisense";
+          license = licenses.mit;
+          maintainers = with maintainers; [happysalada];
+          mainProgram = "tailwindcss-language-server";
+          platforms = platforms.all;
+        };
+      };
+  };
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -185,6 +185,15 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@catppuccin/tailwindcss": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@catppuccin/tailwindcss/-/tailwindcss-0.1.6.tgz",
+      "integrity": "sha512-V+Y0AwZ5SSyvOVAcDl7Ng30xy+m82OKnEJ+9+kcZZ7lRyXuZrAb2GScdq9XR3v+ggt8qiZ/G4TvaC9cJ88AAXA==",
+      "dev": true,
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0"
+      }
+    },
    "node_modules/@csstools/css-parser-algorithms": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.1.tgz",
@ -894,6 +903,10 @@
      "resolved": "packages/tailwindcss-language-server",
      "link": true
    },
+    "node_modules/@tailwindcss/language-service": {
+      "resolved": "packages/tailwindcss-language-service",
+      "link": true
+    },
    "node_modules/@tailwindcss/line-clamp": {
      "version": "0.4.2",
      "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz",
@ -6110,10 +6123,6 @@
        "postcss": "^8.0.9"
      }
    },
-    "node_modules/tailwindcss-language-service": {
-      "resolved": "packages/tailwindcss-language-service",
-      "link": true
-    },
    "node_modules/tailwindcss/node_modules/chokidar": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@ -7570,16 +7579,18 @@
    },
    "packages/tailwindcss-language-server": {
      "name": "@tailwindcss/language-server",
-      "version": "0.0.13",
+      "version": "0.0.14",
      "license": "MIT",
      "bin": {
        "tailwindcss-language-server": "bin/tailwindcss-language-server"
      },
      "devDependencies": {
+        "@catppuccin/tailwindcss": "^0.1.6",
        "@parcel/watcher": "2.0.3",
        "@tailwindcss/aspect-ratio": "0.4.2",
        "@tailwindcss/container-queries": "0.1.0",
        "@tailwindcss/forms": "0.5.3",
+        "@tailwindcss/language-service": "*",
        "@tailwindcss/line-clamp": "0.4.2",
        "@tailwindcss/typography": "0.5.7",
        "@types/debounce": "1.2.0",
@ -7613,7 +7624,6 @@
        "rimraf": "3.0.2",
        "stack-trace": "0.0.10",
        "tailwindcss": "3.3.0",
-        "tailwindcss-language-service": "*",
        "typescript": "4.6.4",
        "vitest": "0.34.2",
        "vscode-css-languageservice": "6.2.9",
@ -7624,7 +7634,8 @@
      }
    },
    "packages/tailwindcss-language-service": {
-      "version": "0.0.28",
+      "name": "@tailwindcss/language-service",
+      "version": "0.0.30",
      "dependencies": {
        "@csstools/css-parser-algorithms": "2.1.1",
        "@csstools/css-tokenizer": "2.1.1",
@ -7699,7 +7710,7 @@
      }
    },
    "packages/vscode-tailwindcss": {
-      "version": "0.10.1",
+      "version": "0.10.3",
      "license": "MIT",
      "devDependencies": {
        "@tailwindcss/language-server": "*",
--- a/packages/tailwindcss-language-server/package.json
+++ b/packages/tailwindcss-language-server/package.json
@ -2,7 +2,7 @@
  "name": "@tailwindcss/language-server",
  "description": "Tailwind CSS Language Server",
  "license": "MIT",
-  "version": "0.0.13",
+  "version": "0.0.14",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/tailwindlabs/tailwindcss-intellisense.git",
@ -33,10 +33,12 @@
    "access": "public"
  },
  "devDependencies": {
+    "@catppuccin/tailwindcss": "^0.1.6",
    "@parcel/watcher": "2.0.3",
    "@tailwindcss/aspect-ratio": "0.4.2",
    "@tailwindcss/container-queries": "0.1.0",
    "@tailwindcss/forms": "0.5.3",
+    "@tailwindcss/language-service": "*",
    "@tailwindcss/line-clamp": "0.4.2",
    "@tailwindcss/typography": "0.5.7",
    "@types/debounce": "1.2.0",
@ -70,7 +72,6 @@
    "rimraf": "3.0.2",
    "stack-trace": "0.0.10",
    "tailwindcss": "3.3.0",
-    "tailwindcss-language-service": "*",
    "typescript": "4.6.4",
    "vitest": "0.34.2",
    "vscode-css-languageservice": "6.2.9",
--- a/packages/tailwindcss-language-server/src/lib/plugins.ts
+++ b/packages/tailwindcss-language-server/src/lib/plugins.ts
@ -19,4 +19,8 @@ export default {
    module: require('@tailwindcss/typography'),
    version: require('@tailwindcss/typography/package.json').version,
  },
+  '@catppuccin/tailwindcss': {
+    module: require('@catppuccin/tailwindcss'),
+    version: require('@catppuccin/tailwindcss/package.json').version,
+  },
 }
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@ -46,45 +46,45 @@ import resolveFrom, { setPnpApi } from './util/resolveFrom'
 import { AtRule, Container, Node, Result } from 'postcss'
 import Module from 'module'
 import Hook from './lib/hook'
-import * as semver from 'tailwindcss-language-service/src/util/semver'
+import * as semver from '@tailwindcss/language-service/src/util/semver'
 import dlv from 'dlv'
 import { dset } from 'dset'
 import pkgUp from 'pkg-up'
 import stackTrace from 'stack-trace'
 import extractClassNames from './lib/extractClassNames'
 import { klona } from 'klona/full'
-import { doHover } from 'tailwindcss-language-service/src/hoverProvider'
+import { doHover } from '@tailwindcss/language-service/src/hoverProvider'
 import {
  doComplete,
  resolveCompletionItem,
-} from 'tailwindcss-language-service/src/completionProvider'
+} from '@tailwindcss/language-service/src/completionProvider'
 import {
  State,
  FeatureFlags,
  Settings,
  ClassNames,
  Variant,
-} from 'tailwindcss-language-service/src/util/state'
+} from '@tailwindcss/language-service/src/util/state'
 import { provideDiagnostics } from './lsp/diagnosticsProvider'
-import { doCodeActions } from 'tailwindcss-language-service/src/codeActions/codeActionProvider'
-import { getDocumentColors } from 'tailwindcss-language-service/src/documentColorProvider'
-import { getDocumentLinks } from 'tailwindcss-language-service/src/documentLinksProvider'
+import { doCodeActions } from '@tailwindcss/language-service/src/codeActions/codeActionProvider'
+import { getDocumentColors } from '@tailwindcss/language-service/src/documentColorProvider'
+import { getDocumentLinks } from '@tailwindcss/language-service/src/documentLinksProvider'
 import { debounce } from 'debounce'
 import { getModuleDependencies } from './util/getModuleDependencies'
 import assert from 'assert'
 // import postcssLoadConfig from 'postcss-load-config'
 import * as parcel from './watcher/index.js'
-import { bigSign } from 'tailwindcss-language-service/src/util/jit'
-import { getColor } from 'tailwindcss-language-service/src/util/color'
+import { bigSign } from '@tailwindcss/language-service/src/util/jit'
+import { getColor } from '@tailwindcss/language-service/src/util/color'
 import * as culori from 'culori'
 import namedColors from 'color-name'
 import tailwindPlugins from './lib/plugins'
 import isExcluded from './util/isExcluded'
 import { getFileFsPath, normalizeFileNameToFsPath } from './util/uri'
-import { equal } from 'tailwindcss-language-service/src/util/array'
+import { equal } from '@tailwindcss/language-service/src/util/array'
 import preflight from 'tailwindcss/lib/css/preflight.css'
 import merge from 'deepmerge'
-import { getTextWithoutComments } from 'tailwindcss-language-service/src/util/doc'
+import { getTextWithoutComments } from '@tailwindcss/language-service/src/util/doc'
 import { CONFIG_GLOB, CSS_GLOB, PACKAGE_LOCK_GLOB } from './lib/constants'

 // @ts-ignore
--- a/packages/tailwindcss-language-server/tsconfig.json
+++ b/packages/tailwindcss-language-server/tsconfig.json
@ -11,7 +11,7 @@
    "resolveJsonModule": true,
    "baseUrl": "..",
    "paths": {
-      "tailwindcss-language-service/*": ["../packages/tailwindcss-language-service/*"]
+      "@tailwindcss/language-service/*": ["../packages/tailwindcss-language-service/*"]
    }
  },
  "include": ["src", "../packages/tailwindcss-language-service", "../../types"]
--- a/packages/tailwindcss-language-service/package.json
+++ b/packages/tailwindcss-language-service/package.json
@ -1,6 +1,6 @@
 {
-  "name": "tailwindcss-language-service",
-  "version": "0.0.28",
+  "name": "@tailwindcss/language-service",
+  "version": "0.0.30",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "files": [
--- a/packages/tailwindcss-language-service/scripts/build.mjs
+++ b/packages/tailwindcss-language-service/scripts/build.mjs
@ -30,7 +30,7 @@ let build = await esbuild.context({
          // Call the tsc command to generate the types
          spawnSync(
            'tsc',
-            ['--emitDeclarationOnly', '--outFile', path.resolve(__dirname, '../dist/index.d.ts')],
+            ['--emitDeclarationOnly', '--outDir', path.resolve(__dirname, '../dist')],
            {
              stdio: 'inherit',
            }
--- a/packages/vscode-tailwindcss/CHANGELOG.md
+++ b/packages/vscode-tailwindcss/CHANGELOG.md
@ -2,6 +2,10 @@

 ## 0.11.x (Pre-Release)

+- Nothing yet
+
+## 0.10.2
+
 - Add support for Glimmer (#867)
 - Ignore duplicate variant + value pairs (#874)

--- a/packages/vscode-tailwindcss/package.json
+++ b/packages/vscode-tailwindcss/package.json
@ -4,7 +4,7 @@
  "description": "Intelligent Tailwind CSS tooling for VS Code",
  "author": "Brad Cornes <hello@bradley.dev>",
  "license": "MIT",
-  "version": "0.10.1",
+  "version": "0.10.3",
  "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense",
  "bugs": {
    "url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues",
Author	SHA1	Message	Date
jolheiser	b321333ad0	feat: catppuccin Signed-off-by: jolheiser <john.olheiser@gmail.com>	2023-11-07 17:59:50 -06:00
Jordan Pittman	0b83e8d5fb	0.10.3	2023-11-02 09:58:08 -04:00
Jordan Pittman	436520832f	0.10.2	2023-11-01 13:14:05 -04:00
Jordan Pittman	aa3a0509dc	Bump language server	2023-11-01 10:48:40 -04:00
Jordan Pittman	38c0e28fdf	Update lockfile	2023-11-01 10:48:29 -04:00
Jordan Pittman	6eefb5733e	Bump language service	2023-10-31 10:37:56 -04:00
Jordan Pittman	ec100b6cae	Revert "Simplify type gen" This reverts commit `a13708b995`.	2023-10-31 09:47:41 -04:00
Jordan Pittman	dfef6c190a	Update lockfile	2023-10-30 16:35:36 -04:00
Jordan Pittman	1cd4b48665	Change to a scoped package	2023-10-30 16:34:34 -04:00
Jordan Pittman	c4e301871f	Bump language service	2023-10-30 15:36:47 -04:00