Merge branch 'main' of github.com:yooouuri/vite-plugin-vue-ssr into a…

…dd-h3
yooouuri · Dec 12, 2024 · 0574d52 · 0574d52
2 parents b2237f5 + 0a20253
commit 0574d52
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 64 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vue-ssr",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "packageManager": "[email protected]",
   "type": "module",
   "license": "MIT",

diff --git a/playground/pinia-example/vite.config.ts b/playground/pinia-example/vite.config.ts
@@ -13,7 +13,4 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
-  build: {
-    target: [ 'es2022', 'edge89', 'firefox89', 'chrome89', 'safari15' ],
-  },
 })
diff --git a/playground/vue-router/vite.config.ts b/playground/vue-router/vite.config.ts
@@ -13,7 +13,4 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
-  build: {
-    target: [ 'es2022', 'edge89', 'firefox89', 'chrome89', 'safari15' ],
-  },
 })
diff --git a/src/plugin/transformEntrypoint.ts b/src/plugin/transformEntrypoint.ts
@@ -21,66 +21,72 @@ export function transformEntrypoint(code: string, ssr: boolean, ssrBuild: boolea
       ExportDefaultDeclaration(path) {
         path.replaceWithMultiple(
           [
-            t.variableDeclaration(
-              'const',
-              [
-                t.variableDeclarator(
-                  t.objectPattern([
-                    t.objectProperty(
-                      t.identifier('app'),
-                      t.identifier('app'),
-                      false,
-                      true
-                    ),
-                    t.objectProperty(
-                      t.identifier('router'),
-                      t.identifier('router'),
-                      false,
-                      true
-                    )
-                  ]),
-                  t.awaitExpression(
-                    t.callExpression(
-                      t.identifier('vueSSR'),
-                      [ ...path.node.declaration.arguments, t.identifier(ssrBuild ? 'true' : 'false') ]
-                    )
-                  ),
-                ),
-              ]
-            ),
-            t.expressionStatement(
-              t.callExpression(
-                t.memberExpression(
-                  t.callExpression(
-                    t.memberExpression(
-                      t.identifier('router'),
-                      t.identifier('isReady')
-                    ),
-                    []
-                  ),
-                  t.identifier('then')
+            t.callExpression(
+              t.memberExpression(
+                t.callExpression(
+                  t.identifier('vueSSR'),
+                  [ ...path.node.declaration.arguments, t.identifier(ssrBuild ? 'true' : 'false') ]
                 ),
-                [
-                  t.arrowFunctionExpression(
-                    [],
-                    t.blockStatement(
-                      [
-                        t.expressionStatement(
-                          t.callExpression(
-                            t.memberExpression(
-                              t.identifier('app'),
-                              t.identifier('mount')
+                t.identifier('then')
+              ),
+              [
+                t.arrowFunctionExpression(
+                  [
+                    t.objectPattern([
+                      t.objectProperty(
+                        t.identifier('app'),
+                        t.identifier('app'),
+                        false,
+                        true
+                      ),
+                      t.objectProperty(
+                        t.identifier('router'),
+                        t.identifier('router'),
+                        false,
+                        true
+                      ),
+                    ]),
+                  ],
+                  t.blockStatement(
+                    [
+                      t.expressionStatement(
+                        t.callExpression(
+                          t.memberExpression(
+                            t.callExpression(
+                              t.memberExpression(
+                                t.identifier('router'),
+                                t.identifier('isReady')
+                              ),
+                              []
                             ),
-                            [
-                              t.stringLiteral('#app')
-                            ]
-                          )
-                        ),
-                      ]
-                    )
+                            t.identifier('then')
+                          ),
+                          [
+                            t.arrowFunctionExpression(
+                              [],
+                              t.blockStatement(
+                                [
+                                  t.expressionStatement(
+                                    t.callExpression(
+                                      t.memberExpression(
+                                        t.identifier('app'),
+                                        t.identifier('mount')
+                                      ),
+                                      [
+                                        t.stringLiteral('#app')
+                                      ]
+                                    )
+                                  ),
+                                ]
+                              )
+                            )
+                          ]
+                        )
+                      )
+                    ]
                   )
-                ]
-              )
+                )
+              ]
             )
           ]
         )