@konomi-app/k2 1.4.2 → 1.4.4

package/dist/commands/plugin-build.js

@@ -2,7 +2,7 @@ import { program } from 'commander';
 import fs from 'fs-extra';
 import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
-import { importPluginConfig } from '../lib/import.js';
+import { importK2PluginConfig } from '../lib/import.js';
 import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
 import base from './build-base.js';
 import { lint } from '../lib/lint.js';
@@ -15,7 +15,7 @@ export default function command() {
 export async function action() {
     console.group('🍳 Build the project for production');
     try {
-        const config = await importPluginConfig();
+        const config = await importK2PluginConfig();
         if (config?.lint?.build) {
             await lint();
             console.log('✨ Lint success.');

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

@@ -2,7 +2,7 @@ import { program } from 'commander';
 import fs from 'fs-extra';
 import path from 'path';
 import { DEFAULT_PORT, PLUGIN_DEVELOPMENT_DIRECTORY, PLUGIN_WORKSPACE_DIRECTORY, } from '../../lib/constants.js';
-import { importPluginConfig } from '../../lib/import.js';
+import { importK2PluginConfig } from '../../lib/import.js';
 import base from '../dev-base-esbuild.js';
 import { getManifest } from './create-manifest.js';
 import { watchCss } from './tailwind.js';
@@ -18,7 +18,7 @@ export async function action(options) {
     console.group('🍳 Start development server');
     try {
         const { ppk: ppkPath } = options;
-        const config = await importPluginConfig();
+        const config = await importK2PluginConfig();
         if (!fs.existsSync(PLUGIN_DEVELOPMENT_DIRECTORY)) {
             await fs.mkdir(PLUGIN_DEVELOPMENT_DIRECTORY, { recursive: true });
         }

package/dist/commands/plugin-esbuild.js

@@ -2,7 +2,7 @@ import { program } from 'commander';
 import fs from 'fs-extra';
 import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from '../lib/constants.js';
-import { importPluginConfig } from '../lib/import.js';
+import { importK2PluginConfig } from '../lib/import.js';
 import { getTailwindConfig, outputCss } from '../lib/tailwind.js';
 import { buildWithEsbuild } from '../lib/esbuild.js';
 import { lint } from '../lib/lint.js';
@@ -15,7 +15,7 @@ export default function command() {
 export async function action() {
     console.group('🍳 Build the project for production');
     try {
-        const config = await importPluginConfig();
+        const config = await importK2PluginConfig();
         if (config?.lint?.build) {
             await lint();
             console.log('✨ Lint success.');

package/dist/lib/import.js

@@ -12,6 +12,6 @@ export const esmImport = (path) => {
 export const importK2Config = async (configFileName) => {
     return (await esmImport(path.resolve(configFileName ?? CONFIG_FILE_NAME))).default;
 };
-export const importPluginConfig = async (configFileName) => {
+export const importK2PluginConfig = async (configFileName) => {
     return (await esmImport(path.resolve(configFileName ?? PLUGIN_CONFIG_FILE_NAME))).default;
 };

package/dist/lib/plugin-contents.js

@@ -2,11 +2,15 @@ import fs from 'fs-extra';
 import path from 'path';
 import { PLUGIN_CONTENTS_DIRECTORY } from './constants.js';
 import htmlMinifier from 'html-minifier';
-export const copyPluginContents = async () => {
-    await fs.copySync(path.join('src', 'contents'), path.join(PLUGIN_CONTENTS_DIRECTORY), {
+export const copyPluginContents = async (params = {}) => {
+    const { inputDir = path.join('src', 'contents'), outputDir = PLUGIN_CONTENTS_DIRECTORY } = params;
+    if (!fs.existsSync(inputDir)) {
+        await fs.mkdir(inputDir, { recursive: true });
+    }
+    await fs.copy(inputDir, path.join(outputDir), {
         overwrite: true,
     });
-    const html = await fs.readFile(path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.html'), 'utf8');
+    const html = await fs.readFile(path.join(outputDir, 'config.html'), 'utf8');
     const minified = htmlMinifier.minify(html, {
         minifyCSS: true,
         collapseWhitespace: true,
@@ -17,5 +21,5 @@ export const copyPluginContents = async () => {
         removeTagWhitespace: true,
         useShortDoctype: true,
     });
-    await fs.writeFile(path.join(PLUGIN_CONTENTS_DIRECTORY, 'config.html'), minified);
+    await fs.writeFile(path.join(outputDir, 'config.html'), minified);
 };

package/dist/lib/plugin-manifest.js

@@ -1,5 +1,5 @@
 import { PLUGIN_CONTENTS_DIRECTORY } from './constants.js';
-import { importPluginConfig } from './import.js';
+import { importK2PluginConfig } from './import.js';
 import fs from 'fs-extra';
 import path from 'path';
 function merge(src, dst) {
@@ -17,7 +17,7 @@ function merge(src, dst) {
     }, {});
 }
 export const outputManifest = async (env, options) => {
-    const config = options?.config || (await importPluginConfig());
+    const config = options?.config || (await importK2PluginConfig());
     const merged = merge(config.manifest.base, config.manifest[env] || {});
     await fs.mkdirs(PLUGIN_CONTENTS_DIRECTORY);
     await fs.writeJson(path.join(PLUGIN_CONTENTS_DIRECTORY, 'manifest.json'), merged);

package/dist/lib/utils.js

@@ -1,8 +1,6 @@
 import { PLUGIN_WORKSPACE_DIRECTORY } from './constants.js';
-import { exec } from './exec.js';
 import { KintoneApiClient } from './kintone-api-client.js';
 import { getZipFileNameSuffix } from './zip.js';
-import { config } from 'dotenv';
 import fs from 'fs-extra';
 import path from 'path';
 export const isEnv = (env) => {
@@ -35,20 +33,33 @@ export const apiUploadZip = async (params) => {
 /**
  * @kintone/plugin-uploaderを利用してプラグインをアップロードします
  * APIを使用した方が高速ですが、2024年11月までは設定により無効になる可能性があるため、暫定的に残しています
+ * 使用するには@kintone/plugin-uploaderがインストールされている必要があります
  */
-export const uploadZip = async (env) => {
-    config();
-    const { KINTONE_BASE_URL, KINTONE_USERNAME, KINTONE_PASSWORD, KINTONE_BASIC_AUTH_USERNAME = '', KINTONE_BASIC_AUTH_PASSWORD = '', } = process.env;
-    if (!KINTONE_BASE_URL || !KINTONE_USERNAME || !KINTONE_PASSWORD) {
-        throw new Error(`.envの設定が不十分です。以下のパラメータは必須です
+/*
+export const uploadZip = async (env: Plugin.Meta.Env) => {
+  config();
+
+  const {
+    KINTONE_BASE_URL,
+    KINTONE_USERNAME,
+    KINTONE_PASSWORD,
+    KINTONE_BASIC_AUTH_USERNAME = '',
+    KINTONE_BASIC_AUTH_PASSWORD = '',
+  } = process.env;
+  if (!KINTONE_BASE_URL || !KINTONE_USERNAME || !KINTONE_PASSWORD) {
+    throw new Error(`.envの設定が不十分です。以下のパラメータは必須です
 KINTONE_BASE_URL
 KINTONE_USERNAME
 KINTONE_PASSWORD`);
-    }
-    const zipFileName = `plugin${getZipFileNameSuffix(env)}.zip`;
-    let command = `kintone-plugin-uploader ${PLUGIN_WORKSPACE_DIRECTORY}/${zipFileName} --base-url ${KINTONE_BASE_URL} --username ${KINTONE_USERNAME} --password ${KINTONE_PASSWORD}`;
-    if (KINTONE_BASIC_AUTH_USERNAME && KINTONE_BASIC_AUTH_PASSWORD) {
-        command += ` --basic-auth-username ${KINTONE_BASIC_AUTH_USERNAME} --basic-auth-password ${KINTONE_BASIC_AUTH_PASSWORD}`;
-    }
-    return exec(command);
+  }
+
+  const zipFileName = `plugin${getZipFileNameSuffix(env)}.zip`;
+
+  let command = `kintone-plugin-uploader ${PLUGIN_WORKSPACE_DIRECTORY}/${zipFileName} --base-url ${KINTONE_BASE_URL} --username ${KINTONE_USERNAME} --password ${KINTONE_PASSWORD}`;
+  if (KINTONE_BASIC_AUTH_USERNAME && KINTONE_BASIC_AUTH_PASSWORD) {
+    command += ` --basic-auth-username ${KINTONE_BASIC_AUTH_USERNAME} --basic-auth-password ${KINTONE_BASIC_AUTH_PASSWORD}`;
+  }
+
+  return exec(command);
 };
+*/

package/dist/lib/webpack.js

@@ -40,7 +40,12 @@ export const buildWithWebpack = async (props) => {
             plugins: [new MiniCssExtractPlugin()],
             optimization: {
                 minimize: true,
-                minimizer: [new TerserPlugin({ extractComments: false })],
+                minimizer: [
+                    new TerserPlugin({
+                        terserOptions: { format: { comments: false } },
+                        extractComments: false,
+                    }),
+                ],
             },
         }, (err, stats) => {
             if (err) {

package/dist/plugin.js

@@ -7,7 +7,6 @@ import genkey from './commands/plugin-genkey.js';
 import init from './commands/plugin-init.js';
 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';
 import lint from './commands/lint.js';
 program.name('plugin').version('1.4.0').description('🍳 kintone kitchen 🍳 for kintone plugin');
@@ -18,7 +17,6 @@ genkey();
 init();
 manifest();
 test();
-upload();
 zip();
 lint();
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomi-app/k2",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "kintone sdk",
   "main": "./dist/index.js",
   "type": "module",
@@ -25,7 +25,6 @@
   "license": "ISC",
   "dependencies": {
     "@kintone/plugin-packer": "^8",
-    "@kintone/plugin-uploader": "^9",
     "@typescript-eslint/eslint-plugin": "^7",
     "@typescript-eslint/parser": "^7",
     "archiver": "^7",

package/dist/commands/upload/index.js

@@ -1,30 +0,0 @@
-import { program } from 'commander';
-import { config } from 'dotenv';
-import { isEnv, uploadZip } from '../../lib/utils.js';
-export default function command() {
-    program
-        .command('upload')
-        .description('upload plugin.zip to your kintone')
-        .option('-e, --env <env>', 'plugin environment (dev, prod, standalone)', 'prod')
-        .action(action);
-}
-async function action(options) {
-    console.group('🚀 Uploading plugin.zip to your kintone');
-    try {
-        config();
-        const { env } = options;
-        if (!isEnv(env)) {
-            throw new Error('Invalid environment');
-        }
-        const { stderr } = await uploadZip(env);
-        if (stderr) {
-            console.error(JSON.stringify(stderr, null, 2));
-        }
-    }
-    catch (error) {
-        throw error;
-    }
-    finally {
-        console.groupEnd();
-    }
-}