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

rename remark-growi-plugin -> remark-growi-directive

Yuki Takei 3 лет назад
Родитель
Сommit
c8b16ce4fb
42 измененных файлов с 30 добавлено и 30 удалено
  1. 1 1
      .github/workflows/ci-app.yml
  2. 1 1
      packages/app/docker/Dockerfile
  3. 1 1
      packages/app/package.json
  4. 2 2
      packages/app/src/services/renderer/renderer.tsx
  5. 0 0
      packages/remark-growi-directive/.eslintignore
  6. 0 0
      packages/remark-growi-directive/.eslintrc.cjs
  7. 0 0
      packages/remark-growi-directive/.gitignore
  8. 1 1
      packages/remark-growi-directive/package.json
  9. 0 0
      packages/remark-growi-directive/readme.md
  10. 6 0
      packages/remark-growi-directive/src/index.js
  11. 0 0
      packages/remark-growi-directive/src/mdast-util-growi-directive/complex-types.d.ts
  12. 0 0
      packages/remark-growi-directive/src/mdast-util-growi-directive/consts.js
  13. 0 0
      packages/remark-growi-directive/src/mdast-util-growi-directive/index.js
  14. 0 0
      packages/remark-growi-directive/src/mdast-util-growi-directive/readme.md
  15. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/index.js
  16. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/directive-leaf.js
  17. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/directive-text.js
  18. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-attributes.js
  19. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-label.js
  20. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-name.js
  21. 1 1
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/html.js
  22. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/syntax.js
  23. 0 0
      packages/remark-growi-directive/src/micromark-extension-growi-directive/readme.md
  24. 0 0
      packages/remark-growi-directive/src/micromark-factory-attributes-devider/index.d.ts
  25. 0 0
      packages/remark-growi-directive/src/micromark-factory-attributes-devider/index.js
  26. 0 0
      packages/remark-growi-directive/src/micromark-factory-attributes-devider/readme.md
  27. 3 3
      packages/remark-growi-directive/src/remark-growi-directive.js
  28. 0 0
      packages/remark-growi-directive/test/fixtures/leaf/input.md
  29. 0 0
      packages/remark-growi-directive/test/fixtures/leaf/output.md
  30. 0 0
      packages/remark-growi-directive/test/fixtures/leaf/tree.json
  31. 0 0
      packages/remark-growi-directive/test/fixtures/text/input.md
  32. 0 0
      packages/remark-growi-directive/test/fixtures/text/output.md
  33. 0 0
      packages/remark-growi-directive/test/fixtures/text/tree.json
  34. 3 3
      packages/remark-growi-directive/test/mdast-util-growi-directive.test.js
  35. 4 4
      packages/remark-growi-directive/test/micromark-extension-growi-directive.test.js
  36. 4 4
      packages/remark-growi-directive/test/remark-growi-directive.test.js
  37. 0 0
      packages/remark-growi-directive/tsconfig.base.json
  38. 0 0
      packages/remark-growi-directive/tsconfig.build.json
  39. 0 0
      packages/remark-growi-directive/tsconfig.json
  40. 0 6
      packages/remark-growi-plugin/src/index.js
  41. 1 1
      packages/remark-lsx/package.json
  42. 2 2
      packages/remark-lsx/src/services/renderer/lsx.ts

+ 1 - 1
.github/workflows/ci-app.yml

@@ -126,7 +126,7 @@ jobs:
           name: Coverage Report
           name: Coverage Report
           path: |
           path: |
             packages/app/coverage
             packages/app/coverage
-            packages/remark-growi-plugin/coverage
+            packages/remark-growi-directive/coverage
 
 
       - name: Slack Notification
       - name: Slack Notification
         uses: weseek/ghaction-slack-notification@master
         uses: weseek/ghaction-slack-notification@master

+ 1 - 1
packages/app/docker/Dockerfile

@@ -108,7 +108,7 @@ COPY packages/codemirror-textlint packages/codemirror-textlint
 COPY packages/slack packages/slack
 COPY packages/slack packages/slack
 COPY packages/ui packages/ui
 COPY packages/ui packages/ui
 COPY packages/remark-drawio packages/remark-drawio
 COPY packages/remark-drawio packages/remark-drawio
-COPY packages/remark-growi-plugin packages/remark-growi-plugin
+COPY packages/remark-growi-directive packages/remark-growi-directive
 COPY packages/remark-lsx packages/remark-lsx
 COPY packages/remark-lsx packages/remark-lsx
 COPY packages/hackmd packages/hackmd
 COPY packages/hackmd packages/hackmd
 COPY packages/preset-themes packages/preset-themes
 COPY packages/preset-themes packages/preset-themes

+ 1 - 1
packages/app/package.json

@@ -69,7 +69,7 @@
     "@growi/hackmd": "^6.0.0-RC.9",
     "@growi/hackmd": "^6.0.0-RC.9",
     "@growi/preset-themes": "^6.0.0-RC.9",
     "@growi/preset-themes": "^6.0.0-RC.9",
     "@growi/remark-drawio": "^6.0.0-RC.9",
     "@growi/remark-drawio": "^6.0.0-RC.9",
-    "@growi/remark-growi-plugin": "^6.0.0-RC.9",
+    "@growi/remark-growi-directive": "^6.0.0-RC.9",
     "@growi/remark-lsx": "^6.0.0-RC.9",
     "@growi/remark-lsx": "^6.0.0-RC.9",
     "@growi/slack": "^6.0.0-RC.9",
     "@growi/slack": "^6.0.0-RC.9",
     "@promster/express": "^7.0.2",
     "@promster/express": "^7.0.2",

+ 2 - 2
packages/app/src/services/renderer/renderer.tsx

@@ -3,7 +3,7 @@ import { ComponentType } from 'react';
 
 
 import { isClient } from '@growi/core';
 import { isClient } from '@growi/core';
 import * as drawioPlugin from '@growi/remark-drawio';
 import * as drawioPlugin from '@growi/remark-drawio';
-import growiPlugin from '@growi/remark-growi-plugin';
+import growiDirective from '@growi/remark-growi-directive';
 import { Lsx, LsxImmutable } from '@growi/remark-lsx/components';
 import { Lsx, LsxImmutable } from '@growi/remark-lsx/components';
 import * as lsxGrowiPlugin from '@growi/remark-lsx/services/renderer';
 import * as lsxGrowiPlugin from '@growi/remark-lsx/services/renderer';
 import { Schema as SanitizeOption } from 'hast-util-sanitize';
 import { Schema as SanitizeOption } from 'hast-util-sanitize';
@@ -296,7 +296,7 @@ const generateCommonOptions = (pagePath: string|undefined, config: RendererConfi
       gfm,
       gfm,
       emoji,
       emoji,
       pukiwikiLikeLinker,
       pukiwikiLikeLinker,
-      growiPlugin,
+      growiDirective,
     ],
     ],
     rehypePlugins: [
     rehypePlugins: [
       [relativeLinksByPukiwikiLikeLinker, { pagePath }],
       [relativeLinksByPukiwikiLikeLinker, { pagePath }],

+ 0 - 0
packages/remark-growi-plugin/.eslintignore → packages/remark-growi-directive/.eslintignore


+ 0 - 0
packages/remark-growi-plugin/.eslintrc.cjs → packages/remark-growi-directive/.eslintrc.cjs


+ 0 - 0
packages/remark-growi-plugin/.gitignore → packages/remark-growi-directive/.gitignore


+ 1 - 1
packages/remark-growi-plugin/package.json → packages/remark-growi-directive/package.json

@@ -1,5 +1,5 @@
 {
 {
-  "name": "@growi/remark-growi-plugin",
+  "name": "@growi/remark-growi-directive",
   "version": "6.0.0-RC.9",
   "version": "6.0.0-RC.9",
   "description": "remark plugin to support GROWI plugin (forked from remark-directive@2.0.1)",
   "description": "remark plugin to support GROWI plugin (forked from remark-directive@2.0.1)",
   "license": "MIT",
   "license": "MIT",

+ 0 - 0
packages/remark-growi-plugin/readme.md → packages/remark-growi-directive/readme.md


+ 6 - 0
packages/remark-growi-directive/src/index.js

@@ -0,0 +1,6 @@
+import { DirectiveType } from './mdast-util-growi-directive/consts.js';
+import { remarkGrowiDirectivePlugin } from './remark-growi-directive.js';
+
+export { DirectiveType as remarkGrowiDirectivePluginType };
+
+export default remarkGrowiDirectivePlugin;

+ 0 - 0
packages/remark-growi-plugin/src/mdast-util-growi-plugin/complex-types.d.ts → packages/remark-growi-directive/src/mdast-util-growi-directive/complex-types.d.ts


+ 0 - 0
packages/remark-growi-plugin/src/mdast-util-growi-plugin/consts.js → packages/remark-growi-directive/src/mdast-util-growi-directive/consts.js


+ 0 - 0
packages/remark-growi-plugin/src/mdast-util-growi-plugin/index.js → packages/remark-growi-directive/src/mdast-util-growi-directive/index.js


+ 0 - 0
packages/remark-growi-plugin/src/mdast-util-growi-plugin/readme.md → packages/remark-growi-directive/src/mdast-util-growi-directive/readme.md


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/index.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/index.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/directive-leaf.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/directive-leaf.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/directive-text.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/directive-text.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/factory-attributes.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-attributes.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/factory-label.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-label.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/factory-name.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/factory-name.js


+ 1 - 1
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/html.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/html.js

@@ -23,7 +23,7 @@
 import { parseEntities } from 'parse-entities';
 import { parseEntities } from 'parse-entities';
 import { ok as assert } from 'uvu/assert';
 import { ok as assert } from 'uvu/assert';
 
 
-import { DirectiveType } from '../../mdast-util-growi-plugin/consts.js';
+import { DirectiveType } from '../../mdast-util-growi-directive/consts.js';
 
 
 const own = {}.hasOwnProperty;
 const own = {}.hasOwnProperty;
 
 

+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/lib/syntax.js → packages/remark-growi-directive/src/micromark-extension-growi-directive/lib/syntax.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-extension-growi-plugin/readme.md → packages/remark-growi-directive/src/micromark-extension-growi-directive/readme.md


+ 0 - 0
packages/remark-growi-plugin/src/micromark-factory-attributes-devider/index.d.ts → packages/remark-growi-directive/src/micromark-factory-attributes-devider/index.d.ts


+ 0 - 0
packages/remark-growi-plugin/src/micromark-factory-attributes-devider/index.js → packages/remark-growi-directive/src/micromark-factory-attributes-devider/index.js


+ 0 - 0
packages/remark-growi-plugin/src/micromark-factory-attributes-devider/readme.md → packages/remark-growi-directive/src/micromark-factory-attributes-devider/readme.md


+ 3 - 3
packages/remark-growi-plugin/src/remark-growi-plugin.js → packages/remark-growi-directive/src/remark-growi-directive.js

@@ -4,15 +4,15 @@
  * @typedef {import('mdast-util-directive')} DoNotTouchAsThisImportIncludesDirectivesInTree
  * @typedef {import('mdast-util-directive')} DoNotTouchAsThisImportIncludesDirectivesInTree
  */
  */
 
 
-import { directiveFromMarkdown, directiveToMarkdown } from './mdast-util-growi-plugin/index.js';
-import { directive } from './micromark-extension-growi-plugin/index.js';
+import { directiveFromMarkdown, directiveToMarkdown } from './mdast-util-growi-directive/index.js';
+import { directive } from './micromark-extension-growi-directive/index.js';
 
 
 /**
 /**
     * Plugin to support GROWI plugin (`$lsx(/path, depth=2)`).
     * Plugin to support GROWI plugin (`$lsx(/path, depth=2)`).
     *
     *
     * @type {import('unified').Plugin<void[], Root>}
     * @type {import('unified').Plugin<void[], Root>}
     */
     */
-export function remarkGrowiPlugin() {
+export function remarkGrowiDirectivePlugin() {
   const data = this.data();
   const data = this.data();
 
 
   add('micromarkExtensions', directive());
   add('micromarkExtensions', directive());

+ 0 - 0
packages/remark-growi-plugin/test/fixtures/leaf/input.md → packages/remark-growi-directive/test/fixtures/leaf/input.md


+ 0 - 0
packages/remark-growi-plugin/test/fixtures/leaf/output.md → packages/remark-growi-directive/test/fixtures/leaf/output.md


+ 0 - 0
packages/remark-growi-plugin/test/fixtures/leaf/tree.json → packages/remark-growi-directive/test/fixtures/leaf/tree.json


+ 0 - 0
packages/remark-growi-plugin/test/fixtures/text/input.md → packages/remark-growi-directive/test/fixtures/text/input.md


+ 0 - 0
packages/remark-growi-plugin/test/fixtures/text/output.md → packages/remark-growi-directive/test/fixtures/text/output.md


+ 0 - 0
packages/remark-growi-plugin/test/fixtures/text/tree.json → packages/remark-growi-directive/test/fixtures/text/tree.json


+ 3 - 3
packages/remark-growi-plugin/test/mdast-util-growi-plugin.test.js → packages/remark-growi-directive/test/mdast-util-growi-directive.test.js

@@ -3,9 +3,9 @@ import { toMarkdown } from 'mdast-util-to-markdown';
 import test from 'tape';
 import test from 'tape';
 import { removePosition } from 'unist-util-remove-position';
 import { removePosition } from 'unist-util-remove-position';
 
 
-import { DirectiveType } from '../src/mdast-util-growi-plugin/consts.js';
-import { directiveFromMarkdown, directiveToMarkdown } from '../src/mdast-util-growi-plugin/index.js';
-import { directive } from '../src/micromark-extension-growi-plugin/index.js';
+import { DirectiveType } from '../src/mdast-util-growi-directive/consts.js';
+import { directiveFromMarkdown, directiveToMarkdown } from '../src/mdast-util-growi-directive/index.js';
+import { directive } from '../src/micromark-extension-growi-directive/index.js';
 
 
 test('markdown -> mdast', (t) => {
 test('markdown -> mdast', (t) => {
   t.deepEqual(
   t.deepEqual(

+ 4 - 4
packages/remark-growi-plugin/test/micromark-extension-growi-plugin.test.js → packages/remark-growi-directive/test/micromark-extension-growi-directive.test.js

@@ -1,14 +1,14 @@
 /**
 /**
- * @typedef {import('../src/micromark-extension-growi-plugin/index.js').HtmlOptions} HtmlOptions
- * @typedef {import('../src/micromark-extension-growi-plugin/index.js').Handle} Handle
+ * @typedef {import('../src/micromark-extension-growi-directive/index.js').HtmlOptions} HtmlOptions
+ * @typedef {import('../src/micromark-extension-growi-directive/index.js').Handle} Handle
  */
  */
 
 
 import { htmlVoidElements } from 'html-void-elements';
 import { htmlVoidElements } from 'html-void-elements';
 import { micromark } from 'micromark';
 import { micromark } from 'micromark';
 import test from 'tape';
 import test from 'tape';
 
 
-import { DirectiveType } from '../src/mdast-util-growi-plugin/consts.js';
-import { directive as syntax, directiveHtml as html } from '../src/micromark-extension-growi-plugin/index.js';
+import { DirectiveType } from '../src/mdast-util-growi-directive/consts.js';
+import { directive as syntax, directiveHtml as html } from '../src/micromark-extension-growi-directive/index.js';
 
 
 const own = {}.hasOwnProperty;
 const own = {}.hasOwnProperty;
 
 

+ 4 - 4
packages/remark-growi-plugin/test/remark-growi-plugin.test.js → packages/remark-growi-directive/test/remark-growi-directive.test.js

@@ -11,15 +11,15 @@ import test from 'tape';
 import { readSync } from 'to-vfile';
 import { readSync } from 'to-vfile';
 import { unified } from 'unified';
 import { unified } from 'unified';
 
 
-import { remarkGrowiPlugin } from '../src/remark-growi-plugin.js';
+import { remarkGrowiDirectivePlugin } from '../src/remark-growi-directive.js';
 
 
 test('directive()', (t) => {
 test('directive()', (t) => {
   t.doesNotThrow(() => {
   t.doesNotThrow(() => {
-    remark().use(remarkGrowiPlugin).freeze();
+    remark().use(remarkGrowiDirectivePlugin).freeze();
   }, 'should not throw if not passed options');
   }, 'should not throw if not passed options');
 
 
   t.doesNotThrow(() => {
   t.doesNotThrow(() => {
-    unified().use(remarkGrowiPlugin).freeze();
+    unified().use(remarkGrowiDirectivePlugin).freeze();
   }, 'should not throw if without parser or compiler');
   }, 'should not throw if without parser or compiler');
 
 
   t.end();
   t.end();
@@ -39,7 +39,7 @@ test('fixtures', (t) => {
       const input = String(file);
       const input = String(file);
       const outputPath = path.join(base, fixture, 'output.md');
       const outputPath = path.join(base, fixture, 'output.md');
       const treePath = path.join(base, fixture, 'tree.json');
       const treePath = path.join(base, fixture, 'tree.json');
-      const proc = remark().use(remarkGrowiPlugin).freeze();
+      const proc = remark().use(remarkGrowiDirectivePlugin).freeze();
       const actual = proc.parse(file);
       const actual = proc.parse(file);
       /** @type {string} */
       /** @type {string} */
       let output;
       let output;

+ 0 - 0
packages/remark-growi-plugin/tsconfig.base.json → packages/remark-growi-directive/tsconfig.base.json


+ 0 - 0
packages/remark-growi-plugin/tsconfig.build.json → packages/remark-growi-directive/tsconfig.build.json


+ 0 - 0
packages/remark-growi-plugin/tsconfig.json → packages/remark-growi-directive/tsconfig.json


+ 0 - 6
packages/remark-growi-plugin/src/index.js

@@ -1,6 +0,0 @@
-import { DirectiveType } from './mdast-util-growi-plugin/consts.js';
-import { remarkGrowiPlugin } from './remark-growi-plugin.js';
-
-export { DirectiveType as RemarkGrowiPluginType };
-
-export default remarkGrowiPlugin;

+ 1 - 1
packages/remark-lsx/package.json

@@ -24,7 +24,7 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "@growi/core": "^6.0.0-RC.9",
     "@growi/core": "^6.0.0-RC.9",
-    "@growi/remark-growi-plugin": "^6.0.0-RC.9",
+    "@growi/remark-growi-directive": "^6.0.0-RC.9",
     "@growi/ui": "^6.0.0-RC.9",
     "@growi/ui": "^6.0.0-RC.9",
     "swr": "^1.3.0"
     "swr": "^1.3.0"
   },
   },

+ 2 - 2
packages/remark-lsx/src/services/renderer/lsx.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import assert from 'assert';
 
 
 import { pathUtils } from '@growi/core';
 import { pathUtils } from '@growi/core';
-import { RemarkGrowiPluginType } from '@growi/remark-growi-plugin';
+import { remarkGrowiDirectivePluginType } from '@growi/remark-growi-directive';
 import { Schema as SanitizeOption } from 'hast-util-sanitize';
 import { Schema as SanitizeOption } from 'hast-util-sanitize';
 import { selectAll, HastNode } from 'hast-util-select';
 import { selectAll, HastNode } from 'hast-util-select';
 import { Plugin } from 'unified';
 import { Plugin } from 'unified';
@@ -18,7 +18,7 @@ type DirectiveAttributes = Record<string, string>
 export const remarkPlugin: Plugin = function() {
 export const remarkPlugin: Plugin = function() {
   return (tree) => {
   return (tree) => {
     visit(tree, (node) => {
     visit(tree, (node) => {
-      if (node.type === RemarkGrowiPluginType.Text || node.type === RemarkGrowiPluginType.Leaf) {
+      if (node.type === remarkGrowiDirectivePluginType.Text || node.type === remarkGrowiDirectivePluginType.Leaf) {
         if (typeof node.name !== 'string') {
         if (typeof node.name !== 'string') {
           return;
           return;
         }
         }