refactor!: update repo and dependencies

unjs · Mar 9, 2022 · 614cdaa · 614cdaa
1 parent 9e2e6b4
commit 614cdaa
Show file tree

Hide file tree

Showing 10 changed files with 2,111 additions and 4,053 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,45 +10,16 @@ on:
 
 jobs:
   ci:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [14]
+    runs-on: ubuntu-latest
 
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node }}
-
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile --non-interactive
-
-      - name: Lint
-        run: yarn lint
-
-      - name: Build
-        run: yarn build
-
-      - name: Test
-        run: yarn jest
-
-      - name: Coverage
-        uses: codecov/codecov-action@v1
+          node-version: '16'
+          cache: yarn
+      - run: yarn install
+      - run: yarn lint
+      - run: yarn build
+      - run: yarn vitest --coverage
+      - uses: codecov/codecov-action@v2
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Pooya Parsa <[email protected]>
+Copyright (c) 2021-2022 UnJS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/package.json b/package.json
@@ -7,24 +7,24 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/untyped.mjs",
-      "require": "./dist/untyped.cjs"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
     },
     "./loader/babel": "./dist/loader/babel.cjs",
     "./loader/transform": "./dist/loader/transform.cjs"
   },
-  "main": "./dist/untyped.cjs",
-  "types": "./dist/untyped.d.ts",
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "siroc build",
-    "dev": "jest --watch",
+    "build": "unbuild",
+    "dev": "vitest",
     "lint": "eslint --ext .js,.ts .",
     "prepack": "yarn build",
     "release": "yarn test && standard-version && git push --follow-tags && npm publish",
-    "test": "yarn lint && jest",
+    "test": "yarn lint && vitest",
     "web": "nuxi dev web",
     "web:build": "cd web && nuxi build"
   },
@@ -35,21 +35,20 @@
     "@nuxtjs/eslint-config-typescript": "latest",
     "@types/babel__standalone": "latest",
     "@types/babel__traverse": "latest",
-    "@types/jest": "latest",
     "@types/node": "latest",
     "@vue/compiler-sfc": "latest",
+    "c8": "^7.11.0",
     "eslint": "latest",
     "hljs": "latest",
-    "jest": "latest",
     "json-schema": "latest",
     "marked": "latest",
     "monaco-editor": "latest",
-    "nuxt-windicss": "^2.0.12",
-    "nuxt3": "^3.0.0-27287661.1e0e881",
+    "nuxt-windicss": "latest",
+    "nuxt3": "latest",
     "prismjs": "latest",
     "scule": "latest",
-    "siroc": "latest",
     "standard-version": "latest",
-    "ts-jest": "latest"
+    "unbuild": "latest",
+    "vitest": "latest"
   }
 }
diff --git a/src/loader/babel.ts b/src/loader/babel.ts
@@ -7,7 +7,7 @@ import { version } from '../../package.json'
 
 type GetCodeFn = (loc: t.SourceLocation) => string
 
-export default <PluginItem> function babelPluginUntyped (api: ConfigAPI) {
+const babelPluginUntyped: PluginItem = function (api: ConfigAPI) {
   api.cache.using(() => version)
 
   return <PluginObj>{
@@ -142,6 +142,8 @@ export default <PluginItem> function babelPluginUntyped (api: ConfigAPI) {
   }
 }
 
+export default babelPluginUntyped
+
 function containsIncompleteCodeblock (line = '') {
   const codeDelimiters = line.split('\n').filter(line => line.startsWith('```')).length
   return !!(codeDelimiters % 2)

diff --git a/test/defaults.test.ts b/test/defaults.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest'
 import { applyDefaults } from '../src'
 
 describe('applyDefaults', () => {

diff --git a/test/schema.test.ts b/test/schema.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest'
 import { resolveSchema } from '../src'
 
 describe('resolveSchema', () => {

diff --git a/test/transform.test.ts b/test/transform.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest'
 import { transform } from '../src/loader/transform'
 
 describe('transform (functions)', () => {

diff --git a/test/types.test.ts b/test/types.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest'
 import { resolveSchema, generateTypes } from '../src'
 
 describe('resolveSchema', () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,8 +6,7 @@
     "esModuleInterop": true,
     "strict": false,
     "types": [
-      "node",
-      "jest"
+      "node"
     ]
   },
   "include": [