optimize build tool chain.

.cspell.json

@@ -2,6 +2,17 @@
   "version": "0.2",
   "language": "en,en-gb",
   "ignoreWords": [],
-  "words": ["blankspace", "Heiti", "jscoverage", "Kaku", "kintone", "kintoneplugin", "kypes", "Ligh", "moize"],
+  "words": [
+    "blankspace",
+    "Heiti",
+    "jscoverage",
+    "Kaku",
+    "kintone",
+    "kintoneplugin",
+    "kypes",
+    "Ligh",
+    "moize",
+    "rspack"
+  ],
   "ignorePaths": [".env"]
 }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "kintone-plugin-filelookup",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "scripts": {
-    "prepare": "node scripts/prepare-private-key.js",
+    "gen": "run-s gen:*",
+    "gen:key": "node scripts/generate-private-key.js",
     "start": "node scripts/npm-start.js",
     "develop": "npm run build -- --watch",
-    "build": "npm run prepare && cross-env NODE_ENV=development rspack build",
-    "build:prod": "npm run prepare && cross-env NODE_ENV=production rspack build",
-    "dts-gen": "kintone-dts-gen",
+    "prebuild": "npm run gen",
+    "prebuild:prod": "npm run gen",
+    "build": "cross-env NODE_ENV=development rspack build",
+    "build:prod": "cross-env NODE_ENV=production rspack build",
     "lint": "eslint src --ext .js,.jsx,.ts,.tsx",
     "upload": "env-cmd --silent kintone-plugin-uploader dist/plugin.zip --watch --waiting-dialog-ms 3000"
   },
@@ -29,21 +31,19 @@
     "@kintone/dts-gen": "^8.1.2",
     "@kintone/plugin-uploader": "^9.1.5",
     "@kintone/webpack-plugin-kintone-plugin": "^8.0.11",
-    "@rspack/cli": "^1.4.0",
-    "@rspack/core": "^1.4.0",
+    "@rspack/cli": "^1.4.2",
+    "@rspack/core": "^1.4.2",
     "@shin-chan/kypes": "^0.0.7",
-    "@swc/helpers": "^0.5.17",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "cross-env": "^7.0.3",
-    "css-loader": "^7.1.2",
     "env-cmd": "^10.1.0",
-    "eslint": "^9.29.0",
+    "eslint": "^9.30.1",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.6.1",
-    "style-loader": "^4.0.0",
+    "prettier": "^3.6.2",
+    "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   }
 }

plugin/manifest.json

@@ -13,6 +13,7 @@
   "config": {
     "html": "html/config.html",
     "js": ["js/config.js"],
+    "css": ["js/config.css"],
     "required_params": ["lookup"]
   },
   "name": {

rspack.config.js

@@ -1,99 +0,0 @@
-/* eslint-env node */
-
-const path = require('path');
-const KintonePlugin = require('@kintone/webpack-plugin-kintone-plugin');
-
-const isProduction = process.env.NODE_ENV === 'production';
-
-module.exports = {
-  mode: isProduction ? 'production' : 'development',
-  devtool: isProduction ? false : 'inline-cheap-module-source-map',
-  entry: { config: './src/config/index.tsx', desktop: './src/desktop/index.tsx' },
-  output: {
-    path: path.resolve(__dirname, 'plugin', 'js'),
-    filename: '[name].js',
-  },
-  resolve: {
-    extensions: ['.ts', '.tsx', '.js'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(j|t)s$/,
-        exclude: [/[\\/]node_modules[\\/]/],
-        loader: 'builtin:swc-loader',
-        options: {
-          sourceMaps: !isProduction,
-          jsc: {
-            parser: {
-              syntax: 'typescript',
-            },
-            transform: {
-              react: {
-                runtime: 'automatic',
-                development: !isProduction,
-              },
-            },
-            externalHelpers: true,
-          },
-          env: {
-            targets: 'Chrome >= 48',
-          },
-        },
-      },
-      {
-        test: /\.(j|t)sx$/,
-        loader: 'builtin:swc-loader',
-        exclude: [/[\\/]node_modules[\\/]/],
-        options: {
-          sourceMaps: !isProduction,
-          jsc: {
-            parser: {
-              syntax: 'typescript',
-              tsx: true,
-            },
-            transform: {
-              react: {
-                runtime: 'automatic',
-                development: !isProduction,
-              },
-            },
-            externalHelpers: true,
-          },
-          env: {
-            targets: 'Chrome >= 48', // browser compatibility
-          },
-        },
-      },
-      {
-        test: /\.css$/i,
-        use: ['style-loader', 'css-loader'],
-        exclude: /\.module\.css$/,
-      },
-      {
-        test: /\.module\.css$/i,
-        use: [
-          'style-loader',
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-              sourceMap: !isProduction,
-              modules: {
-                localIdentName: isProduction ? '[hash:base64]' : '[name]__[local]--[hash:base64:5]',
-                namedExport: false,
-              },
-            },
-          },
-        ],
-      },
-    ],
-  },
-  plugins: [
-    new KintonePlugin({
-      manifestJSONPath: './plugin/manifest.json',
-      privateKeyPath: './private.ppk',
-      pluginZipPath: './dist/plugin.zip',
-    }),
-  ],
-};

rspack.config.ts

@@ -0,0 +1,70 @@
+import { defineConfig } from '@rspack/cli';
+import { rspack } from '@rspack/core';
+
+import KintonePlugin from '@kintone/webpack-plugin-kintone-plugin';
+
+const isDev = process.env.NODE_ENV === 'development';
+
+// Target browsers, see: https://github.com/browserslist/browserslist
+const targets = ['last 2 versions', '> 0.2%', 'not dead', 'Firefox ESR'];
+
+export default defineConfig({
+  mode: isDev ? 'development' : 'production',
+  devtool: isDev ? 'inline-cheap-module-source-map' : false,
+  entry: { config: './src/config/index.tsx', desktop: './src/desktop/index.tsx' },
+  output: {
+    path: './plugin/js',
+    filename: '[name].js',
+  },
+  resolve: {
+    extensions: ['...', '.ts', '.tsx', '.jsx'],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(jsx?|tsx?)$/,
+        use: [
+          {
+            loader: 'builtin:swc-loader',
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'typescript',
+                  tsx: true,
+                },
+              },
+              env: { targets },
+            },
+          },
+        ],
+      },
+    ],
+    parser: {
+      'css/auto': {
+        namedExports: false,
+      },
+    },
+  },
+  plugins: [
+    new KintonePlugin({
+      manifestJSONPath: './plugin/manifest.json',
+      privateKeyPath: './private.ppk',
+      pluginZipPath: './dist/plugin.zip',
+    }),
+  ],
+  optimization: {
+    minimizer: [
+      new rspack.SwcJsMinimizerRspackPlugin(),
+      new rspack.LightningCssMinimizerRspackPlugin({
+        minimizerOptions: { targets },
+      }),
+    ],
+  },
+  experiments: {
+    css: true,
+  },
+  performance: {
+    maxEntrypointSize: 1024000,
+    maxAssetSize: 1024000,
+  },
+});

src/common/Loading.module.css

@@ -7,14 +7,16 @@
   background-color: rgba(0, 0, 0, 0.7);
   z-index: 9999;
 }
-.spinner-container {
+
+.spinnerContainer {
   position: fixed;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
   z-index: 10000;
 }
-.spinner-container .spinner {
+
+.spinnerContainer .spinner {
   font-size: 10px;
   width: 1em;
   height: 1em;
@@ -24,6 +26,7 @@
   animation: mulShdSpin 1.1s infinite ease;
   transform: translateZ(0);
 }
+
 @keyframes mulShdSpin {
   0%,
   100% {

src/common/config.ts

@@ -1,5 +1,3 @@
-import { PLUGIN_ID } from './global';
-
 export interface PluginConfigLookupItem {
   lookupFieldCode: string;
   srcAttachmentFieldCode: string;
@@ -24,13 +22,13 @@ const decodeConfigLookup = (lookup: string): PluginConfigLookup | null => {
   }
 };
 
-export const loadPluginConfigLookup = (): PluginConfigLookup | null => {
-  const config = kintone.plugin.app.getConfig(PLUGIN_ID);
+export const loadPluginConfigLookup = (pluginId: string): PluginConfigLookup | null => {
+  const config = kintone.plugin.app.getConfig(pluginId);
   return decodeConfigLookup(config.lookup);
 };
 
-export const loadPluginConfig = (): PluginConfig | null => {
-  const config = kintone.plugin.app.getConfig(PLUGIN_ID);
+export const loadPluginConfig = (pluginId: string): PluginConfig | null => {
+  const config = kintone.plugin.app.getConfig(pluginId);
   const lookup = decodeConfigLookup(config.lookup);
   return lookup ? { lookup } : null;
 };

src/common/context.ts

@@ -1,9 +1,7 @@
 import { KintoneFormFieldProperty, KintoneRestAPIClient } from '@kintone/rest-api-client';
-import {
-  AppID as KintoneAppId,
-  Properties as KintoneFormFieldProperties,
-} from '@kintone/rest-api-client/lib/src/client/types';
 import { PluginConfigLookup } from './config';
+import { naturalCompare } from './stringUtils';
+import { KintoneAppId, KintoneFormFieldProperties } from './types';
 
 export interface PluginContext {
   appId: KintoneAppId;
@@ -12,14 +10,6 @@ export interface PluginContext {
   lookupFields: KintoneFormFieldProperty.Lookup[];
 }
 
-const naturalCompare = (a: string, b: string): number => {
-  const locales = new Set<string>([...navigator.languages, 'en-US', 'ja-JP']);
-  return new Intl.Collator(Array.from(locales), {
-    sensitivity: 'variant',
-    numeric: true,
-  }).compare(a, b);
-};
-
 const filterAttachmentFields = (properties: KintoneFormFieldProperties): KintoneFormFieldProperty.File[] => {
   return Object.values(properties)
     .filter((property) => property.type === 'FILE')

src/common/kintoneUtils.ts

@@ -1,8 +1,5 @@
 import invariant from 'tiny-invariant';
 
-export const PLUGIN_ID = kintone.$PLUGIN_ID;
-invariant(PLUGIN_ID, 'The PLUGIN_ID is not available. Please ensure you are on a Kintone plugin page.');
-
 const KintoneUserLanguages = ['en', 'ja', 'zh', 'zh-TW', 'es', 'pt-BR', 'th'] as const;
 export type KintoneUserLanguages = (typeof KintoneUserLanguages)[number];
 export const LANGUAGE = kintone.getLoginUser().language as KintoneUserLanguages;

src/common/stringUtils.ts

@@ -0,0 +1,7 @@
+export const naturalCompare = (a: string, b: string): number => {
+  const locales = new Set<string>([...navigator.languages, 'en-US', 'ja-JP']);
+  return new Intl.Collator(Array.from(locales), {
+    sensitivity: 'variant',
+    numeric: true,
+  }).compare(a, b);
+};

src/common/types.ts

@@ -0,0 +1,7 @@
+import { KintoneFormFieldProperty } from '@kintone/rest-api-client';
+
+export type KintoneAppId = string | number;
+
+export type KintoneFormFieldProperties = {
+  [fieldCode: string]: KintoneFormFieldProperty.OneOf;
+};

src/config/ConfigApp.tsx

@@ -5,11 +5,16 @@ import ErrorFallback from '../common/ErrorFallback';
 import Loading from '../common/Loading';
 import Settings from './Settings';
 
-const ConfigApp: React.FC = () => {
+interface ConfigAppProps {
+  pluginId: string;
+}
+
+const ConfigApp: React.FC<ConfigAppProps> = (props) => {
+  const { pluginId } = props;
   return (
     <ErrorBoundary FallbackComponent={ErrorFallback}>
       <React.Suspense fallback={<Loading />}>
-        <Settings />
+        <Settings pluginId={pluginId} />
       </React.Suspense>
     </ErrorBoundary>
   );

src/config/Settings.tsx

@@ -145,14 +145,19 @@ const FieldSelectTableRow: React.FC<FieldSelectTableRowProps> = (props) => {
 
 const cachedPluginContext = moize.promise(getPluginContext);
 
-const Settings: React.FC = () => {
+interface SettingsProps {
+  pluginId: string;
+}
+
+const Settings: React.FC<SettingsProps> = (props) => {
+  const { pluginId } = props;
   const appId = kintone.app.getId();
   invariant(appId, 'The app ID is not available. Please ensure you are on a Kintone app page.');
   const context = React.use(cachedPluginContext(appId));
 
   const [mappings, setMappings] = React.useState<PluginConfigLookup>(
     () =>
-      filterConfigByPluginContext(loadPluginConfigLookup(), context) ?? [
+      filterConfigByPluginContext(loadPluginConfigLookup(pluginId), context) ?? [
         { lookupFieldCode: '', srcAttachmentFieldCode: '', destAttachmentFieldCode: '' },
       ],
   );
@@ -257,7 +262,7 @@ const Settings: React.FC = () => {
               <tbody>
                 {mappings.map((row, idx) => (
                   <FieldSelectTableRow
-                    key={idx}
+                    key={`${row.lookupFieldCode}-${row.srcAttachmentFieldCode}-${row.destAttachmentFieldCode}-${idx}`}
                     context={context}
                     row={row}
                     onUpdate={(draft) => {

src/config/index.tsx

@@ -6,11 +6,13 @@ import ConfigApp from './ConfigApp';
 
 import '../common/ui/51-modern-default.css';
 
-const root = document.getElementById('plugin-config-root');
-invariant(root, 'The plugin configuration root element "plugin-config-root" is not found.');
+((PLUGIN_ID) => {
+  const root = document.getElementById('plugin-config-root');
+  invariant(root, 'The plugin configuration root element "plugin-config-root" is not found.');
 
-ReactDOM.createRoot(root).render(
+  ReactDOM.createRoot(root).render(
     <React.StrictMode>
-    <ConfigApp />
+      <ConfigApp pluginId={PLUGIN_ID} />
     </React.StrictMode>,
-);
+  );
+})(kintone.$PLUGIN_ID);

src/desktop/index.tsx

@@ -8,7 +8,8 @@ interface UpdateRecordAttachmentFieldValueItem {
 }
 type UpdateRecordAttachmentFieldValue = UpdateRecordAttachmentFieldValueItem[];
 
-kintone.events.on(
+((PLUGIN_ID) => {
+  kintone.events.on(
     ['app.record.create.show', 'app.record.edit.show', 'mobile.app.record.create.show', 'mobile.app.record.edit.show'],
     function (
       event:
@@ -17,7 +18,7 @@ kintone.events.on(
         | kintone.events.MobileAppRecordCreateShowEvent
         | kintone.events.MobileAppRecordEditShowEvent,
     ) {
-    const mappings = loadPluginConfigLookup();
+      const mappings = loadPluginConfigLookup(PLUGIN_ID);
       mappings?.forEach((mapping) => {
         if (mapping.destAttachmentFieldCode in event.record) {
           (event.record[mapping.destAttachmentFieldCode] as any).disabled = true;
@@ -25,9 +26,9 @@ kintone.events.on(
       });
       return event;
     },
-);
+  );
 
-kintone.events.on(
+  kintone.events.on(
     [
       'app.record.create.submit.success',
       'app.record.edit.submit.success',
@@ -42,7 +43,7 @@ kintone.events.on(
         | kintone.events.MobileAppRecordEditSubmitSuccessEvent,
     ) => {
       const context = await getPluginContext(event.appId);
-    const mappings = filterConfigByPluginContext(loadPluginConfigLookup(), context);
+      const mappings = filterConfigByPluginContext(loadPluginConfigLookup(PLUGIN_ID), context);
       if (mappings == null) {
         return event;
       }
@@ -142,8 +143,10 @@ kintone.events.on(
           }
         }),
       ).catch((e) => {
-      console.log(e);
+        console.error(e);
       });
+      await new Promise((resolve) => setTimeout(resolve, 10000));
       return event;
     },
-);
+  );
+})(kintone.$PLUGIN_ID);

tsconfig.json

@@ -1,73 +1,28 @@
 {
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+    "lib": ["DOM", "ES2020"],
+    "jsx": "react-jsx",
+    "target": "ES2020",
+    "noEmit": true,
+    "skipLibCheck": true,
+    "useDefineForClassFields": true,
 
-    /* Basic Options */
-    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "es2015",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    "lib": ["dom", "es2020"],                             /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                       /* Allow javascript files to be compiled. */
-    // "checkJs": true,                       /* Report errors in .js files. */
-    "jsx": "react",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "./plugin",                        /* Redirect output structure to the directory. */
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                     /* Enable project compilation */
-    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    // "noEmit": true,                        /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+    /* modules */
+    "module": "ESNext",
+    "resolveJsonModule": true,
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "allowImportingTsExtensions": true,
 
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,              /* Enable strict null checks. */
-    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
+    /* type checking */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true
   },
-  "include": [
-    "src/**/*",
-    "./node_modules/@kintone/dts-gen/kintone.d.ts"
-  ]
+  "include": ["src/**/*", "./node_modules/@kintone/dts-gen/kintone.d.ts"],
+  "ts-node": {
+    "compilerOptions": {
+      "module": "CommonJS"
+    }
+  }
 }