@konomi-app/k2 0.7.0 → 0.8.0

package/dist/commands/plugin-build.js

@@ -1,6 +1,9 @@
 import { program } from 'commander';
-import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
+import fs from 'fs-extra';
 import path from 'path';
+import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
+import { importPluginConfig } from '../lib/import.js';
+import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
 import base from './build-base.js';
 export default function command() {
     program
@@ -11,11 +14,36 @@ export default function command() {
 export async function action() {
     console.group('🍳 Build the project for production');
     try {
+        const config = await importPluginConfig();
+        if (!fs.existsSync(PLUGIN_CONTENTS_DIRECTORY)) {
+            await fs.mkdir(PLUGIN_CONTENTS_DIRECTORY, { recursive: true });
+        }
         const entries = {
             desktop: path.join('src', 'desktop', 'index.ts'),
             config: path.join('src', 'config', 'index.ts'),
         };
+        if (config.tailwind?.css && config.tailwind?.config) {
+            const tailwindConfig = await getTailwindConfig(config.tailwind);
+            const inputFile = path.resolve(config.tailwind.css);
+            const inputPath = path.resolve(inputFile);
+            const css = await fs.readFile(inputPath, 'utf8');
+            await outputCss({
+                css,
+                inputPath,
+                outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.css'),
+                config: tailwindConfig.config,
+            });
+            console.log('✨ Built config.css');
+            await outputCss({
+                css,
+                inputPath,
+                outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'desktop.css'),
+                config: tailwindConfig.config,
+            });
+            console.log('✨ Built desktop.css');
+        }
         await base({ entries, outDir: PLUGIN_CONTENTS_DIRECTORY });
+        console.log('✨ Built desktop.js and config.js');
         console.log('✨ Build success.');
     }
     catch (error) {

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

@@ -1,11 +1,9 @@
 import fs from 'fs-extra';
 import path from 'path';
-import postcss from 'postcss';
-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';
+import { getTailwindConfig, outputCss } from '../../lib/tailwind.js';
 async function buildTailwindCSS(params) {
     const { inputFile, outputFileName, config } = params;
     const inputPath = path.resolve(inputFile);
@@ -25,14 +23,7 @@ async function buildTailwindCSS(params) {
             if (type === 'add' && !initialScanComplete) {
                 return;
             }
-            const result = await postcss([tailwindcss(config)]).process(css, {
-                from: inputPath,
-                to: outputPath,
-            });
-            await fs.writeFile(outputPath, result.css);
-            if (result.map) {
-                await fs.writeFile(`${outputPath}.map`, result.map.toString());
-            }
+            await outputCss({ css, inputPath, outputPath, config });
             console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
                 chalk.cyan(`[css] `) +
                 outputFileName +
@@ -42,9 +33,9 @@ async function buildTailwindCSS(params) {
             console.error('Error building Tailwind CSS:', error);
         }
     };
-    await listener('init');
-    watcher.on('ready', () => {
+    watcher.on('ready', async () => {
         initialScanComplete = true;
+        await listener('init');
     });
     watcher.on('change', (path) => listener('change', path));
     watcher.on('add', (path) => listener('add', path));
@@ -54,14 +45,10 @@ export const watchCss = async (pluginConfig) => {
     if (!pluginConfig.tailwind?.css || !pluginConfig.tailwind?.config) {
         return;
     }
-    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))).default;
-    const configConfig = (await esmImport(path.resolve(configPathForConfig))).default;
-    const inputFile = path.resolve(css);
+    const tailwindConfig = await getTailwindConfig(pluginConfig.tailwind);
+    const inputFile = path.resolve(pluginConfig.tailwind.css);
     return Promise.all([
-        buildTailwindCSS({ inputFile, outputFileName: 'desktop.css', config: desktopConfig }),
-        buildTailwindCSS({ inputFile, outputFileName: 'config.css', config: configConfig }),
+        buildTailwindCSS({ inputFile, outputFileName: 'desktop.css', config: tailwindConfig.desktop }),
+        buildTailwindCSS({ inputFile, outputFileName: 'config.css', config: tailwindConfig.config }),
     ]);
 };

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

@@ -24,17 +24,26 @@ export const watchContentsAndUploadZip = async (params) => {
             console.error('Error copying plugin contents:', error);
             return;
         }
-        await outputContentsZip(manifest);
-        const buffer = await getContentsZipBuffer();
-        const pluginPrivateKey = await fs.readFile(path.resolve(ppkPath), 'utf8');
-        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(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
-            chalk.cyan(`[upload] `) +
-            `start uploading`);
-        await uploadZip('dev');
-        console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) + chalk.cyan(`[upload] `) + `done`);
+        try {
+            await outputContentsZip(manifest);
+            const buffer = await getContentsZipBuffer();
+            const pluginPrivateKey = await fs.readFile(path.resolve(ppkPath), 'utf8');
+            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(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                chalk.cyan(`[upload] `) +
+                `start uploading`);
+            await uploadZip('dev');
+            console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                chalk.cyan(`[upload] `) +
+                `done`);
+        }
+        catch (error) {
+            console.log(chalk.hex('#e5e7eb')(`${new Date().toLocaleTimeString()} `) +
+                chalk.cyan(`[upload] `) +
+                chalk.red(`failed`));
+        }
     };
     const contentsWatcher = chokider.watch(['src/contents/**/*'], {
         ignored: /node_modules/,

package/dist/index.js

@@ -6,7 +6,7 @@ import dev from './commands/dev.js';
 import viteDev from './commands/dev-vite.js';
 import genkey from './commands/genkey.js';
 import esbuildBuild from './commands/build-esbuild.js';
-program.name('k2').version('0.1.0').description('k2 - 🍳 kintone kitchen 🍳');
+program.name('k2').version('0.8.0').description('k2 - 🍳 kintone kitchen 🍳');
 build();
 viteBuild();
 esbuildBuild();

package/dist/lib/tailwind.js

@@ -0,0 +1,27 @@
+import cssnanoPlugin from 'cssnano';
+import fs from 'fs-extra';
+import path from 'path';
+import postcss from 'postcss';
+import tailwindcss from 'tailwindcss';
+import invariant from 'tiny-invariant';
+import { esmImport } from './import.js';
+export const getTailwindConfig = async (config) => {
+    invariant(config?.config, 'tailwind.config is required');
+    const { config: configPath } = config;
+    const configPathForDesktop = typeof configPath === 'string' ? configPath : configPath.desktop;
+    const configPathForConfig = typeof configPath === 'string' ? configPath : configPath.config;
+    const desktopConfig = (await esmImport(path.resolve(configPathForDesktop))).default;
+    const configConfig = (await esmImport(path.resolve(configPathForConfig))).default;
+    return { desktop: desktopConfig, config: configConfig };
+};
+export const outputCss = async (params) => {
+    const { inputPath, outputPath, config, css, minify = false } = params;
+    const result = await postcss([tailwindcss(config), ...(minify ? [cssnanoPlugin()] : [])]).process(css, {
+        from: inputPath,
+        to: outputPath,
+    });
+    await fs.writeFile(outputPath, result.css);
+    if (result.map) {
+        await fs.writeFile(`${outputPath}.map`, result.map.toString());
+    }
+};

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.7.0').description('');
+program.name('plugin').version('0.8.0').description('🍳 kintone kitchen 🍳 for kintone plugin');
 build();
 dev();
 genkey();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomi-app/k2",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "kintone sdk",
   "main": "./dist/index.js",
   "type": "module",
@@ -31,6 +31,7 @@
     "chokidar": "^3",
     "commander": "^12",
     "css-loader": "^7.1.2",
+    "cssnano": "^7.0.2",
     "dotenv": "^16",
     "esbuild": "^0.21",
     "express": "^4",
@@ -43,6 +44,7 @@
     "style-loader": "^4",
     "tailwindcss": "^3.4.4",
     "terser-webpack-plugin": "^5",
+    "tiny-invariant": "^1.3.3",
     "ts-loader": "^9",
     "tsconfig-paths-webpack-plugin": "^4",
     "vite": "^5",