@konomi-app/k2 1.2.0 → 1.3.1

package/dist/commands/build-esbuild.js

@@ -3,18 +3,23 @@ import fs from 'fs-extra';
 import path from 'path';
 import { WORKSPACE_DIRECTORY } from '../lib/constants.js';
 import { buildWithEsbuild } from '../lib/esbuild.js';
+import { importK2Config } from '../lib/import.js';
+import { getDefaultK2Config } from '../lib/k2.js';
+import { buildTailwind } from './build-tailwind.js';
 export default function command() {
     program
         .command('esbuild-build')
         .option('-o, --outdir <outdir>', 'Output directory.', path.join(WORKSPACE_DIRECTORY, 'prod'))
         .option('-i, --input <input>', 'Input directory.', path.join('src', 'apps'))
+        .option('--config <config>', 'k2 config file path')
         .description("Build the project for production. (It's a wrapper of webpack build command.)")
         .action(action);
 }
 export async function action(options) {
     console.group('🍳 Build the project for production');
     try {
-        const { outdir, input } = options;
+        const { outdir, input, config } = options;
+        const outDir = path.resolve(outdir);
         const allProjects = fs.readdirSync(path.resolve(input));
         const entryPoints = allProjects.reduce((acc, dir) => {
             for (const filename of ['index.ts', 'index.js', 'index.mjs']) {
@@ -25,13 +30,18 @@ export async function action(options) {
             return acc;
         }, {});
         console.log(`📁 ${Object.keys(entryPoints).length} entry points`);
-        await buildWithEsbuild({
-            entryPoints,
-            outdir,
-            sourcemap: false,
-            minify: true,
-            target: 'es2020',
-        });
+        const k2Config = config ? await importK2Config(config) : getDefaultK2Config();
+        const fullConfig = { ...k2Config, outDir };
+        await Promise.allSettled([
+            buildWithEsbuild({
+                entryPoints,
+                outdir,
+                sourcemap: false,
+                minify: true,
+                legalComments: 'none',
+            }),
+            buildTailwind(fullConfig),
+        ]);
         console.log('✨ Build success.');
     }
     catch (error) {

package/dist/commands/plugin-esbuild.js

@@ -5,6 +5,7 @@ import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
 import { importPluginConfig } from '../lib/import.js';
 import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
 import { buildWithEsbuild } from '../lib/esbuild.js';
+import { lint } from '../lib/lint.js';
 export default function command() {
     program
         .command('esbuild')
@@ -15,13 +16,13 @@ export async function action() {
     console.group('🍳 Build the project for production');
     try {
         const config = await importPluginConfig();
+        if (config?.lint?.build) {
+            await lint();
+            console.log('✨ Lint success.');
+        }
         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);
@@ -30,12 +31,14 @@ export async function action() {
                 inputPath,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.css'),
                 config: tailwindConfig.config,
+                minify: true,
             });
             console.log('✨ Built config.css');
             await outputCss({
                 inputPath,
                 outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'desktop.css'),
-                config: tailwindConfig.config,
+                config: tailwindConfig.desktop,
+                minify: true,
             });
             console.log('✨ Built desktop.css');
         }
@@ -48,6 +51,7 @@ export async function action() {
             outdir: PLUGIN_CONTENTS_DIRECTORY,
             minify: true,
             sourcemap: false,
+            legalComments: 'none',
         });
         console.log('✨ Built desktop.js and config.js');
         console.log('✨ Build success.');

package/dist/index.js

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

package/dist/lib/zip.js

@@ -5,8 +5,22 @@ import invariant from 'tiny-invariant';
 import { PLUGIN_CONTENTS_DIRECTORY, PLUGIN_WORKSPACE_DIRECTORY } from './constants.js';
 export const outputContentsZip = async (manifest) => {
     const archive = archiver('zip', { zlib: { level: 9 } });
+    archive.on('warning', (error) => {
+        if (error.code === 'ENOENT') {
+            console.warn(error);
+        }
+        else {
+            throw error;
+        }
+    });
     const outputZipPath = path.join(PLUGIN_WORKSPACE_DIRECTORY, 'contents.zip');
     const outputZipStream = fs.createWriteStream(outputZipPath);
+    outputZipStream.on('close', () => {
+        console.log(`📦 ${archive.pointer()} total bytes`);
+    });
+    outputZipStream.on('end', function () {
+        console.log('📦 Data has been drained');
+    });
     const filterLocalContent = (file) => {
         return !/^https?:\/\//.test(file);
     };
@@ -24,17 +38,22 @@ export const outputContentsZip = async (manifest) => {
             ...(manifest.config.css || []).filter(filterLocalContent),
         ]),
     ];
-    console.log('📁 Target files');
-    console.dir(targetFiles);
-    targetFiles.forEach((file) => {
+    console.group('📁 Target files');
+    targetFiles.forEach((file, i) => {
+        const prefix = i === targetFiles.length - 1 ? '└─' : '├─';
+        console.log(`${prefix} 📄 ${file}`);
+    });
+    console.groupEnd();
+    for (const file of targetFiles) {
         const filePath = path.join(PLUGIN_CONTENTS_DIRECTORY, file);
         if (!fs.existsSync(filePath)) {
             throw new Error(`${filePath} does not exist`);
         }
         archive.file(filePath, { name: file });
-    });
+    }
     archive.pipe(outputZipStream);
     await archive.finalize();
+    await new Promise((resolve) => outputZipStream.on('close', resolve));
 };
 export const getContentsZipBuffer = async () => {
     const outputZipPath = path.join(PLUGIN_WORKSPACE_DIRECTORY, 'contents.zip');

package/dist/plugin.js

@@ -10,7 +10,7 @@ import test from './commands/test/index.js';
 import upload from './commands/upload/index.js';
 import zip from './commands/plugin-zip.js';
 import lint from './commands/lint.js';
-program.name('plugin').version('0.9.0').description('🍳 kintone kitchen 🍳 for kintone plugin');
+program.name('plugin').version('1.3.1').description('🍳 kintone kitchen 🍳 for kintone plugin');
 build();
 esbuild();
 dev();

package/package.json

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