Skip to content

Commit

Permalink
Merge pull request #5 from xlboy/release/0.5.0
Browse files Browse the repository at this point in the history
release: 0.5.0
  • Loading branch information
xlboy authored Sep 20, 2024
2 parents 505d9e5 + 4305a3e commit df66fbc
Show file tree
Hide file tree
Showing 9 changed files with 323 additions and 19 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.5.0 (2024-09-20)

## Added

- Support for `[email protected]` (compatible with the latest `[email protected]`)

# 0.4.0 (2024-08-16)

## Added
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

English | [简体中文](./README.zh.md)

<video src="https://github.com/user-attachments/assets/bc658c10-a684-4201-8960-8c00e835c912"></video>
<video src="https://github.com/user-attachments/assets/c5d92bbd-cb25-493f-a251-c4ca664f3f3d"></video>

## About It

Expand Down Expand Up @@ -37,10 +37,11 @@ After installing the extension, simply configure it as follows.

- `twind-intellisense.presets`: Presets used in the project

- Type: `Array<'tailwind' | 'tailwind-forms' | 'autoprefix' | 'container-queries' | 'line-clamp' | 'radix-ui' | 'typography'>`
- Type: `Array<'tailwind' | '[email protected]' | 'tailwind-forms' | 'autoprefix' | 'container-queries' | 'line-clamp' | 'radix-ui' | 'typography'>`
- Default: `["tailwind"]`

> Note: If your project uses the `tailwind` preset, be sure to add it.
> `[email protected]` corresponds to `@phoenix-twind/preset-tailwind`, supports the latest `[email protected]`.
> `tailwind` corresponds to `@twind/preset-tailwind`, and the others follow similarly.
- `twind-intellisense.configPath`: Path to the Twind configuration file
Expand Down
5 changes: 3 additions & 2 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[English](./README.md) | 简体中文

<video src="https://github.com/user-attachments/assets/bc658c10-a684-4201-8960-8c00e835c912"></video>
<video src="https://github.com/user-attachments/assets/c5d92bbd-cb25-493f-a251-c4ca664f3f3d"></video>

## 关于它

Expand Down Expand Up @@ -37,9 +37,10 @@

- `twind-intellisense.presets`: 项目中使用到的预设

- 类型:`Array<'tailwind' | 'tailwind-forms' | 'autoprefix' | 'container-queries' | 'line-clamp' | 'radix-ui' | 'typography'>`
- 类型:`Array<'tailwind' | '[email protected]' | 'tailwind-forms' | 'autoprefix' | 'container-queries' | 'line-clamp' | 'radix-ui' | 'typography'>`
- 默认值:`["tailwind"]`
> 请注意,如果你的项目中使用了 `tailwind` 预设,请务必添加。
> `[email protected]` 即为 `@phoenix-twind/preset-tailwind`(支持最新的 `[email protected]`
> `tailwind` 即为 `@twind/preset-tailwind`,其余的也是同理。
- `twind-intellisense.configPath`: Twind 配置文件路径
Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "vscode-twind-intellisense",
"publisher": "xlboy",
"displayName": "Twind Intellisense (Phoenix)",
"version": "0.4.0",
"description": "Twind Intellisense for VSCode, It's waiting for its king to return",
"version": "0.5.0",
"description": "Twind@1.x Intellisense for VSCode. Enhancing your Twind development experience.",
"license": "MIT",
"type": "module",
"repository": {
Expand Down Expand Up @@ -46,6 +46,7 @@
"type": "string",
"enum": [
"tailwind",
"[email protected]",
"tailwind-forms",
"autoprefix",
"container-queries",
Expand All @@ -55,6 +56,7 @@
],
"markdownEnumDescriptions": [
"`@twind/preset-tailwind`",
"`@phoenix-twind/preset-tailwind`, supports the latest `[email protected]`",
"`@twind/preset-tailwind-forms`",
"`@twind/preset-autoprefix`",
"`@twind/preset-container-queries`",
Expand Down Expand Up @@ -112,7 +114,8 @@
},
"devDependencies": {
"@ctrl/tinycolor": "^4.1.0",
"@phoenix-twind/intellisense": "1.1.4-alpha.4",
"@phoenix-twind/intellisense": "^1.1.4-alpha.4",
"@phoenix-twind/preset-tailwind": "^1.2.0-alpha.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@tsconfig/node20": "^20.1.4",
"@twind/core": "^1.1.3",
Expand Down Expand Up @@ -148,7 +151,8 @@
"@twind/[email protected]": "patches/@[email protected]",
"@twind/[email protected]": "patches/@[email protected]",
"@twind/[email protected]": "patches/@[email protected]",
"@phoenix-twind/intellisense": "patches/@phoenix-twind__intellisense.patch"
"@phoenix-twind/intellisense": "patches/@phoenix-twind__intellisense.patch",
"@phoenix-twind/preset-tailwind": "patches/@phoenix-twind__preset-tailwind.patch"
}
}
}
247 changes: 247 additions & 0 deletions patches/@phoenix-twind__preset-tailwind.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
diff --git a/package.json b/package.json
index 2fd7676f3569b320ad5ebbdf51c69cbfb2096a99..c68493fc3d49932de7829d4cc7abbb744fd182d6 100644
--- a/package.json
+++ b/package.json
@@ -43,223 +43,38 @@
"engines": {
"node": ">=14.15.0"
},
- "main": "./preset-tailwind.cjs",
"exports": {
".": {
"types": "./preset-tailwind.d.ts",
- "development": {
- "esnext": "./preset-tailwind.esnext.dev.js",
- "deno": "./preset-tailwind.deno.dev.js",
- "module": "./preset-tailwind.dev.js",
- "worker": "./preset-tailwind.worker.dev.js",
- "browser": "./preset-tailwind.browser.dev.js",
- "script": "./preset-tailwind.global.dev.js",
- "node": {
- "import": "./preset-tailwind.dev.mjs",
- "require": "./preset-tailwind.dev.cjs"
- },
- "default": "./preset-tailwind.dev.js"
- },
- "esnext": "./preset-tailwind.esnext.js",
- "deno": "./preset-tailwind.deno.js",
- "module": "./preset-tailwind.js",
- "worker": "./preset-tailwind.worker.js",
- "browser": "./preset-tailwind.browser.js",
- "script": "./preset-tailwind.global.js",
- "node": {
- "import": "./preset-tailwind.mjs",
- "require": "./preset-tailwind.cjs"
- },
- "default": "./preset-tailwind.js"
+ "default": "./preset-tailwind.dev.js"
},
"./base": {
"types": "./base.d.ts",
- "development": {
- "esnext": "./base.esnext.dev.js",
- "deno": "./base.deno.dev.js",
- "module": "./base.dev.js",
- "worker": "./base.worker.dev.js",
- "browser": "./base.browser.dev.js",
- "script": "./base.global.dev.js",
- "node": {
- "import": "./base.dev.mjs",
- "require": "./base.dev.cjs"
- },
- "default": "./base.dev.js"
- },
- "esnext": "./base.esnext.js",
- "deno": "./base.deno.js",
- "module": "./base.js",
- "worker": "./base.worker.js",
- "browser": "./base.browser.js",
- "script": "./base.global.js",
- "node": {
- "import": "./base.mjs",
- "require": "./base.cjs"
- },
- "default": "./base.js"
+ "default": "./base.dev.js"
},
"./baseTheme": {
"types": "./baseTheme.d.ts",
- "development": {
- "esnext": "./baseTheme.esnext.dev.js",
- "deno": "./baseTheme.deno.dev.js",
- "module": "./baseTheme.dev.js",
- "worker": "./baseTheme.worker.dev.js",
- "browser": "./baseTheme.browser.dev.js",
- "script": "./baseTheme.global.dev.js",
- "node": {
- "import": "./baseTheme.dev.mjs",
- "require": "./baseTheme.dev.cjs"
- },
- "default": "./baseTheme.dev.js"
- },
- "esnext": "./baseTheme.esnext.js",
- "deno": "./baseTheme.deno.js",
- "module": "./baseTheme.js",
- "worker": "./baseTheme.worker.js",
- "browser": "./baseTheme.browser.js",
- "script": "./baseTheme.global.js",
- "node": {
- "import": "./baseTheme.mjs",
- "require": "./baseTheme.cjs"
- },
- "default": "./baseTheme.js"
+ "default": "./baseTheme.dev.js"
},
"./colors": {
"types": "./colors.d.ts",
- "development": {
- "esnext": "./colors.esnext.dev.js",
- "deno": "./colors.deno.dev.js",
- "module": "./colors.dev.js",
- "worker": "./colors.worker.dev.js",
- "browser": "./colors.browser.dev.js",
- "script": "./colors.global.dev.js",
- "node": {
- "import": "./colors.dev.mjs",
- "require": "./colors.dev.cjs"
- },
- "default": "./colors.dev.js"
- },
- "esnext": "./colors.esnext.js",
- "deno": "./colors.deno.js",
- "module": "./colors.js",
- "worker": "./colors.worker.js",
- "browser": "./colors.browser.js",
- "script": "./colors.global.js",
- "node": {
- "import": "./colors.mjs",
- "require": "./colors.cjs"
- },
- "default": "./colors.js"
+ "default": "./colors.dev.js"
},
"./defaultTheme": {
"types": "./defaultTheme.d.ts",
- "development": {
- "esnext": "./defaultTheme.esnext.dev.js",
- "deno": "./defaultTheme.deno.dev.js",
- "module": "./defaultTheme.dev.js",
- "worker": "./defaultTheme.worker.dev.js",
- "browser": "./defaultTheme.browser.dev.js",
- "script": "./defaultTheme.global.dev.js",
- "node": {
- "import": "./defaultTheme.dev.mjs",
- "require": "./defaultTheme.dev.cjs"
- },
- "default": "./defaultTheme.dev.js"
- },
- "esnext": "./defaultTheme.esnext.js",
- "deno": "./defaultTheme.deno.js",
- "module": "./defaultTheme.js",
- "worker": "./defaultTheme.worker.js",
- "browser": "./defaultTheme.browser.js",
- "script": "./defaultTheme.global.js",
- "node": {
- "import": "./defaultTheme.mjs",
- "require": "./defaultTheme.cjs"
- },
- "default": "./defaultTheme.js"
+ "default": "./defaultTheme.dev.js"
},
"./preflight": {
"types": "./preflight.d.ts",
- "development": {
- "esnext": "./preflight.esnext.dev.js",
- "deno": "./preflight.deno.dev.js",
- "module": "./preflight.dev.js",
- "worker": "./preflight.worker.dev.js",
- "browser": "./preflight.browser.dev.js",
- "script": "./preflight.global.dev.js",
- "node": {
- "import": "./preflight.dev.mjs",
- "require": "./preflight.dev.cjs"
- },
- "default": "./preflight.dev.js"
- },
- "esnext": "./preflight.esnext.js",
- "deno": "./preflight.deno.js",
- "module": "./preflight.js",
- "worker": "./preflight.worker.js",
- "browser": "./preflight.browser.js",
- "script": "./preflight.global.js",
- "node": {
- "import": "./preflight.mjs",
- "require": "./preflight.cjs"
- },
- "default": "./preflight.js"
+ "default": "./preflight.dev.js"
},
"./rules": {
"types": "./rules.d.ts",
- "development": {
- "esnext": "./rules.esnext.dev.js",
- "deno": "./rules.deno.dev.js",
- "module": "./rules.dev.js",
- "worker": "./rules.worker.dev.js",
- "browser": "./rules.browser.dev.js",
- "script": "./rules.global.dev.js",
- "node": {
- "import": "./rules.dev.mjs",
- "require": "./rules.dev.cjs"
- },
- "default": "./rules.dev.js"
- },
- "esnext": "./rules.esnext.js",
- "deno": "./rules.deno.js",
- "module": "./rules.js",
- "worker": "./rules.worker.js",
- "browser": "./rules.browser.js",
- "script": "./rules.global.js",
- "node": {
- "import": "./rules.mjs",
- "require": "./rules.cjs"
- },
- "default": "./rules.js"
+ "default": "./rules.dev.js"
},
"./variants": {
"types": "./variants.d.ts",
- "development": {
- "esnext": "./variants.esnext.dev.js",
- "deno": "./variants.deno.dev.js",
- "module": "./variants.dev.js",
- "worker": "./variants.worker.dev.js",
- "browser": "./variants.browser.dev.js",
- "script": "./variants.global.dev.js",
- "node": {
- "import": "./variants.dev.mjs",
- "require": "./variants.dev.cjs"
- },
- "default": "./variants.dev.js"
- },
- "esnext": "./variants.esnext.js",
- "deno": "./variants.deno.js",
- "module": "./variants.js",
- "worker": "./variants.worker.js",
- "browser": "./variants.browser.js",
- "script": "./variants.global.js",
- "node": {
- "import": "./variants.mjs",
- "require": "./variants.cjs"
- },
- "default": "./variants.js"
+ "default": "./variants.dev.js"
},
"./package.json": "./package.json"
},
@@ -275,9 +90,5 @@
},
"publishConfig": {
"access": "public"
- },
- "module": "./preset-tailwind.js",
- "unpkg": "./preset-tailwind.global.js",
- "jsdelivr": "./preset-tailwind.global.js",
- "types": "./preset-tailwind.d.ts"
+ }
}
Loading

0 comments on commit df66fbc

Please sign in to comment.