Bump dependencies

lxsmnsyc · lxsmnsyc · commit 5001a01c6ec2 · 2025-03-13T23:43:16.000+08:00
diff --git a/biome.json b/biome.json
@@ -28,7 +28,7 @@
         "noInvalidNewBuiltin": "error",
         "noNewSymbol": "error",
         "noNodejsModules": "off",
-        "noUndeclaredDependencies": "error",
+        "noUndeclaredDependencies": "off",
         "noUndeclaredVariables": "error",
         "noUnusedFunctionParameters": "error",
         "noUnusedImports": "error",
diff --git a/examples/comments/package.json b/examples/comments/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "solid-labels": "0.16.0",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vite": "^6.1.1",
     "vite-plugin-solid": "^2.11.2",
     "vite-plugin-solid-labels": "0.16.1"
diff --git a/examples/ctf/package.json b/examples/ctf/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "solid-labels": "0.16.0",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vite": "^6.1.1",
     "vite-plugin-solid": "^2.11.2",
     "vite-plugin-solid-labels": "0.16.1"
diff --git a/examples/labels/package.json b/examples/labels/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "solid-labels": "0.16.0",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vite": "^6.1.1",
     "vite-plugin-solid": "^2.11.2",
     "vite-plugin-solid-labels": "0.16.1"
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "workspaces": ["packages/*", "examples/*"],
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "lerna": "^8.2.0",
-    "typescript": "^5.7.3"
+    "lerna": "^8.2.1",
+    "typescript": "^5.8.2"
   }
 }
diff --git a/packages/core/babel/components.ts b/packages/core/babel/components.ts
@@ -84,9 +84,6 @@ const COMPONENT_TRAVERSE: Visitor<State> = {
   },
 };
 
-export function transformComponents(
-  state: State,
-  path: NodePath,
-): void {
+export function transformComponents(state: State, path: NodePath): void {
   path.traverse(COMPONENT_TRAVERSE, state);
 }
diff --git a/packages/core/babel/core/get-import-identifier.ts b/packages/core/babel/core/get-import-identifier.ts
@@ -20,8 +20,7 @@ export function getImportIdentifier(
   ).unshiftContainer(
     'body',
     t.importDeclaration(
-      [t.importSpecifier(uid, t.identifier(name))
-      ],
+      [t.importSpecifier(uid, t.identifier(name))],
       t.stringLiteral(source),
     ),
   )[0];
diff --git a/packages/core/babel/core/types.ts b/packages/core/babel/core/types.ts
@@ -1,5 +1,5 @@
-import type * as t from '@babel/types';
 import type * as babel from '@babel/core';
+import type * as t from '@babel/types';
 
 export interface Options {
   dev?: boolean;
diff --git a/packages/core/babel/transform-comment.ts b/packages/core/babel/transform-comment.ts
@@ -47,13 +47,15 @@ function getVariableLabelPreference(
   return preference;
 }
 
+const LABEL_PATTERN = /^@\w+( .*)?$/;
+
 function getCallbackLabelPreference(state: State, comments: t.Comment[]) {
   let preference: string | undefined;
   let nameOption: string | undefined;
   for (let i = 0, len = comments.length; i < len; i++) {
     const comment = comments[i];
     const value: string = comment.value.trim();
-    if (/^@\w+( .*)?$/.test(value)) {
+    if (LABEL_PATTERN.test(value)) {
       const [tag, ...debugName] = value.split(' ');
       if (tag in CALLBACK_LABEL && !state.opts.disabled?.pragma?.[value]) {
         preference = tag;
diff --git a/packages/core/babel/transform-label.ts b/packages/core/babel/transform-label.ts
@@ -160,18 +160,19 @@ function transformCallbackLabel(
   const [name, source, named] = CALLBACK_LABEL[labelName];
   let nameOption: string | undefined;
   let callback: t.Expression;
-  if (named && t.isLabeledStatement(body)) {
-    nameOption = body.label.name;
-    body = body.body;
+  let currentBody = body;
+  if (named && t.isLabeledStatement(currentBody)) {
+    nameOption = currentBody.label.name;
+    currentBody = currentBody.body;
   }
-  if (t.isBlockStatement(body)) {
-    callback = t.arrowFunctionExpression([], body);
-  } else if (t.isExpressionStatement(body)) {
-    callback = body.expression;
+  if (t.isBlockStatement(currentBody)) {
+    callback = t.arrowFunctionExpression([], currentBody);
+  } else if (t.isExpressionStatement(currentBody)) {
+    callback = currentBody.expression;
   } else {
     throw unexpectedType(
       path,
-      body.type,
+      currentBody.type,
       'BlockStatement | ExpressionStatement',
     );
   }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -21,12 +21,21 @@
       "types": "./dist/types/babel/index.d.ts"
     }
   },
-  "files": ["dist", "src"],
+  "files": [
+    "dist",
+    "src"
+  ],
   "engines": {
     "node": ">=10"
   },
   "license": "MIT",
-  "keywords": ["pridepack", "babel", "solid-js", "labels", "reactivity"],
+  "keywords": [
+    "pridepack",
+    "babel",
+    "solid-js",
+    "labels",
+    "reactivity"
+  ],
   "name": "solid-labels",
   "devDependencies": {
     "@babel/core": "^7.26.9",
@@ -36,7 +45,7 @@
     "pridepack": "2.6.1",
     "solid-js": "^1.9.3",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vitest": "^3.0.6"
   },
   "peerDependencies": {
@@ -72,7 +81,9 @@
   "private": false,
   "typesVersions": {
     "*": {
-      "babel": ["./dist/types/babel/index.d.ts"]
+      "babel": [
+        "./dist/types/babel/index.d.ts"
+      ]
     }
   },
   "types": "./dist/types/src/index.d.ts",
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,13 +1,13 @@
 import type * as solid from 'solid-js';
-import type * as solidWeb from 'solid-js/web';
 import type * as solidStore from 'solid-js/store';
+import type * as solidWeb from 'solid-js/web';
 
 declare global {
   type Accessor<T> = solid.Accessor<T>;
   type Setter<T> = solid.Setter<T>;
   type Context<T> = solid.Context<T>;
   type ObservableObserver<T> = solid.ObservableObserver<T>;
-  type Component<T> = solid.Component<T>;
+  type Component<T extends Record<string, any> = {}> = solid.Component<T>;
 
   function $signal<T>(): T | undefined;
   function $signal<T>(
diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -27,7 +27,7 @@
     "pridepack": "2.6.1",
     "rollup": "^4.24.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "dependencies": {
     "unplugin-solid-labels": "0.16.1"
diff --git a/packages/unplugin/package.json b/packages/unplugin/package.json
@@ -15,7 +15,7 @@
     "rollup": "^4.34.8",
     "solid-labels": "0.16.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vite": "^6.1.1"
   },
   "dependencies": {
diff --git a/packages/unplugin/src/index.ts b/packages/unplugin/src/index.ts
@@ -1,12 +1,12 @@
-import type { Options } from 'solid-labels/babel';
-import solidLabelsBabel from 'solid-labels/babel';
 import * as babel from '@babel/core';
-import type { Plugin } from 'vite';
 import type { FilterPattern } from '@rollup/pluginutils';
 import { createFilter } from '@rollup/pluginutils';
+import path from 'node:path';
+import type { Options } from 'solid-labels/babel';
+import solidLabelsBabel from 'solid-labels/babel';
 import type { TransformResult } from 'unplugin';
 import { createUnplugin } from 'unplugin';
-import path from 'node:path';
+import type { Plugin } from 'vite';
 
 export interface SolidLabelsPluginFilter {
   include?: FilterPattern;
@@ -27,7 +27,7 @@ function repushPlugin(
 
   let baseIndex = -1;
   let targetIndex = -1;
-  let targetPlugin: Plugin;
+  let targetPlugin: Plugin | undefined;
   for (let i = 0, len = plugins.length; i < len; i += 1) {
     const current = plugins[i];
     if (namesSet.has(current.name) && baseIndex === -1) {
@@ -38,15 +38,22 @@ function repushPlugin(
       targetPlugin = current;
     }
   }
-  if (baseIndex !== -1 && targetIndex !== -1 && baseIndex < targetIndex) {
+  if (
+    targetPlugin &&
+    baseIndex !== -1 &&
+    targetIndex !== -1 &&
+    baseIndex < targetIndex
+  ) {
     plugins.splice(targetIndex, 1);
-    plugins.splice(baseIndex, 0, targetPlugin!);
+    plugins.splice(baseIndex, 0, targetPlugin);
   }
 }
 
 const DEFAULT_INCLUDE = 'src/**/*.{jsx,tsx,ts,js,mjs,cjs}';
 const DEFAULT_EXCLUDE = 'node_modules/**/*.{jsx,tsx,ts,js,mjs,cjs}';
 
+const FILE_FILTER = /\.[mc]?tsx?$/i;
+
 const solidLabelsPlugin = createUnplugin(
   (options: SolidLabelsPluginOptions = {}) => {
     const filter = createFilter(
@@ -65,7 +72,7 @@ const solidLabelsPlugin = createUnplugin(
         const plugins: NonNullable<
           NonNullable<babel.TransformOptions['parserOpts']>['plugins']
         > = ['jsx'];
-        if (/\.[mc]?tsx?$/i.test(id)) {
+        if (FILE_FILTER.test(id)) {
           plugins.push('typescript');
         }
         const result = await babel.transformAsync(code, {
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -28,7 +28,7 @@
     "rollup": "^4.34.8",
     "solid-labels": "0.16.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "vite": "^6.1.1"
   },
   "dependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"workspaces": ["packages/", "examples/"],`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"@biomejs/biome": "^1.9.4",`
`7`		`- "lerna": "^8.2.0",`
`8`		`- "typescript": "^5.7.3"`
	`7`	`+ "lerna": "^8.2.1",`
	`8`	`+ "typescript": "^5.8.2"`
`9`	`9`	`}`
`10`	`10`	`}`