Przeglądaj źródła

modify pluginkit type to module

Yuki Takei 2 lat temu
rodzic
commit
9d39404087

+ 1 - 1
apps/app/src/features/growi-plugin/server/services/growi-plugin/generate-template-plugin-meta.ts

@@ -1,5 +1,5 @@
 import type { GrowiPluginValidationData } from '@growi/pluginkit';
 import type { GrowiPluginValidationData } from '@growi/pluginkit';
-import { scanAllTemplates } from '@growi/pluginkit/dist/v4/server';
+import { scanAllTemplates } from '@growi/pluginkit/dist/v4/server/index.cjs';
 
 
 import type { IGrowiPlugin, IGrowiTemplatePluginMeta } from '../../../interfaces';
 import type { IGrowiPlugin, IGrowiTemplatePluginMeta } from '../../../interfaces';
 
 

+ 1 - 1
apps/app/src/features/growi-plugin/server/services/growi-plugin/growi-plugin.ts

@@ -3,7 +3,7 @@ import path from 'path';
 
 
 import { GrowiPluginType, type GrowiThemeMetadata, type ViteManifest } from '@growi/core';
 import { GrowiPluginType, type GrowiThemeMetadata, type ViteManifest } from '@growi/core';
 import type { GrowiPluginPackageData } from '@growi/pluginkit';
 import type { GrowiPluginPackageData } from '@growi/pluginkit';
-import { importPackageJson, validateGrowiDirective } from '@growi/pluginkit/dist/v4/server';
+import { importPackageJson, validateGrowiDirective } from '@growi/pluginkit/dist/v4/server/index.cjs';
 // eslint-disable-next-line no-restricted-imports
 // eslint-disable-next-line no-restricted-imports
 import axios from 'axios';
 import axios from 'axios';
 import mongoose from 'mongoose';
 import mongoose from 'mongoose';

+ 1 - 1
apps/app/src/features/templates/server/routes/apiv3/index.ts

@@ -2,7 +2,7 @@ import path from 'path';
 
 
 import { GrowiPluginType } from '@growi/core';
 import { GrowiPluginType } from '@growi/core';
 import { TemplateSummary } from '@growi/pluginkit/dist/v4';
 import { TemplateSummary } from '@growi/pluginkit/dist/v4';
-import { scanAllTemplates, getMarkdown } from '@growi/pluginkit/dist/v4/server';
+import { scanAllTemplates, getMarkdown } from '@growi/pluginkit/dist/v4/server/index.cjs';
 import express from 'express';
 import express from 'express';
 import { param, query } from 'express-validator';
 import { param, query } from 'express-validator';
 
 

+ 0 - 0
packages/pluginkit/.eslintrc.js → packages/pluginkit/.eslintrc.cjs


+ 3 - 2
packages/pluginkit/package.json

@@ -2,9 +2,10 @@
   "name": "@growi/pluginkit",
   "name": "@growi/pluginkit",
   "version": "0.1.0",
   "version": "0.1.0",
   "license": "MIT",
   "license": "MIT",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "types": "dist/index.d.ts",
+  "type": "module",
   "scripts": {
   "scripts": {
     "build": "vite build",
     "build": "vite build",
     "clean": "shx rm -rf dist",
     "clean": "shx rm -rf dist",

+ 14 - 9
packages/pluginkit/vite.config.ts

@@ -1,20 +1,31 @@
 import path from 'path';
 import path from 'path';
 
 
-
 import glob from 'glob';
 import glob from 'glob';
+import { nodeExternals } from 'rollup-plugin-node-externals';
 import { defineConfig } from 'vite';
 import { defineConfig } from 'vite';
 import dts from 'vite-plugin-dts';
 import dts from 'vite-plugin-dts';
 
 
 // https://vitejs.dev/config/
 // https://vitejs.dev/config/
 export default defineConfig({
 export default defineConfig({
   plugins: [
   plugins: [
-    dts({ copyDtsFiles: true }),
+    dts({
+      copyDtsFiles: true,
+    }),
+    {
+      ...nodeExternals({
+        devDeps: true,
+        builtinsPrefix: 'ignore',
+      }),
+      enforce: 'pre',
+    },
   ],
   ],
   build: {
   build: {
     outDir: 'dist',
     outDir: 'dist',
     sourcemap: true,
     sourcemap: true,
     lib: {
     lib: {
-      entry: glob.sync(path.resolve(__dirname, 'src/**/*.ts')),
+      entry: glob.sync(path.resolve(__dirname, 'src/**/*.ts'), {
+        ignore: '**/*.spec.ts',
+      }),
       name: 'pluginkit-libs',
       name: 'pluginkit-libs',
       formats: ['es', 'cjs'],
       formats: ['es', 'cjs'],
     },
     },
@@ -23,12 +34,6 @@ export default defineConfig({
         preserveModules: true,
         preserveModules: true,
         preserveModulesRoot: 'src',
         preserveModulesRoot: 'src',
       },
       },
-      external: [
-        'assert',
-        'fs',
-        'path',
-        'util',
-      ],
     },
     },
   },
   },
 });
 });