unframer 2.3.0 → 2.5.0

package/esm/utils.d.ts

@@ -1,5 +1,6 @@
 export declare const logger: {
     log(...args: any[]): void;
+    green(...args: any[]): void;
     error(...args: any[]): void;
 };
 //# sourceMappingURL=utils.d.ts.map

package/esm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM;;;CAOlB,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM;;;;CAUlB,CAAA"}

package/esm/utils.js

@@ -4,6 +4,9 @@ export const logger = {
     log(...args) {
         console.log(prefix, ...args);
     },
+    green(...args) {
+        console.log([prefix, ...args].map((x) => pico.green(x)).join(' '));
+    },
     error(...args) {
         console.error([prefix, ...args].map((x) => pico.red(x)).join(' '));
     },

package/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAE7B,MAAM,MAAM,GAAG,YAAY,CAAA;AAC3B,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,GAAG,CAAC,GAAG,IAAI;QACP,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC;IACD,KAAK,CAAC,GAAG,IAAI;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;CACJ,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAE7B,MAAM,MAAM,GAAG,YAAY,CAAA;AAC3B,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,GAAG,CAAC,GAAG,IAAI;QACP,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC;IACD,KAAK,CAAC,GAAG,IAAI;QACT,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IACD,KAAK,CAAC,GAAG,IAAI;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;CACJ,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unframer",
-  "version": "2.3.0",
-  "description": "",
+  "version": "2.5.0",
+  "description": "Import Framer components directly in your React app, type safe and customizable",
   "sideEffects": false,
   "repository": "https://github.com/remorses/unframer",
   "bin": "bin.js",

package/src/cli.tsx

@@ -6,35 +6,42 @@ import chokidar from 'chokidar'
 import fs from 'fs-extra'
 import findUp from 'find-up'
 import tmp from 'tmp'
-import path from 'path'
-const configName = 'unframer.json'
+import path, { basename } from 'path'
+const configNames = ['unframer.config.json', 'unframer.json']
 import { cac } from 'cac'
 import { logger } from './utils.js'
 import { BreakpointSizes } from './css.js'
 
-export const cli = cac()
+export const cli = cac('unframer')
 
 cli.command('', 'Run unframer')
-    .option('--watch', 'Watch for Framer and unframer.json changes')
+    .option('--watch', 'Watch for Framer and unframer.config.json changes')
     .action(async function main(options) {
+        fixOldUnframerPath()
         const cwd = process.cwd()
         const watch = process.argv.includes('--watch')
-        logger.log(`Looking for ${configName} in ${cwd}`)
-        const configPath = await findUp([configName], { cwd })
+        logger.log(`Looking for ${configNames.join(', ')} in ${cwd}`)
+        const configPath = await findUp(configNames, { cwd })
         if (!configPath) {
-            logger.log(`No ${configName} found`)
+            logger.log(`No ${configNames.join(', ')} found`)
             return
         }
+        let configBasename = basename(configPath!)
         const configContent = fs.readFileSync(configPath, 'utf8')
         if (!configContent) {
-            logger.log(`No ${configName} contents found`)
+            logger.log(`No ${configBasename} contents found`)
             return
         }
         let config = JSON.parse(configContent)
 
         let controller = new AbortController()
         setMaxListeners(0, controller.signal)
-        processConfig({ config, watch, signal: controller.signal })
+        processConfig({
+            config,
+            watch,
+            signal: controller.signal,
+            configBasename,
+        })
         if (!watch) {
             return
         }
@@ -44,7 +51,7 @@ cli.command('', 'Run unframer')
         })
 
         watcher.on('change', async (path) => {
-            logger.log(`${configName} changed`)
+            logger.log(`${configBasename} changed`)
             console.log()
             controller.abort()
 
@@ -55,7 +62,7 @@ cli.command('', 'Run unframer')
                 fs.readFileSync(configPath!, 'utf8'),
             )
             if (!newConfig) {
-                logger.log(`Invalid ${configName} file`)
+                logger.log(`Invalid ${configBasename} file`)
                 return
             }
             const newNames = getNewNames(config, newConfig)
@@ -67,6 +74,7 @@ cli.command('', 'Run unframer')
                         components: pluck(newConfig.components, newNames),
                     },
                     watch,
+                    configBasename,
                     // signal: controller.signal,
                 })
             }
@@ -84,13 +92,35 @@ const defaultConfig = `{
 }
 `
 
-cli.command('init', 'Init the unframer.json config').action(async (options) => {
-    fs.writeFileSync(`unframer.json`, defaultConfig)
-    const p = path.resolve(process.cwd(), 'unframer.json')
-    console.log(`${p} file created`)
-})
+function fixOldUnframerPath() {
+    // if unframer.json exists, rename it to unframer.config.json
+
+    const oldConfigPath = fs.existsSync('unframer.json')
+    if (oldConfigPath) {
+        fs.renameSync('unframer.json', 'unframer.config.json')
+        logger.green(
+            'legacy unframer.json config renamed to unframer.config.json',
+        )
+        return true
+    }
+    return false
+}
+
+cli.command('init', 'Init the unframer.config.json config').action(
+    async (options) => {
+        let fixed = fixOldUnframerPath()
+        if (fixed) {
+            return
+        }
+        fs.writeFileSync(`unframer.config.json`, defaultConfig)
+        const p = path.resolve(process.cwd(), 'unframer.config.json')
+        console.log(`${p} file created`)
+    },
+)
+
+const version = require('../package.json').version
 
-cli.help()
+cli.version(version).help()
 
 function safeJsonParse(json: string) {
     try {
@@ -131,16 +161,18 @@ async function processConfig({
     config,
     watch,
     signal,
+    configBasename,
 }: {
     config: Config
     watch: boolean
+    configBasename: string
     signal?: AbortSignal
 }) {
     try {
         const { components, breakpoints, outDir } = config || {}
         const installDir = path.resolve(process.cwd(), outDir || 'framer')
         if (!components) {
-            logger.log(`No components found in ${configName}`)
+            logger.log(`No components found in ${configBasename}`)
             return
         }