chore: fix vite for solid

leanupjs · Feb 3, 2022 · 21a5e6a · 21a5e6a
1 parent 3badd82
commit 21a5e6a
Show file tree

Hide file tree

Showing 8 changed files with 246 additions and 12 deletions.
diff --git a/packages/cli/core/template/package.json b/packages/cli/core/template/package.json
@@ -39,7 +39,11 @@
     "@leanup/cli": "1.3.1",
     "@leanup/git-hooks": "1.3.1",
     "@leanup/stack": "1.3.1",
+    "@leanup/stack-vite": "1.3.1",
     "@leanup/stack-webpack": "1.3.1",
+    "@unocss/preset-mini": "0.22.7",
+    "@unocss/vite": "0.22.7",
+    "@unocss/webpack": "0.22.7",
     "chromedriver": "97.0.4",
     "npm-check-updates": "12.2.1",
     "postcss-windicss": "1.0.0",

diff --git a/packages/cli/core/template/unocss.config.ts b/packages/cli/core/template/unocss.config.ts
@@ -0,0 +1,6 @@
+import { presetMini } from '@unocss/preset-mini';
+import { defineConfig } from '@unocss/webpack';
+
+export default defineConfig({
+  presets: [presetMini()],
+});
diff --git a/packages/cli/frameworks/solid/template/vite.config.js b/packages/cli/frameworks/solid/template/vite.config.js
diff --git a/packages/cli/frameworks/solid/template/vite.config.ts b/packages/cli/frameworks/solid/template/vite.config.ts
@@ -0,0 +1,11 @@
+import { mergeConfig } from 'vite';
+import config from '@leanup/stack-solid/vite.config';
+import UnocssPlugin from '@unocss/vite';
+
+export default mergeConfig(config, {
+  plugins: [UnocssPlugin()],
+  build: {
+    polyfillDynamicImport: false,
+    target: 'esnext',
+  },
+});
diff --git a/packages/stack/frameworks/solid/package-lock.json b/packages/stack/frameworks/solid/package-lock.json
diff --git a/packages/stack/frameworks/solid/package.json b/packages/stack/frameworks/solid/package.json
@@ -40,9 +40,11 @@
   "dependencies": {
     "@leanup/cli-core-babel": "1.3.1",
     "@snowpack/plugin-babel": "2.1.7",
-    "babel-preset-solid": "1.3.5"
+    "babel-preset-solid": "1.3.5",
+    "vite-plugin-solid": "2.2.5"
   },
   "devDependencies": {
+    "@leanup/stack-vite": "1.3.1",
     "@leanup/stack-webpack": "1.3.1",
     "@types/node": "17.0.14",
     "typescript": "4.5.5"

diff --git a/packages/stack/frameworks/solid/vite.config.js b/packages/stack/frameworks/solid/vite.config.js
@@ -1,3 +1,7 @@
+const { mergeConfig } = require('vite');
 const config = require('@leanup/stack-vite/vite.config');
-// https://www.npmjs.com/package/vite-plugin-solid
-module.exports = config;
+const solidPlugin = require('vite-plugin-solid');
+
+module.exports = mergeConfig(config, {
+  plugins: [solidPlugin()],
+});
diff --git a/packages/stack/vite/vite.config.js b/packages/stack/vite/vite.config.js
@@ -1,9 +1,9 @@
 const { resolve } = require('path');
 const { replaceCodePlugin } = require('vite-plugin-replace');
-const { REPLACEMENTS } = require('@leanup/stack/lib/replacements');
+const { REPLACEMENTS } = require('@leanup/stack');
 
 // https://vitejs.dev/config/#server-proxy
-const { PROXIES } = require('@leanup/stack/lib/proxies');
+const { PROXIES } = require('@leanup/stack');
 
 // https://vitejs.dev/config/
 module.exports = {