@konomi-app/k2 1.4.7 → 1.5.0

package/dist/commands/build.js

@@ -31,7 +31,15 @@ export async function action(options) {
         }, {});
         const k2Config = config ? await importK2Config(config) : getDefaultK2Config();
         const fullConfig = { ...k2Config, outDir };
-        await Promise.allSettled([base({ entries, outDir }), buildTailwind(fullConfig)]);
+        const results = await Promise.allSettled([
+            base({ entries, outDir }),
+            buildTailwind(fullConfig),
+        ]);
+        for (const result of results) {
+            if (result.status === 'rejected') {
+                throw result.reason;
+            }
+        }
         console.log('✨ Build success.');
     }
     catch (error) {

package/dist/commands/plugin-build.js

@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
 import { importK2PluginConfig } from '../lib/import.js';
-import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
+import { getTailwindConfig, getTailwindInputCss, outputCss } from '../lib/tailwind.js';
 import base from './build-base.js';
 import { lint } from '../lib/lint.js';
 export default function command() {
@@ -29,17 +29,16 @@ export async function action() {
         };
         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 inputFile = getTailwindInputCss(config.tailwind);
             await outputCss({
-                inputPath,
+                inputPath: inputFile.config,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.css'),
                 config: tailwindConfig.config,
                 minify: true,
             });
             console.log('✨ Built config.css');
             await outputCss({
-                inputPath,
+                inputPath: inputFile.desktop,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'desktop.css'),
                 config: tailwindConfig.desktop,
                 minify: true,

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

@@ -1,7 +1,7 @@
 import path from 'path';
 import { PLUGIN_DEVELOPMENT_DIRECTORY } from '../../lib/constants.js';
 import chalk from 'chalk';
-import { getTailwindConfig, watchTailwindCSS } from '../../lib/tailwind.js';
+import { getTailwindConfig, getTailwindInputCss, watchTailwindCSS } from '../../lib/tailwind.js';
 async function buildTailwindCSS(params) {
     const { inputFile, outputFileName, config } = params;
     const inputPath = path.resolve(inputFile);
@@ -24,9 +24,17 @@ export const watchCss = async (pluginConfig) => {
         return;
     }
     const tailwindConfig = await getTailwindConfig(pluginConfig.tailwind);
-    const inputFile = path.resolve(pluginConfig.tailwind.css);
+    const inputFile = getTailwindInputCss(pluginConfig.tailwind);
     return Promise.all([
-        buildTailwindCSS({ inputFile, outputFileName: 'desktop.css', config: tailwindConfig.desktop }),
-        buildTailwindCSS({ inputFile, outputFileName: 'config.css', config: tailwindConfig.config }),
+        buildTailwindCSS({
+            inputFile: inputFile.desktop,
+            outputFileName: 'desktop.css',
+            config: tailwindConfig.desktop,
+        }),
+        buildTailwindCSS({
+            inputFile: inputFile.config,
+            outputFileName: 'config.css',
+            config: tailwindConfig.config,
+        }),
     ]);
 };

package/dist/commands/plugin-esbuild.js

@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
 import { importK2PluginConfig } from '../lib/import.js';
-import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
+import { getTailwindConfig, getTailwindInputCss, outputCss } from '../lib/tailwind.js';
 import { buildWithEsbuild } from '../lib/esbuild.js';
 import { lint } from '../lib/lint.js';
 export default function command() {
@@ -25,17 +25,16 @@ export async function action() {
         }
         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 inputFile = getTailwindInputCss(config.tailwind);
             await outputCss({
-                inputPath,
+                inputPath: inputFile.config,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.css'),
                 config: tailwindConfig.config,
                 minify: true,
             });
             console.log('✨ Built config.css');
             await outputCss({
-                inputPath,
+                inputPath: inputFile.desktop,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'desktop.css'),
                 config: tailwindConfig.desktop,
                 minify: true,

package/dist/lib/tailwind.js

@@ -11,6 +11,18 @@ export const getTailwindConfigFromK2Config = async (k2Config) => {
     const config = (await esmImport(path.resolve(k2Config?.config))).default;
     return config;
 };
+export const getTailwindInputCss = (config) => {
+    invariant(config?.css, 'tailwind.css is required');
+    const { css } = config;
+    if (typeof css === 'string') {
+        const resolved = path.resolve(css);
+        return { desktop: resolved, config: resolved };
+    }
+    return {
+        desktop: path.resolve(css.desktop),
+        config: path.resolve(css.config),
+    };
+};
 export const getTailwindConfig = async (config) => {
     invariant(config?.config, 'tailwind.config is required');
     const { config: configPath } = config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomi-app/k2",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "description": "kintone sdk",
   "main": "./dist/index.js",
   "type": "module",

package/types/plugin.d.ts

@@ -134,7 +134,7 @@ declare namespace Plugin {
       tailwind?: {
         config?: string | { config: string; desktop: string };
         /** CSSファイルのパス */
-        css?: string;
+        css?: string | { config: string; desktop: string };
       };
     };
   }