Просмотр исходного кода

add official growi plugins as default dependencies

Yuki Takei 8 лет назад
Родитель
Сommit
7cf1317b82
5 измененных файлов с 24 добавлено и 21 удалено
  1. 1 2
      config/env.dev.js
  2. 8 7
      lib/plugins/plugin-utils.js
  3. 2 0
      package.json
  4. 0 12
      wercker.yml
  5. 13 0
      yarn.lock

+ 1 - 2
config/env.dev.js

@@ -5,8 +5,7 @@ module.exports = {
   // REDIS_URL: 'redis://localhost:6379/crowi',
   // ELASTICSEARCH_URI: 'http://localhost:9200/crowi',
   PLUGIN_NAMES_TOBE_LOADED: [
-    // 'crowi-plugin-lsx',
-    // 'crowi-plugin-pukiwiki-like-linker',
+    // 'growi-plugin-XXX',
   ],
   // filters for debug
   DEBUG: [

+ 8 - 7
lib/plugins/plugin-utils.js

@@ -11,10 +11,10 @@ class PluginUtils {
    * return a definition objects that has following structure:
    *
    * {
-   *   name: 'crowi-plugin-X',
-   *   meta: require('crowi-plugin-X'),
+   *   name: 'growi-plugin-X',
+   *   meta: require('growi-plugin-X'),
    *   entries: [
-   *     'crowi-plugin-X/lib/client-entry'
+   *     'growi-plugin-X/lib/client-entry'
    *   ]
    * }
    *
@@ -42,13 +42,14 @@ class PluginUtils {
   }
 
   /**
-   * list plugin module objects that starts with 'crowi-plugin-'
+   * list plugin module objects
+   *  that starts with 'growi-plugin-' or 'crowi-plugin-'
    * borrowing from: https://github.com/hexojs/hexo/blob/d1db459c92a4765620343b95789361cbbc6414c5/lib/hexo/load_plugins.js#L17
    *
    * @returns array of objects
    *   [
-   *     { name: 'crowi-plugin-...', version: '1.0.0' },
-   *     { name: 'crowi-plugin-...', version: '1.0.0' },
+   *     { name: 'growi-plugin-...', version: '1.0.0' },
+   *     { name: 'growi-plugin-...', version: '1.0.0' },
    *     ...
    *   ]
    *
@@ -69,7 +70,7 @@ class PluginUtils {
 
     let objs = {};
     Object.keys(deps).forEach((name) => {
-      if (/^crowi-plugin-/.test(name)) {
+      if (/^(crowi|growi)-plugin-/.test(name)) {
         objs[name] = deps[name];
       }
     });

+ 2 - 0
package.json

@@ -87,6 +87,8 @@
     "file-loader": "^1.1.0",
     "googleapis": "^27.0.0",
     "graceful-fs": "^4.1.11",
+    "growi-plugin-lsx": "^1.3.12",
+    "growi-plugin-pukiwiki-like-linker": "^1.0.1",
     "growi-pluginkit": "^1.1.0",
     "i18next": "^10.0.1",
     "i18next-express-middleware": "^1.0.5",

+ 0 - 12
wercker.yml

@@ -47,12 +47,6 @@ build-prod:
         yarn global add npm@4
         yarn install --production
 
-    - script:
-      name: install plugins
-      code: |
-        yarn add crowi-plugin-lsx
-        yarn add crowi-plugin-pukiwiki-like-linker
-
     - script:
       name: print dependencies
       code: yarn list --depth=0
@@ -87,12 +81,6 @@ build-dev:
         yarn global add npm@4
         yarn install
 
-    - script:
-      name: install plugins
-      code: |
-        yarn add crowi-plugin-lsx
-        yarn add crowi-plugin-pukiwiki-like-linker
-
     - script:
       name: print dependencies
       code: yarn list --depth=0

+ 13 - 0
yarn.lock

@@ -3008,6 +3008,19 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
+growi-plugin-lsx@^1.3.12:
+  version "1.3.12"
+  resolved "https://registry.yarnpkg.com/growi-plugin-lsx/-/growi-plugin-lsx-1.3.12.tgz#6411cc96fe6e3b359a63f5f1c9bca042058e481a"
+  dependencies:
+    growi-pluginkit "^1.1.0"
+    react "^16.2.0"
+    react-dom "^16.2.0"
+    url "^0.11.0"
+
+growi-plugin-pukiwiki-like-linker@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/growi-plugin-pukiwiki-like-linker/-/growi-plugin-pukiwiki-like-linker-1.0.1.tgz#f6306333c3ff9fec81fc22f2f21c533a5df7eac6"
+
 growi-pluginkit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/growi-pluginkit/-/growi-pluginkit-1.1.0.tgz#8e837cd0ba50e6a13eacc75882e09c96eda10679"