@konomi-app/k2 0.6.0 → 0.7.0

package/dist/commands/plugin-dev/index.js

@@ -21,22 +21,7 @@ export async function action(options) {
         const port = config.server?.port ?? DEFAULT_PORT;
         const manifest = await getManifest({ config, port });
         console.log(`📝 manifest.json generated`);
-        Promise.all([
-            watchContentsAndUploadZip({ manifest, ppkPath }),
-            watchCss(config),
-            async () => {
-                const entryPoints = ['desktop', 'config'].map((dir) => ({
-                    in: path.join('src', dir, 'index.ts'),
-                    out: dir,
-                }));
-                base({
-                    port,
-                    entryPoints,
-                    certDir: PLUGIN_WORKSPACE_DIRECTORY,
-                    staticDir: PLUGIN_DEVELOPMENT_DIRECTORY,
-                });
-            },
-        ]);
+        Promise.all([watchContentsAndUploadZip({ manifest, ppkPath }), watchCss(config), build(port)]);
     }
     catch (error) {
         throw error;
@@ -45,3 +30,15 @@ export async function action(options) {
         console.groupEnd();
     }
 }
+async function build(port) {
+    const entryPoints = ['desktop', 'config'].map((dir) => ({
+        in: path.join('src', dir, 'index.ts'),
+        out: dir,
+    }));
+    base({
+        port,
+        entryPoints,
+        certDir: PLUGIN_WORKSPACE_DIRECTORY,
+        staticDir: PLUGIN_DEVELOPMENT_DIRECTORY,
+    });
+}

package/dist/commands/plugin-dev/tailwind.js

@@ -5,14 +5,26 @@ import tailwindcss from 'tailwindcss';
 import { PLUGIN_DEVELOPMENT_DIRECTORY } from '../../lib/constants.js';
 import { esmImport } from '../../lib/import.js';
 import chokidar from 'chokidar';
+import chalk from 'chalk';
 async function buildTailwindCSS(params) {
     const { inputFile, outputFileName, config } = params;
     const inputPath = path.resolve(inputFile);
     const outputPath = path.join(PLUGIN_DEVELOPMENT_DIRECTORY, outputFileName);
     const css = await fs.readFile(inputPath, 'utf8');
-    const watcher = chokidar.watch(config.content ?? ['./src/**/*.{ts,tsx}'], { ignored: /node_modules/, persistent: true });
-    const listener = async () => {
+    const watcher = chokidar.watch([...(config.content ?? ['./src/**/*.{ts,tsx}']), inputPath], {
+        ignored: /node_modules/,
+        persistent: true,
+        awaitWriteFinish: {
+            stabilityThreshold: 2000,
+            pollInterval: 100,
+        },
+    });
+    let initialScanComplete = false;
+    const listener = async (type, path) => {
         try {
+            if (type === 'add' && !initialScanComplete) {
+                return;
+            }
             const result = await postcss([tailwindcss(config)]).process(css, {
                 from: inputPath,
                 to: outputPath,
@@ -21,16 +33,22 @@ async function buildTailwindCSS(params) {
             if (result.map) {
                 await fs.writeFile(`${outputPath}.map`, result.map.toString());
             }
-            console.log(`🎨 Successfully built Tailwind CSS to ${outputPath}`);
+            console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                chalk.cyan(`[css] `) +
+                outputFileName +
+                (type === 'init' ? ' init' : ` rebuilt`));
         }
         catch (error) {
             console.error('Error building Tailwind CSS:', error);
         }
     };
-    await listener();
-    watcher.on('change', listener);
-    watcher.on('add', listener);
-    watcher.on('unlink', listener);
+    await listener('init');
+    watcher.on('ready', () => {
+        initialScanComplete = true;
+    });
+    watcher.on('change', (path) => listener('change', path));
+    watcher.on('add', (path) => listener('add', path));
+    watcher.on('unlink', () => listener('unlink'));
 }
 export const watchCss = async (pluginConfig) => {
     if (!pluginConfig.tailwind?.css || !pluginConfig.tailwind?.config) {
@@ -39,8 +57,8 @@ export const watchCss = async (pluginConfig) => {
     const { css, config: configPath } = pluginConfig.tailwind;
     const configPathForDesktop = typeof configPath === 'string' ? configPath : configPath.desktop;
     const configPathForConfig = typeof configPath === 'string' ? configPath : configPath.config;
-    const desktopConfig = await esmImport(path.resolve(configPathForDesktop));
-    const configConfig = await esmImport(path.resolve(configPathForConfig));
+    const desktopConfig = (await esmImport(path.resolve(configPathForDesktop))).default;
+    const configConfig = (await esmImport(path.resolve(configPathForConfig))).default;
     const inputFile = path.resolve(css);
     return Promise.all([
         buildTailwindCSS({ inputFile, outputFileName: 'desktop.css', config: desktopConfig }),

package/dist/commands/plugin-dev/upload.js

@@ -6,15 +6,23 @@ import path from 'path';
 import { PLUGIN_WORKSPACE_DIRECTORY } from '../../lib/constants.js';
 import { uploadZip } from '../../lib/utils.js';
 import chokider from 'chokidar';
+import chalk from 'chalk';
 export const watchContentsAndUploadZip = async (params) => {
     const { manifest, ppkPath } = params;
+    let initialScanComplete = false;
     const contentsListener = async () => {
         try {
+            if (!initialScanComplete) {
+                return;
+            }
             await copyPluginContents();
-            console.log('📁 contents updated');
+            console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                chalk.cyan(`[contents] `) +
+                `updated`);
         }
         catch (error) {
-            console.error('📁 contents update failed');
+            console.error('Error copying plugin contents:', error);
+            return;
         }
         await outputContentsZip(manifest);
         const buffer = await getContentsZipBuffer();
@@ -22,15 +30,20 @@ export const watchContentsAndUploadZip = async (params) => {
         const output = await packer(buffer, pluginPrivateKey);
         const zipFileName = `plugin${getZipFileNameSuffix('dev')}.zip`;
         await fs.writeFile(path.join(PLUGIN_WORKSPACE_DIRECTORY, zipFileName), output.plugin);
-        console.log(`📤 uploading ${zipFileName} to your kintone`);
+        console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+            chalk.cyan(`[upload] `) +
+            `start uploading`);
         await uploadZip('dev');
-        console.log('📤 Plugin uploaded');
+        console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) + chalk.cyan(`[upload] `) + `done`);
     };
-    await contentsListener();
     const contentsWatcher = chokider.watch(['src/contents/**/*'], {
         ignored: /node_modules/,
         persistent: true,
     });
+    contentsWatcher.on('ready', () => {
+        initialScanComplete = true;
+        contentsListener();
+    });
     contentsWatcher.on('change', contentsListener);
     contentsWatcher.on('add', contentsListener);
     contentsWatcher.on('unlink', contentsListener);

package/dist/lib/esbuild.js

@@ -43,9 +43,9 @@ export const getEsbuildContext = async (params) => {
         plugins: [
             {
                 name: 'on-end',
-                setup: ({ onEnd }) => onEnd(() => console.log(chalk.hex('#d1d5db')(`${new Date().toLocaleTimeString()} `) +
-                    chalk.cyan(`[content] `) +
-                    `Compiled successfully.`)),
+                setup: ({ onEnd }) => onEnd(() => console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                    chalk.cyan(`[js] `) +
+                    `rebuilt`)),
             },
             getSassPlugin(),
         ],

package/dist/plugin.js

@@ -8,7 +8,7 @@ import manifest from './commands/manifest/index.js';
 import test from './commands/test/index.js';
 import upload from './commands/upload/index.js';
 import zip from './commands/plugin-zip.js';
-program.name('plugin').version('0.0.1').description('');
+program.name('plugin').version('0.7.0').description('');
 build();
 dev();
 genkey();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomi-app/k2",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "kintone sdk",
   "main": "./dist/index.js",
   "type": "module",
@@ -56,4 +56,4 @@
     "@types/html-minifier": "^4",
     "typescript": "*"
   }
-}
+}