Merge pull request #16 from crashmax-dev/gm-types

crashmax-dev · web-flow · commit 786cb2be78db · 2022-09-19T21:40:00.000+08:00
feat: added more built-in GM_* APIs
diff --git a/examples/basic/src/index.ts b/examples/basic/src/index.ts
@@ -4,5 +4,3 @@ import './styles/style.sass'
 
 const div = document.querySelector('div')!
 div.appendChild(createButton())
-
-GM_addStyle('')
diff --git a/examples/basic/src/vite-env.d.ts b/examples/basic/src/vite-env.d.ts
@@ -1,2 +1,2 @@
 /// <reference types="vite/client" />
-/// <reference types="vite-userscript-plugin/tampermonkey" />
+/// <reference types="vite-userscript-plugin/types/tampermonkey" />
diff --git a/examples/jsx/src/App.tsx b/examples/jsx/src/App.tsx
@@ -1,6 +1,6 @@
 import { mount, unmount } from 'redom-jsx'
 import type { RedomComponent, RedomEl } from 'redom-jsx'
-import { Counter } from './Counter.jsx'
+import { Counter } from './Counter.js'
 
 export class App implements RedomComponent {
   el: RedomEl
diff --git a/examples/jsx/src/Toggle.tsx b/examples/jsx/src/Toggle.tsx
@@ -1,5 +1,5 @@
 import { RedomComponent, RedomEl } from 'redom-jsx'
-import { Heading } from './Heading.jsx'
+import { Heading } from './Heading.js'
 
 export class Toggle implements RedomComponent {
   el: RedomEl
diff --git a/examples/jsx/src/index.tsx b/examples/jsx/src/index.tsx
@@ -1,7 +1,7 @@
 import { mount } from 'redom-jsx'
-import { App } from './App.jsx'
-import { List } from './List.jsx'
-import { Toggle } from './Toggle.jsx'
+import { App } from './App.js'
+import { List } from './List.js'
+import { Toggle } from './Toggle.js'
 
 mount(document.body, <App />)
 mount(document.body, <Toggle />)
diff --git a/examples/jsx/tsconfig.json b/examples/jsx/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "dist",
     "jsx": "preserve",
     "types": [
-      "vite-userscript-plugin/tampermonkey"
+      "vite-userscript-plugin/types/tampermonkey"
     ]
   },
   "include": [
diff --git a/examples/reatom b/examples/reatom
@@ -1 +1 @@
-Subproject commit 45381f8460d1a4cd042510a7cb365f48ba8f4d5b
+Subproject commit 31f1cc8251634693903d8513de806324e10da6a9
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "files": [
     "dist",
-    "tampermonkey.d.ts"
+    "types"
   ],
   "scripts": {
     "dev": "tsup --watch",
@@ -58,13 +58,13 @@
     "@types/node": "^18.7.18",
     "@types/serve-handler": "^6.1.1",
     "@types/websocket": "^1.0.5",
-    "@vitest/ui": "^0.23.2",
+    "@vitest/ui": "^0.23.4",
     "tsup": "^6.2.3",
     "turbo": "^1.4.7",
     "typescript": "^4.8.3",
     "vite": "^3.1.2",
     "vite-plugin-dts": "^1.5.0",
-    "vitest": "^0.23.2"
+    "vitest": "^0.23.4"
   },
   "peerDependencies": {
     "vite": ">=2.9.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,7 +1,7 @@
 import type { Grants } from './types.js'
 
-export const regexpScripts = new RegExp(/.(t|j)sx?/)
-export const regexpStyles = new RegExp(/\.(s?css|sass)$/)
+export const regexpScripts = new RegExp(/\.(t|j)sx?$/)
+export const regexpStyles = new RegExp(/\.(s[ac]|c|le)ss$/)
 
 export const GM = [
   'setValue',
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,7 +5,7 @@
     "emitDeclarationOnly": true
   },
   "include": [
-    "src/**/*",
-    "tampermonkey.d.ts"
+    "src",
+    "types"
   ]
 }
diff --git a/types/README.md b/types/README.md
@@ -0,0 +1,21 @@
+# Userscript type definitions
+
+[![tampermonkey](https://img.shields.io/npm/v/@types/tampermonkey?label=%40types%2Ftampermonkey)](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/tampermonkey)
+[![greasemonkey](https://img.shields.io/npm/v/@types/greasemonkey?label=%40types%2Fgreasemonkey)](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/greasemonkey)
+[![violentmonkey](https://img.shields.io/npm/v/@violentmonkey/types?label=%40violentmonkey%2Ftypes)](https://github.com/violentmonkey/types)
+
+> Type declaration for `GM_*`, `GM.*` APIs in Tampermonkey, Greasemonkey and Violentmonkey.
+
+## Installation
+
+```sh
+npm install --save @types/tampermonkey
+```
+
+```sh
+npm install --save @types/greasemonkey
+```
+
+```sh
+npm install --save @violentmonkey/types
+```
diff --git a/types/greasemonkey.d.ts b/types/greasemonkey.d.ts
diff --git a/types/tampermonkey.d.ts b/types/tampermonkey.d.ts
diff --git a/types/violentmonkey.d.ts b/types/violentmonkey.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`/// <reference types="vite/client" />`
`2`		`-/// <reference types="vite-userscript-plugin/tampermonkey" />`
	`2`	`+/// <reference types="vite-userscript-plugin/types/tampermonkey" />`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"outDir": "dist",`
`5`	`5`	`"jsx": "preserve",`
`6`	`6`	`"types": [`
`7`		`- "vite-userscript-plugin/tampermonkey"`
	`7`	`+ "vite-userscript-plugin/types/tampermonkey"`
`8`	`8`	`]`
`9`	`9`	`},`
`10`	`10`	`"include": [`