@konomi-app/k2 1.7.6 → 1.8.1

package/dist/commands/build-base.js

@@ -1,3 +1,4 @@
+import {} from 'webpack';
 import { buildWithWebpack } from '../lib/webpack.js';
 export default async function action(params) {
     const { entries, outDir } = params;

package/dist/commands/build-esbuild.js

@@ -2,6 +2,7 @@ import { program } from 'commander';
 import fs from 'fs-extra';
 import path from 'path';
 import { WORKSPACE_DIRECTORY } from '../lib/constants.js';
+import {} from 'esbuild';
 import { buildWithEsbuild } from '../lib/esbuild.js';
 import { importK2Config } from '../lib/import.js';
 import { getDefaultK2Config } from '../lib/k2.js';

package/dist/commands/dev/index.js

@@ -1,4 +1,5 @@
 import { program } from 'commander';
+import {} from 'esbuild';
 import fs from 'fs-extra';
 import path from 'path';
 import { CONFIG_FILE_NAME, DEFAULT_PORT, DEVELOPMENT_DIRECTORY, WORKSPACE_DIRECTORY, } from '../../lib/constants.js';

package/dist/commands/dev-base-esbuild.js

@@ -1,3 +1,4 @@
+import {} from 'esbuild';
 import path from 'path';
 import { getEsbuildContext } from '../lib/esbuild.js';
 export default async function action(params) {

package/dist/commands/plugin-build.js

@@ -1,6 +1,7 @@
 import { program } from 'commander';
 import fs from 'fs-extra';
 import path from 'path';
+import {} from 'webpack';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
 import { importK2PluginConfig } from '../lib/import.js';
 import { getTailwindConfig, getTailwindInputCss, outputCss } from '../lib/tailwind.js';

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

@@ -1,4 +1,5 @@
 import { program } from 'commander';
+import {} from 'esbuild';
 import fs from 'fs-extra';
 import path from 'path';
 import { DEFAULT_PORT, PLUGIN_DEVELOPMENT_DIRECTORY, PLUGIN_WORKSPACE_DIRECTORY, } from '../../lib/constants.js';

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

@@ -1,4 +1,5 @@
 import path from 'path';
+import {} from 'tailwindcss';
 import { PLUGIN_DEVELOPMENT_DIRECTORY } from '../../lib/constants.js';
 import chalk from 'chalk';
 import { getTailwindConfig, getTailwindInputCss, watchTailwindCSS } from '../../lib/tailwind.js';

package/dist/commands/plugin-esbuild.js

@@ -4,6 +4,7 @@ import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
 import { importK2PluginConfig } from '../lib/import.js';
 import { getTailwindConfig, getTailwindInputCss, outputCss } from '../lib/tailwind.js';
+import {} from 'esbuild';
 import { buildWithEsbuild } from '../lib/esbuild.js';
 import { lint } from '../lib/lint.js';
 export default function command() {

package/dist/commands/plugin-tsup.js

@@ -0,0 +1,64 @@
+import { program } from 'commander';
+import fs from 'fs-extra';
+import path from 'path';
+import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
+import { importK2PluginConfig } from '../lib/import.js';
+import { lint } from '../lib/lint.js';
+import { getTailwindConfig, getTailwindInputCss, outputCss } from '../lib/tailwind.js';
+import { buildWithTsup } from '../lib/tsup.js';
+export default function command() {
+    program
+        .command('tsup')
+        .description("Build the project for production. (It's a wrapper of webpack build command.)")
+        .action(action);
+}
+export async function action() {
+    console.group('🍳 Build the project for production');
+    try {
+        const config = await importK2PluginConfig();
+        if (config?.lint?.build) {
+            await lint();
+            console.log('✨ Lint success.');
+        }
+        if (!fs.existsSync(PLUGIN_CONTENTS_DIRECTORY)) {
+            await fs.mkdir(PLUGIN_CONTENTS_DIRECTORY, { recursive: true });
+        }
+        if (config.tailwind?.css && config.tailwind?.config) {
+            const tailwindConfig = await getTailwindConfig(config.tailwind);
+            const inputFile = getTailwindInputCss(config.tailwind);
+            await outputCss({
+                inputPath: inputFile.config,
+                outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.css'),
+                config: tailwindConfig.config,
+                minify: true,
+            });
+            console.log('✨ Built config.css');
+            await outputCss({
+                inputPath: inputFile.desktop,
+                outputPath: path.join(PLUGIN_CONTENTS_DIRECTORY, 'desktop.css'),
+                config: tailwindConfig.desktop,
+                minify: true,
+            });
+            console.log('✨ Built desktop.css');
+        }
+        const entryPoints = ['desktop', 'config'].reduce((acc, dir) => ({
+            ...acc,
+            [dir]: path.join('src', dir, 'index.ts'),
+        }), {});
+        await buildWithTsup({
+            entryPoints,
+            outDir: PLUGIN_CONTENTS_DIRECTORY,
+            minify: true,
+            treeshake: true,
+            sourcemap: false,
+        });
+        console.log('✨ Built desktop.js and config.js');
+        console.log('✨ Build success.');
+    }
+    catch (error) {
+        throw error;
+    }
+    finally {
+        console.groupEnd();
+    }
+}

package/dist/index.js

@@ -1,18 +1,14 @@
 #!/usr/bin/env node
 import { program } from 'commander';
 import build from './commands/build.js';
-import viteBuild from './commands/build-vite.js';
 import dev from './commands/dev/index.js';
-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('1.4.0').description('k2 - 🍳 kintone kitchen 🍳');
 build();
-viteBuild();
 esbuildBuild();
 dev();
-viteDev();
 genkey();
 lint();
 program.parse(process.argv);

package/dist/lib/esbuild-sass-plugin.js

@@ -1,3 +1,4 @@
+import {} from 'esbuild';
 import { compile } from 'sass';
 import { resolve } from 'path';
 export const getSassPlugin = () => {

package/dist/lib/esbuild.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import esbuild from 'esbuild';
+import esbuild, {} from 'esbuild';
 import { getSassPlugin } from './esbuild-sass-plugin.js';
 const completeBuildOptions = (params) => {
     return {

package/dist/lib/tailwind.js

@@ -1,13 +1,13 @@
 import chokidar from 'chokidar';
 import cssnanoPlugin from 'cssnano';
 import fs from 'fs-extra';
+import { glob } from 'glob';
 import path from 'path';
 import postcss from 'postcss';
 import { debounce } from 'remeda';
-import tailwindcss from 'tailwindcss';
+import tailwindcss, {} from 'tailwindcss';
 import invariant from 'tiny-invariant';
 import { esmImport } from './import.js';
-import { glob } from 'glob';
 export const getTailwindConfigFromK2Config = async (k2Config) => {
     invariant(k2Config?.config, 'tailwind.config is required');
     const config = (await esmImport(path.resolve(k2Config?.config))).default;

package/dist/lib/tsup.js

@@ -0,0 +1,27 @@
+import { getSassPlugin } from './esbuild-sass-plugin.js';
+import { build } from 'tsup';
+/**
+ * 受け取ったビルドオプションに対して、共通するビルドオプションを補完します
+ *
+ * @param params
+ * @returns
+ */
+const completeBuildOptions = (params) => {
+    return {
+        bundle: true,
+        minify: 'terser',
+        splitting: false,
+        noExternal: [/.*/],
+        platform: 'browser',
+        dts: true,
+        ...params,
+        esbuildOptions(options, context) {
+            options.legalComments = 'none';
+        },
+        esbuildPlugins: [...(params.esbuildPlugins ?? []), getSassPlugin()],
+    };
+};
+export const buildWithTsup = async (buildOptions) => {
+    const options = completeBuildOptions(buildOptions);
+    await build(options);
+};

package/dist/lib/webpack.js

@@ -2,13 +2,17 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import path from 'path';
 import { cwd } from 'process';
 import TerserPlugin from 'terser-webpack-plugin';
-import webpack from 'webpack';
+import webpack, {} from 'webpack';
 import chalk from 'chalk';
 import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 export const buildWithWebpack = async (props) => {
     const { entries, outDir } = props;
     const exclude = /node_modules/;
     const styleLoader = MiniCssExtractPlugin.loader;
+    const tsConfigPath = path.join(cwd(), 'tsconfig.json');
+    console.group(chalk.blue('🚀 Building with Webpack...'));
+    console.log('🔧 tsconfig.json path:', tsConfigPath);
+    console.groupEnd();
     return new Promise((resolve, reject) => {
         webpack({
             mode: 'production',
@@ -19,7 +23,7 @@ export const buildWithWebpack = async (props) => {
                 fallback: {
                     path: false,
                 },
-                plugins: [new TsconfigPathsPlugin({ configFile: path.join(cwd(), 'tsconfig.json') })],
+                plugins: [new TsconfigPathsPlugin({ configFile: tsConfigPath })],
             },
             cache: { type: 'filesystem' },
             output: { filename: '[name].js', path: path.resolve(outDir) },

package/dist/plugin.js

@@ -9,6 +9,7 @@ import manifest from './commands/manifest/index.js';
 import test from './commands/test/index.js';
 import zip from './commands/plugin-zip.js';
 import lint from './commands/lint.js';
+import tsup from './commands/plugin-tsup.js';
 program.name('plugin').version('1.4.0').description('🍳 kintone kitchen 🍳 for kintone plugin');
 build();
 esbuild();
@@ -19,4 +20,5 @@ manifest();
 test();
 zip();
 lint();
+tsup();
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomi-app/k2",
-  "version": "1.7.6",
+  "version": "1.8.1",
   "description": "kintone sdk",
   "main": "./dist/index.js",
   "type": "module",
@@ -57,16 +57,15 @@
     "tiny-invariant": "^1",
     "ts-loader": "^9",
     "tsconfig-paths-webpack-plugin": "^4",
-    "vite": "^5",
-    "vite-tsconfig-paths": "^5",
+    "tsup": "^8",
     "webpack": "^5"
   },
   "devDependencies": {
     "@types/archiver": "*",
     "@types/eslint": "^8",
-    "@types/express": "^4",
+    "@types/express": "^5",
     "@types/fs-extra": "*",
     "@types/html-minifier": "^4",
     "typescript": "*"
   }
-}
+}

package/types/k2.d.ts

@@ -1,27 +1,3 @@
-type Locales = {
-  /** 日本語 */
-  ja: string;
-  /** 英語 */
-  en: string;
-  /** 簡体字中国語 */
-  zh: string;
-};
-
-type Resources = {
-  /**
-   * プラグインのJavaScriptファイル
-   *
-   * URLの配列
-   */
-  js: string[];
-  /**
-   * プラグインのCSSファイル
-   *
-   * URLの配列
-   */
-  css: string[];
-};
-
 declare namespace K2 {
   /**
    * 公開しているプラグインテンプレートで使用する設定ファイル
@@ -48,4 +24,28 @@ declare namespace K2 {
   type FullConfig = Config & {
     outDir: string;
   };
+
+  type Locales = {
+    /** 日本語 */
+    ja: string;
+    /** 英語 */
+    en: string;
+    /** 簡体字中国語 */
+    zh: string;
+  };
+
+  type Resources = {
+    /**
+     * プラグインのJavaScriptファイル
+     *
+     * URLの配列
+     */
+    js: string[];
+    /**
+     * プラグインのCSSファイル
+     *
+     * URLの配列
+     */
+    css: string[];
+  };
 }

package/types/plugin.d.ts

@@ -1,27 +1,3 @@
-type Locales = {
-  /** 日本語 */
-  ja: string;
-  /** 英語 */
-  en: string;
-  /** 簡体字中国語 */
-  zh: string;
-};
-
-type Resources = {
-  /**
-   * プラグインのJavaScriptファイル
-   *
-   * URLの配列
-   */
-  js: string[];
-  /**
-   * プラグインのCSSファイル
-   *
-   * URLの配列
-   */
-  css: string[];
-};
-
 declare namespace Plugin {
   namespace Meta {
     type Env = 'dev' | 'prod' | 'standalone';
@@ -144,4 +120,28 @@ declare namespace Plugin {
       };
     };
   }
+
+  type Locales = {
+    /** 日本語 */
+    ja: string;
+    /** 英語 */
+    en: string;
+    /** 簡体字中国語 */
+    zh: string;
+  };
+
+  type Resources = {
+    /**
+     * プラグインのJavaScriptファイル
+     *
+     * URLの配列
+     */
+    js: string[];
+    /**
+     * プラグインのCSSファイル
+     *
+     * URLの配列
+     */
+    css: string[];
+  };
 }

package/dist/commands/build-vite-base.js

@@ -1,8 +0,0 @@
-import { build } from 'vite';
-export default async function action(params) {
-    const { viteConfig } = params;
-    await build({
-        ...viteConfig,
-        mode: 'production',
-    });
-}

package/dist/commands/build-vite-plugin.js

@@ -1,40 +0,0 @@
-import { program } from 'commander';
-import { getViteConfig } from '../lib/vite.js';
-import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
-import path from 'path';
-import base from './build-vite-base.js';
-export default function command() {
-    program
-        .command('build')
-        .description("Build the project for production. (It's a wrapper of Vite build command.)")
-        .action(action);
-}
-export async function action() {
-    console.group('🍳 Build the project for production');
-    try {
-        const viteConfig = getViteConfig({
-            build: {
-                rollupOptions: {
-                    input: {
-                        config: path.join('src', 'config', 'index.ts'),
-                        desktop: path.join('src', 'desktop', 'index.ts'),
-                    },
-                    output: {
-                        entryFileNames: '[name].js',
-                        chunkFileNames: '[name].js',
-                        assetFileNames: '[name].[ext]',
-                    },
-                },
-                outDir: PLUGIN_CONTENTS_DIRECTORY,
-            },
-        });
-        await base({ viteConfig });
-        console.log('✨ Build success.');
-    }
-    catch (error) {
-        throw error;
-    }
-    finally {
-        console.groupEnd();
-    }
-}

package/dist/commands/build-vite.js

@@ -1,50 +0,0 @@
-import { program } from 'commander';
-import { getViteConfig } from '../lib/vite.js';
-import { WORKSPACE_DIRECTORY } from '../lib/constants.js';
-import path from 'path';
-import base from './build-vite-base.js';
-import fs from 'fs-extra';
-export default function command() {
-    program
-        .command('vite-build')
-        .option('-o, --outdir <outdir>', 'Output directory.', path.join(WORKSPACE_DIRECTORY, 'prod'))
-        .option('-i, --input <input>', 'Input directory.', path.join('src', 'apps'))
-        .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 allProjects = fs.readdirSync(path.resolve(input));
-        const entries = allProjects.reduce((acc, dir) => {
-            for (const filename of ['index.ts', 'index.js', 'index.mjs']) {
-                if (fs.existsSync(path.join(input, dir, filename))) {
-                    return { ...acc, [dir]: path.join(input, dir, filename) };
-                }
-            }
-            return acc;
-        }, {});
-        const viteConfig = getViteConfig({
-            build: {
-                rollupOptions: {
-                    input: entries,
-                    output: {
-                        entryFileNames: '[name].js',
-                        chunkFileNames: '[name].js',
-                        assetFileNames: '[name].[ext]',
-                    },
-                },
-                outDir: path.resolve(outdir),
-            },
-        });
-        await base({ viteConfig });
-        console.log('✨ Build success.');
-    }
-    catch (error) {
-        throw error;
-    }
-    finally {
-        console.groupEnd();
-    }
-}

package/dist/commands/dev-vite-base.js

@@ -1,30 +0,0 @@
-import { createServer, build } from 'vite';
-import chokidar from 'chokidar';
-import { PLUGIN_DEVELOPMENT_DIRECTORY } from '../lib/constants.js';
-export default async function action(params) {
-    console.group('🚀 Start development server');
-    try {
-        const { viteConfig } = params;
-        const watcher = chokidar.watch(['src/**/*.{ts,js,jsx,tsx}'], {
-            ignored: /node_modules/,
-            persistent: true,
-        });
-        const listener = async () => build(viteConfig);
-        await listener();
-        watcher.on('change', listener);
-        watcher.on('add', listener);
-        watcher.on('unlink', listener);
-        const server = await createServer({
-            ...viteConfig,
-            root: PLUGIN_DEVELOPMENT_DIRECTORY,
-        });
-        await server.listen();
-        server.printUrls();
-    }
-    catch (error) {
-        throw error;
-    }
-    finally {
-        console.groupEnd();
-    }
-}

package/dist/commands/dev-vite.js

@@ -1,63 +0,0 @@
-import { program } from 'commander';
-import { getViteConfig } from '../lib/vite.js';
-import { DEVELOPMENT_DIRECTORY, WORKSPACE_DIRECTORY } from '../lib/constants.js';
-import path from 'path';
-import { DEFAULT_PORT } from '../lib/constants.js';
-import fs from 'fs-extra';
-import base from './dev-vite-base.js';
-export default function command() {
-    program
-        .command('vite-dev')
-        .description('Start development server.')
-        .option('-i, --input <input>', 'Input directory', 'src/apps')
-        .option('-o, --outdir <outdir>', 'Output directory.', DEVELOPMENT_DIRECTORY)
-        .option('-c, --certdir <certdir>', 'Certificate directory', WORKSPACE_DIRECTORY)
-        .option('-p, --port <port>', 'Port number', DEFAULT_PORT.toString())
-        .action(action);
-}
-export async function action(options) {
-    console.group('🚀 Start development server');
-    try {
-        const { certdir, outdir, port, srcdir } = options;
-        const srcDir = path.resolve(srcdir);
-        const dirs = fs.readdirSync(srcDir);
-        const entryPoints = dirs.reduce((acc, dir) => {
-            for (const filename of ['index.ts', 'index.js', 'index.mjs']) {
-                if (fs.existsSync(path.join(srcDir, dir, filename))) {
-                    return { ...acc, [dir]: path.join(srcDir, dir, filename) };
-                }
-            }
-            return acc;
-        }, {});
-        const viteConfig = getViteConfig({
-            mode: 'development',
-            build: {
-                rollupOptions: {
-                    input: entryPoints,
-                    output: {
-                        entryFileNames: '[name].js',
-                        chunkFileNames: '[name].js',
-                        assetFileNames: '[name].[ext]',
-                    },
-                },
-                outDir: path.resolve(outdir),
-                sourcemap: 'inline',
-                chunkSizeWarningLimit: 8192,
-            },
-            server: {
-                port: Number(port),
-                https: {
-                    key: fs.readFileSync(path.join(certdir, 'localhost-key.pem')),
-                    cert: fs.readFileSync(path.join(certdir, 'localhost-cert.pem')),
-                },
-            },
-        });
-        await base({ viteConfig });
-    }
-    catch (error) {
-        throw error;
-    }
-    finally {
-        console.groupEnd();
-    }
-}

package/dist/lib/vite.js

@@ -1,25 +0,0 @@
-import path from 'path';
-import tsconfigPaths from 'vite-tsconfig-paths';
-export const getViteConfig = (config) => {
-    return {
-        ...config,
-        configFile: false,
-        build: {
-            ...config.build,
-            rollupOptions: {
-                ...config.build?.rollupOptions,
-                onwarn: (warning, warn) => {
-                    if (['MODULE_LEVEL_DIRECTIVE'].includes(warning.code ?? '')) {
-                        return;
-                    }
-                    warn(warning);
-                },
-            },
-        },
-        plugins: [...(config.plugins ?? []), tsconfigPaths()],
-        resolve: {
-            ...config.resolve,
-            alias: { '@': path.resolve('src') },
-        },
-    };
-};