takuya 3 лет назад
Родитель
Сommit
949ff0837b

+ 4 - 5
packages/app/src/pages/_document.page.tsx

@@ -15,13 +15,13 @@ import { GrowiPlugin, GrowiPluginResourceType } from '~/interfaces/plugin';
 const growiPluginsExample: GrowiPlugin[] = [
   {
     isEnabled: true,
-    installedPath: 'weseek/growi-plugin-copy-code-to-clipboard',
+    installedPath: 'tmp/plugins/growi-plugin-styling-example-main',
     origin: {
-      url: 'https://github.com/weseek/growi-plugin-copy-code-to-clipboard',
+      url: 'https://github.com/weseek/growi-plugin-styling-example',
     },
     meta: {
-      name: 'weseek/growi-plugin-copy-code-to-clipboard',
-      types: [GrowiPluginResourceType.Script],
+      name: 'growi-plugin-styling-example',
+      types: [GrowiPluginResourceType.Style],
     },
   },
   {
@@ -91,7 +91,6 @@ class GrowiDocument extends Document<GrowiDocumentProps> {
     const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
     const growiPlugins = await GrowiPlugin.find({ isEnabled: true });
     const pluginManifestEntries: GrowiPluginManifestEntries = await ActivatePluginService.retrievePluginManifests(growiPlugins);
-
     return { ...initialProps, pluginManifestEntries };
   }
 

+ 1 - 9
packages/app/src/server/service/plugin.ts

@@ -43,10 +43,9 @@ export class PluginService {
       console.log('downloadZipFile error', err);
     }
 
-    // TODO: detect plugins
     // save plugin metadata
     const ghRepositoryName = ghUrl.split('/').slice(-1)[0];
-    const installedPath = path.join(downloadDir, `${ghRepositoryName}-master`);
+    const installedPath = path.join(downloadDir, `${ghRepositoryName}-main`);
     const plugins = await PluginService.detectPlugins(origin, installedPath);
     await this.savePluginMetaData(plugins);
 
@@ -55,15 +54,9 @@ export class PluginService {
 
   async savePluginMetaData(plugins: GrowiPlugin[]): Promise<void> {
     const GrowiPlugin = mongoose.model('GrowiPlugin');
-
     await GrowiPlugin.insertMany(plugins);
   }
 
-  private getPluginMetaData(installedPath: string): GrowiPluginMeta {
-    const metaDataJSON = JSON.parse(fs.readFileSync(installedPath, 'utf-8'));
-    return metaDataJSON;
-  }
-
   // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   static async detectPlugins(origin: GrowiPluginOrigin, installedPath: string, parentPackageJson?: any): Promise<GrowiPlugin[]> {
     const packageJsonPath = path.resolve(pluginStoringPath, installedPath, 'package.json');
@@ -93,7 +86,6 @@ export class PluginService {
     if (growiPlugin.types == null) {
       throw new Error('\'growiPlugin\' section must have a \'types\' property.');
     }
-
     const plugin = {
       isEnabled: true,
       installedPath,