fix build and tests

Author: xiaoxinghu

packages/astro/index.js

@@ -41,20 +41,44 @@ export default function org({ recmaPlugins, ...options }) {
               slug: Array.isArray(data.slug) ? data.slug[0] : data.slug,
             }
           },
+          handlePropagation: true,
         })
 
+        // TODO: add org-components support
+        // const components = new URL('org-components', config.srcDir)
+
         updateConfig({
           vite: {
+            /** @type {import('vite').Plugin[]} */
             plugins: [
               {
                 enforce: 'pre',
                 ...orga({
                   ...options,
                   jsxImportSource: 'astro',
+                  // providerImportSource: components.pathname,
                   recmaPlugins: [...(recmaPlugins ?? []), addAstroFragment],
                   elementAttributeNameCase: 'html',
                   development: false,
                 }),
+                configResolved(resolved) {
+                  // HACK: move ourselves before Astro's JSX plugin to transform things in the right order
+                  const jsxPluginIndex = resolved.plugins.findIndex(
+                    (p) => p.name === 'astro:jsx'
+                  )
+                  if (jsxPluginIndex !== -1) {
+                    const myPluginIndex = resolved.plugins.findIndex(
+                      (p) => p.name === '@orgajs/rollup'
+                    )
+                    if (myPluginIndex !== -1) {
+                      const myPlugin = resolved.plugins[myPluginIndex]
+                      // @ts-ignore-error ignore readonly annotation
+                      resolved.plugins.splice(myPluginIndex, 1)
+                      // @ts-ignore-error ignore readonly annotation
+                      resolved.plugins.splice(jsxPluginIndex, 0, myPlugin)
+                    }
+                  }
+                },
               },
               {
                 name: '@orgajs/org-postprocess',
@@ -64,7 +88,6 @@ export default function org({ recmaPlugins, ...options }) {
                  */
                 transform(code, id) {
                   if (!id.endsWith('.org')) return
-                  // console.log(code)
                   return { code, map: null }
                 },
               },

packages/astro/package.json

@@ -38,6 +38,7 @@
     "@types/estree": "^1.0.1",
     "@types/estree-jsx": "^1.0.0",
     "astro": "^2.10.15",
-    "unified": "^10.1.2"
+    "unified": "^10.1.2",
+    "vite": "^4.4.9"
   }
 }

packages/editor/lib/editor.js

@@ -39,7 +39,6 @@ export function makeEditor(config) {
   const editor = new EditorView({
     state,
     parent: target,
-    contentHeight: '100%',
     dispatch: (tr) => {
       editor.update([tr])
       tr.docChanged && onChange && onChange(editor.state)

packages/loader/tests/loader.test.js

@@ -11,7 +11,7 @@ test('basic org-mode parsing', async () => {
   await new Promise((resolve) => setTimeout(resolve, 3000))
   console.log('after the wait')
 
-  const output = stats.toJson({ source: true }).modules[0].source
+  const output = `${stats.toJson({ source: true }).modules[0].source}`
   assert.equal(
     output.trim(),
     `
@@ -25,8 +25,8 @@ function _createOrgContent(props) {
   }, props.components);
   return _jsxs(_components.div, {
     className: "section",
-    children: [_jsxs(_components.h1, {
-      children: ["headline one", " "]
+    children: [_jsx(_components.h1, {
+      children: "headline one"
     }), _jsx(_components.div, {
       style: {
         color: 'red'