@octohash/vite-config 0.3.0 → 0.3.2

package/README.md

@@ -7,7 +7,7 @@
 Opinionated but customizable, with built-in support for unplugin, i18n, and more.
 
 ```bash
-pnpm add -d @octohash/vite-config
+pnpm add -D @octohash/vite-config
 ```
 
 ## Usage
@@ -58,7 +58,7 @@ interface OptionsConfig {
 
   // Common Plugin
   /**
-   * https://github.com/btd/rollup-plugin-visualizer
+   * https://github.com/KusStar/vite-bundle-visualizer
    * By default template path is: ./node_modules/.cache/visualizer/stats.html
    *
    * @default false

package/dist/index.d.mts

@@ -2,7 +2,6 @@ import * as vite from 'vite';
 import { AliasOptions, UserConfig, PluginOption } from 'vite';
 import { PluginOptions as PluginOptions$1 } from '@intlify/unplugin-vue-i18n';
 import { VitePluginFederationOptions } from '@originjs/vite-plugin-federation';
-import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
 import { Options } from 'unplugin-auto-import/types';
 import { Options as Options$1 } from 'unplugin-vue-components';
 import { Options as Options$2 } from 'unplugin-vue-router';
@@ -45,12 +44,18 @@ interface MetadataPluginOptions {
 type ProjectType = 'app' | 'lib';
 interface CommonPluginOptions {
     /**
-     * https://github.com/btd/rollup-plugin-visualizer
+     * https://github.com/KusStar/vite-bundle-visualizer
      * By default template path is: ./node_modules/.cache/visualizer/stats.html
      *
      * @default false
      */
-    visualizer?: boolean | PluginVisualizerOptions;
+    visualizer?: boolean | {
+        help?: boolean;
+        template?: 'treemap' | 'sunburst' | 'network';
+        output?: string;
+        open?: boolean;
+        config?: string;
+    };
     /**
      * Inject license info to output files
      * Load license file from `package.json`, if it is a monorepo project, the root `package.json` will also be merged

package/dist/index.mjs

@@ -10,7 +10,6 @@ import v8 from 'node:v8';
 import { format, inspect } from 'node:util';
 import { defineConfig as defineConfig$1, mergeConfig } from 'vite';
 import { findUp as findUp$2 } from 'find-up';
-import { visualizer } from 'rollup-plugin-visualizer';
 import { EOL } from 'node:os';
 import Vue from '@vitejs/plugin-vue';
 import VueJsx from '@vitejs/plugin-vue-jsx';
@@ -899,6 +898,49 @@ pp$8.isAsyncFunction = function() {
      !(isIdentifierChar(after = this.input.charCodeAt(next + 8)) || after > 0xd7ff && after < 0xdc00))
 };
 
+pp$8.isUsingKeyword = function(isAwaitUsing, isFor) {
+  if (this.options.ecmaVersion < 17 || !this.isContextual(isAwaitUsing ? "await" : "using"))
+    { return false }
+
+  skipWhiteSpace.lastIndex = this.pos;
+  var skip = skipWhiteSpace.exec(this.input);
+  var next = this.pos + skip[0].length;
+
+  if (lineBreak.test(this.input.slice(this.pos, next))) { return false }
+
+  if (isAwaitUsing) {
+    var awaitEndPos = next + 5 /* await */, after;
+    if (this.input.slice(next, awaitEndPos) !== "using" ||
+      awaitEndPos === this.input.length ||
+      isIdentifierChar(after = this.input.charCodeAt(awaitEndPos)) ||
+      (after > 0xd7ff && after < 0xdc00)
+    ) { return false }
+
+    skipWhiteSpace.lastIndex = awaitEndPos;
+    var skipAfterUsing = skipWhiteSpace.exec(this.input);
+    if (skipAfterUsing && lineBreak.test(this.input.slice(awaitEndPos, awaitEndPos + skipAfterUsing[0].length))) { return false }
+  }
+
+  if (isFor) {
+    var ofEndPos = next + 2 /* of */, after$1;
+    if (this.input.slice(next, ofEndPos) === "of") {
+      if (ofEndPos === this.input.length ||
+        (!isIdentifierChar(after$1 = this.input.charCodeAt(ofEndPos)) && !(after$1 > 0xd7ff && after$1 < 0xdc00))) { return false }
+    }
+  }
+
+  var ch = this.input.charCodeAt(next);
+  return isIdentifierStart(ch, true) || ch === 92 // '\'
+};
+
+pp$8.isAwaitUsing = function(isFor) {
+  return this.isUsingKeyword(true, isFor)
+};
+
+pp$8.isUsing = function(isFor) {
+  return this.isUsingKeyword(false, isFor)
+};
+
 // Parse a single statement.
 //
 // If expecting a statement and finding a slash operator, parse a
@@ -975,6 +1017,23 @@ pp$8.parseStatement = function(context, topLevel, exports) {
       return this.parseFunctionStatement(node, true, !context)
     }
 
+    var usingKind = this.isAwaitUsing(false) ? "await using" : this.isUsing(false) ? "using" : null;
+    if (usingKind) {
+      if (topLevel && this.options.sourceType === "script") {
+        this.raise(this.start, "Using declaration cannot appear in the top level when source type is `script`");
+      }
+      if (usingKind === "await using") {
+        if (!this.canAwait) {
+          this.raise(this.start, "Await using cannot appear outside of async function");
+        }
+        this.next();
+      }
+      this.next();
+      this.parseVar(node, false, usingKind);
+      this.semicolon();
+      return this.finishNode(node, "VariableDeclaration")
+    }
+
     var maybeName = this.value, expr = this.parseExpression();
     if (starttype === types$1.name && expr.type === "Identifier" && this.eat(types$1.colon))
       { return this.parseLabeledStatement(node, maybeName, expr, context) }
@@ -1050,18 +1109,19 @@ pp$8.parseForStatement = function(node) {
     this.next();
     this.parseVar(init$1, true, kind);
     this.finishNode(init$1, "VariableDeclaration");
-    if ((this.type === types$1._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init$1.declarations.length === 1) {
-      if (this.options.ecmaVersion >= 9) {
-        if (this.type === types$1._in) {
-          if (awaitAt > -1) { this.unexpected(awaitAt); }
-        } else { node.await = awaitAt > -1; }
-      }
-      return this.parseForIn(node, init$1)
-    }
-    if (awaitAt > -1) { this.unexpected(awaitAt); }
-    return this.parseFor(node, init$1)
+    return this.parseForAfterInit(node, init$1, awaitAt)
   }
   var startsWithLet = this.isContextual("let"), isForOf = false;
+
+  var usingKind = this.isUsing(true) ? "using" : this.isAwaitUsing(true) ? "await using" : null;
+  if (usingKind) {
+    var init$2 = this.startNode();
+    this.next();
+    if (usingKind === "await using") { this.next(); }
+    this.parseVar(init$2, true, usingKind);
+    this.finishNode(init$2, "VariableDeclaration");
+    return this.parseForAfterInit(node, init$2, awaitAt)
+  }
   var containsEsc = this.containsEsc;
   var refDestructuringErrors = new DestructuringErrors;
   var initPos = this.start;
@@ -1087,6 +1147,20 @@ pp$8.parseForStatement = function(node) {
   return this.parseFor(node, init)
 };
 
+// Helper method to parse for loop after variable initialization
+pp$8.parseForAfterInit = function(node, init, awaitAt) {
+  if ((this.type === types$1._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init.declarations.length === 1) {
+    if (this.options.ecmaVersion >= 9) {
+      if (this.type === types$1._in) {
+        if (awaitAt > -1) { this.unexpected(awaitAt); }
+      } else { node.await = awaitAt > -1; }
+    }
+    return this.parseForIn(node, init)
+  }
+  if (awaitAt > -1) { this.unexpected(awaitAt); }
+  return this.parseFor(node, init)
+};
+
 pp$8.parseFunctionStatement = function(node, isAsync, declarationPosition) {
   this.next();
   return this.parseFunction(node, FUNC_STATEMENT | (declarationPosition ? 0 : FUNC_HANGING_STATEMENT), false, isAsync)
@@ -1343,6 +1417,8 @@ pp$8.parseVar = function(node, isFor, kind, allowMissingInitializer) {
       decl.init = this.parseMaybeAssign(isFor);
     } else if (!allowMissingInitializer && kind === "const" && !(this.type === types$1._in || (this.options.ecmaVersion >= 6 && this.isContextual("of")))) {
       this.unexpected();
+    } else if (!allowMissingInitializer && (kind === "using" || kind === "await using") && this.options.ecmaVersion >= 17 && this.type !== types$1._in && !this.isContextual("of")) {
+      this.raise(this.lastTokEnd, ("Missing initializer in " + kind + " declaration"));
     } else if (!allowMissingInitializer && decl.id.type !== "Identifier" && !(isFor && (this.type === types$1._in || this.isContextual("of")))) {
       this.raise(this.lastTokEnd, "Complex binding patterns require an initialization value");
     } else {
@@ -1355,7 +1431,10 @@ pp$8.parseVar = function(node, isFor, kind, allowMissingInitializer) {
 };
 
 pp$8.parseVarId = function(decl, kind) {
-  decl.id = this.parseBindingAtom();
+  decl.id = kind === "using" || kind === "await using"
+    ? this.parseIdent()
+    : this.parseBindingAtom();
+
   this.checkLValPattern(decl.id, kind === "var" ? BIND_VAR : BIND_LEXICAL, false);
 };
 
@@ -3086,7 +3165,8 @@ pp$5.parseLiteral = function(value) {
   var node = this.startNode();
   node.value = value;
   node.raw = this.input.slice(this.start, this.end);
-  if (node.raw.charCodeAt(node.raw.length - 1) === 110) { node.bigint = node.raw.slice(0, -1).replace(/_/g, ""); }
+  if (node.raw.charCodeAt(node.raw.length - 1) === 110)
+    { node.bigint = node.value != null ? node.value.toString() : node.raw.slice(0, -1).replace(/_/g, ""); }
   this.next();
   return this.finishNode(node, "Literal")
 };
@@ -6116,11 +6196,9 @@ pp.readWord = function() {
 // Please use the [github bug tracker][ghbt] to report issues.
 //
 // [ghbt]: https://github.com/acornjs/acorn/issues
-//
-// [walk]: util/walk.js
 
 
-var version = "8.14.1";
+var version = "8.15.0";
 
 Parser.acorn = {
   Parser: Parser,
@@ -8103,7 +8181,7 @@ function normalizeid(id) {
   if (typeof id !== "string") {
     id = id.toString();
   }
-  if (/(node|data|http|https|file):/.test(id)) {
+  if (/(?:node|data|http|https|file):/.test(id)) {
     return id;
   }
   if (BUILTIN_MODULES.has(id)) {
@@ -8137,7 +8215,7 @@ function _resolve$1(id, options = {}) {
       throw new TypeError("input must be a `string` or `URL`");
     }
   }
-  if (/(node|data|http|https):/.test(id)) {
+  if (/(?:node|data|http|https):/.test(id)) {
     return id;
   }
   if (BUILTIN_MODULES.has(id)) {
@@ -10221,10 +10299,10 @@ const isCwdInScope = isPackageExists("@octohash/vite-config");
 function isPackageInScope(name) {
   return isPackageExists(name, { paths: [scopeUrl] });
 }
-async function ensurePackages(packages) {
+async function ensurePackages(packages, dev = true) {
   if (process$1.env.CI || process$1.stdout.isTTY === false || isCwdInScope === false)
     return;
-  const pkgs = packages.filter((i) => i && !isPackageInScope(i));
+  const pkgs = packages.filter((i) => i && !isPackageInScope(i) && !isPackageExists(i));
   if (pkgs.length === 0)
     return;
   const p = await import('@clack/prompts');
@@ -10233,7 +10311,7 @@ async function ensurePackages(packages) {
   });
   if (result) {
     const { installPackage } = await import('@antfu/install-pkg');
-    await installPackage(pkgs, { dev: true });
+    await installPackage(pkgs, { dev });
   }
 }
 
@@ -10296,22 +10374,24 @@ async function generateLicenseText(options) {
 }
 
 async function loadCommonPlugins(options) {
-  const { isBuild, visualizer: visualizer$1 = false, license = true, federation } = options;
+  const { isBuild, visualizer = false, license = true, federation } = options;
   ensurePackages([
     federation ? "@originjs/vite-plugin-federation" : void 0
   ]);
   return await loadPlugins([
     {
-      condition: isBuild && !!visualizer$1,
-      plugins: () => [
-        visualizer(
-          typeof visualizer$1 === "boolean" ? {
-            filename: "./node_modules/.cache/visualizer/stats.html",
-            gzipSize: true,
-            open: true
-          } : visualizer$1
-        )
-      ]
+      condition: isBuild && !!visualizer,
+      plugins: async () => {
+        const module = await import('vite-bundle-visualizer');
+        return [
+          module.default(
+            typeof visualizer === "boolean" ? {
+              output: "./node_modules/.cache/visualizer/stats.html",
+              open: true
+            } : visualizer
+          )
+        ];
+      }
     },
     {
       condition: isBuild && !!license,
@@ -10409,6 +10489,8 @@ async function loadVuePlugins(projectType, options) {
     devtools ? "vite-plugin-vue-devtools" : void 0,
     i18n ? "@intlify/unplugin-vue-i18n" : void 0
   ]);
+  if (i18n)
+    await ensurePackages(["vue-i18n"], false);
   return loadPlugins([
     {
       condition: true,
@@ -10437,7 +10519,8 @@ async function loadVuePlugins(projectType, options) {
             typeof i18n === "boolean" ? {
               compositionOnly: true,
               fullInstall: true,
-              runtimeOnly: true
+              runtimeOnly: true,
+              include: [resolve(process$1.cwd(), "i18n/**")]
             } : i18n
           )
         ];
@@ -10502,6 +10585,10 @@ async function resolveAutoImports() {
     imports.push("@vueuse/core");
   if (isPackageExists("vue-i18n"))
     imports.push("vue-i18n");
+  if (isPackageExists("@unhead/vue")) {
+    const { unheadVueComposablesImports } = await import('@unhead/vue');
+    imports.push(unheadVueComposablesImports);
+  }
   return imports;
 }
 async function resolveUIComponentResolvers() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octohash/vite-config",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Opinionated Vite config preset.",
   "author": "jinghaihan",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "dist"
   ],
   "peerDependencies": {
+    "@unhead/vue": ">=2.0.0",
     "vite": ">=7.0.0"
   },
   "dependencies": {
@@ -40,10 +41,10 @@
     "@vitejs/plugin-vue-jsx": "^5.1.1",
     "find-up": "^8.0.0",
     "pathe": "^2.0.3",
-    "rollup-plugin-visualizer": "^6.0.5",
     "unplugin-auto-import": "^20.2.0",
     "unplugin-vue-components": "^30.0.0",
     "unplugin-vue-router": "^0.16.0",
+    "vite-bundle-visualizer": "^1.2.1",
     "vite-plugin-dts": "^4.5.4",
     "vite-plugin-dynamic-base": "^1.2.0"
   },