watercolor-ui 1.2.0 → 1.2.2

package/LICENSE

@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2024 Watercolor UI Team
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -8,36 +8,26 @@ This package is an installer for Watercolor UI.
 npm install watercolor-ui
 ```
 
-During installation, it will install the core package and the selected platform package:
+Run the installer to install the core package and the selected platform package:
 
 - `@zeturn/watercolor-core`
 - `@zeturn/watercolor-react` or `@zeturn/watercolor-vue`
 - One icon package (optional)
 
-### Control the selection
+### Choose a platform
 
-Set the framework explicitly if you want non-interactive installs:
+Use the CLI interactively:
 
 ```bash
-WATERCOLOR_UI_FRAMEWORK=react npm install watercolor-ui
-WATERCOLOR_UI_FRAMEWORK=vue npm install watercolor-ui
-WATERCOLOR_UI_FRAMEWORK=both npm install watercolor-ui
-```
-
-Set the icon pack explicitly (defaults to none):
-
-```bash
-WATERCOLOR_UI_ICONS=feather npm install watercolor-ui
-WATERCOLOR_UI_ICONS=heroicons npm install watercolor-ui
-WATERCOLOR_UI_ICONS=lucide npm install watercolor-ui
-WATERCOLOR_UI_ICONS=phosphor npm install watercolor-ui
-WATERCOLOR_UI_ICONS=tabler npm install watercolor-ui
+npx watercolor-ui
 ```
 
-You can also run the installer manually:
+Or choose the framework and optional icon pack explicitly:
 
 ```bash
 npx watercolor-ui --framework react
-npx watercolor-ui --icons lucide
-npx watercolor-ui
+npx watercolor-ui --framework vue --icons lucide
 ```
+
+Installing `watercolor-ui` has no postinstall side effects. The CLI only changes
+dependencies when you invoke it explicitly.

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "watercolor-ui",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Watercolor UI installer for core and platform packages",
+  "type": "commonjs",
   "main": "scripts/installer.js",
   "bin": {
     "watercolor-ui": "bin/watercolor-ui.js"
@@ -12,9 +13,6 @@
     "README.md",
     "package.json"
   ],
-  "scripts": {
-    "postinstall": "node scripts/postinstall.js"
-  },
   "publishConfig": {
     "access": "public"
   },

package/scripts/installer.js

@@ -2,29 +2,32 @@ const fs = require('fs')
 const path = require('path')
 const { spawnSync } = require('child_process')
 const readline = require('readline')
+const { version: WATERCOLOR_VERSION } = require('../package.json')
 
-const PACKAGE_CORE = '@zeturn/watercolor-core'
-const PACKAGE_REACT = '@zeturn/watercolor-react'
-const PACKAGE_VUE = '@zeturn/watercolor-vue'
+const watercolorPackage = name => `${name}@${WATERCOLOR_VERSION}`
+const PACKAGE_CORE = watercolorPackage('@zeturn/watercolor-core')
+const PACKAGE_REACT = watercolorPackage('@zeturn/watercolor-react')
+const PACKAGE_VUE = watercolorPackage('@zeturn/watercolor-vue')
 const ICON_PACKAGES = {
-  feather: '@zeturn/watercolor-icons-feather',
+  feather: watercolorPackage('@zeturn/watercolor-icons-feather'),
   heroicons: {
-    react: '@zeturn/watercolor-icons-heroicons-react',
-    vue: '@zeturn/watercolor-icons-heroicons-vue'
+    react: watercolorPackage('@zeturn/watercolor-icons-heroicons-react'),
+    vue: watercolorPackage('@zeturn/watercolor-icons-heroicons-vue')
   },
   lucide: {
-    react: '@zeturn/watercolor-icons-lucide-react',
-    vue: '@zeturn/watercolor-icons-lucide-vue'
+    react: watercolorPackage('@zeturn/watercolor-icons-lucide-react'),
+    vue: watercolorPackage('@zeturn/watercolor-icons-lucide-vue')
   },
   phosphor: {
-    react: '@zeturn/watercolor-icons-phosphor-react',
-    vue: '@zeturn/watercolor-icons-phosphor-vue'
+    react: watercolorPackage('@zeturn/watercolor-icons-phosphor-react'),
+    vue: watercolorPackage('@zeturn/watercolor-icons-phosphor-vue')
   },
   tabler: {
-    react: '@zeturn/watercolor-icons-tabler-react',
-    vue: '@zeturn/watercolor-icons-tabler-vue'
+    react: watercolorPackage('@zeturn/watercolor-icons-tabler-react'),
+    vue: watercolorPackage('@zeturn/watercolor-icons-tabler-vue')
   }
 }
+const packageName = specifier => specifier.slice(0, specifier.lastIndexOf('@'))
 const ROOT_PACKAGE_NAME = 'watercolor-ui-root'
 
 function getPackageManager() {
@@ -53,8 +56,8 @@ function detectFramework(pkg) {
     ...(pkg.peerDependencies || {})
   }
 
-  const hasReact = Boolean(deps.react || deps['react-dom'] || deps[PACKAGE_REACT])
-  const hasVue = Boolean(deps.vue || deps[PACKAGE_VUE])
+  const hasReact = Boolean(deps.react || deps['react-dom'] || deps[packageName(PACKAGE_REACT)])
+  const hasVue = Boolean(deps.vue || deps[packageName(PACKAGE_VUE)])
 
   if (hasReact && hasVue) return 'both'
   if (hasReact) return 'react'
@@ -71,11 +74,11 @@ function detectIconPack(pkg) {
   }
 
   const detected = []
-  if (deps[ICON_PACKAGES.feather]) detected.push('feather')
-  if (deps[ICON_PACKAGES.heroicons.react] || deps[ICON_PACKAGES.heroicons.vue]) detected.push('heroicons')
-  if (deps[ICON_PACKAGES.lucide.react] || deps[ICON_PACKAGES.lucide.vue]) detected.push('lucide')
-  if (deps[ICON_PACKAGES.phosphor.react] || deps[ICON_PACKAGES.phosphor.vue]) detected.push('phosphor')
-  if (deps[ICON_PACKAGES.tabler.react] || deps[ICON_PACKAGES.tabler.vue]) detected.push('tabler')
+  if (deps[packageName(ICON_PACKAGES.feather)]) detected.push('feather')
+  if (deps[packageName(ICON_PACKAGES.heroicons.react)] || deps[packageName(ICON_PACKAGES.heroicons.vue)]) detected.push('heroicons')
+  if (deps[packageName(ICON_PACKAGES.lucide.react)] || deps[packageName(ICON_PACKAGES.lucide.vue)]) detected.push('lucide')
+  if (deps[packageName(ICON_PACKAGES.phosphor.react)] || deps[packageName(ICON_PACKAGES.phosphor.vue)]) detected.push('phosphor')
+  if (deps[packageName(ICON_PACKAGES.tabler.react)] || deps[packageName(ICON_PACKAGES.tabler.vue)]) detected.push('tabler')
 
   if (detected.length === 1) return detected[0]
   return null

package/scripts/postinstall.js

@@ -1,5 +0,0 @@
-const { runInstaller } = require('./installer')
-
-runInstaller({ interactive: true }).catch(error => {
-  console.warn('[watercolor-ui] Installer error:', error.message)
-})