Skip to content

Commit 89c35b4

Browse files
committed
Merge branch 'feat/rsa-keygen-enhancements2' into chore/all-my-stuffs
# Conflicts: # components.d.ts # vite.config.ts
2 parents dc47863 + ed019b0 commit 89c35b4

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

pnpm-lock.yaml

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vite.config.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
import { URL, fileURLToPath } from 'node:url';
22
import { resolve } from 'node:path';
3+
import { resolve } from 'node:path';
34
import { nodePolyfills } from 'vite-plugin-node-polyfills';
45

6+
import { defineConfig } from 'vite';
57
import { defineConfig } from 'vite';
68
import vue from '@vitejs/plugin-vue';
79
import vueJsx from '@vitejs/plugin-vue-jsx';
8-
import Unocss from 'unocss/vite';
9-
import AutoImport from 'unplugin-auto-import/vite';
10-
import IconsResolver from 'unplugin-icons/resolver';
11-
import Icons from 'unplugin-icons/vite';
12-
import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
13-
import Components from 'unplugin-vue-components/vite';
14-
import { defineConfig } from 'vite';
15-
import { VitePWA } from 'vite-plugin-pwa';
1610
import markdown from 'vite-plugin-vue-markdown';
1711
import svgLoader from 'vite-svg-loader';
1812
import { VitePWA } from 'vite-plugin-pwa';
1913
import AutoImport from 'unplugin-auto-import/vite';
2014
import Components from 'unplugin-vue-components/vite';
2115
import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
2216
import Unocss from 'unocss/vite';
17+
import { VitePWA } from 'vite-plugin-pwa';
18+
import AutoImport from 'unplugin-auto-import/vite';
19+
import Components from 'unplugin-vue-components/vite';
20+
import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
21+
import Unocss from 'unocss/vite';
2322
import { configDefaults } from 'vitest/config';
2423
import topLevelAwait from "vite-plugin-top-level-await";
2524
import Icons from 'unplugin-icons/vite';

0 commit comments

Comments
 (0)