fix a bunch of bugs

Author: milomg

.prettierignore

@@ -1,5 +1,4 @@
 node_modules/
 dist/
-lib/
 src/defaultFiles/
 pnpm-lock.yaml

package.json

@@ -20,7 +20,7 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "monaco-editor@0.41.0": "patches/[email protected]"
+      "monaco-editor@0.40.0": "patches/[email protected]"
     }
   }
 }

packages/playground/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="manifest" href="/manifest.webmanifest" />
-    <link rel="shortcut icon" href="./assets/logo.png" type="image/png" />
+    <link rel="shortcut icon" href="/logo.png" type="image/png" />
     <title>Solid Playground</title>
     <meta name="description" content="Quickly discover what the solid compiler will generate from your JSX template" />
   </head>

packages/playground/package.json

@@ -18,21 +18,21 @@
   },
   "devDependencies": {
     "@amoutonbrady/lz-string": "^0.1.0",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-syntax-jsx": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/types": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/types": "^7.22.11",
     "@solidjs/router": "^0.8.3",
     "@types/babel__standalone": "^7.1.4",
     "@types/dedent": "^0.7.0",
-    "@unocss/preset-wind": "^0.55.1",
+    "@unocss/preset-wind": "^0.55.3",
     "assert": "^2.0.0",
     "csstype": "^3.1.2",
     "jszip": "^3.10.1",
-    "monaco-editor": "~0.41.0",
+    "monaco-editor": "~0.40.0",
     "register-service-worker": "^1.7.2",
-    "typescript": "^5.1.6",
-    "unocss": "^0.55.1",
+    "typescript": "^5.2.2",
+    "unocss": "^0.55.3",
     "vite": "^4.4.9",
     "vite-plugin-solid": "^2.7.0"
   }

packages/playground/src/assets/logo.png renamed to packages/playground/public/logo.png

@@ -18,30 +18,30 @@
     "tsc": "tsc"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-syntax-jsx": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/types": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/types": "^7.22.11",
     "@types/babel__standalone": "^7.1.4",
     "@types/dedent": "^0.7.0",
     "@types/fs-extra": "^11.0.1",
-    "@unocss/cli": "^0.55.1",
-    "@unocss/preset-wind": "^0.55.1",
+    "@unocss/cli": "^0.55.3",
+    "@unocss/preset-wind": "^0.55.3",
     "esbuild": "^0.19.2",
     "fs-extra": "^11.1.1",
     "jiti": "^1.19.3",
-    "monaco-editor": "~0.41.0",
-    "typescript": "^5.1.6",
-    "unocss": "^0.55.1"
+    "monaco-editor": "~0.40.0",
+    "typescript": "^5.2.2",
+    "unocss": "^0.55.3"
   },
   "dependencies": {
-    "@babel/standalone": "^7.22.10",
+    "@babel/standalone": "^7.22.12",
     "@solid-primitives/media": "^2.2.4",
     "@solid-primitives/scheduled": "^1.4.1",
-    "@unocss/reset": "^0.55.1",
+    "@unocss/reset": "^0.55.3",
     "babel-preset-solid": "1.7.7",
     "dedent": "^1.5.1",
-    "eslint-solid-standalone": "^0.12.1",
+    "eslint-solid-standalone": "^0.13.0",
     "monaco-editor-textmate": "^4.0.0",
     "monaco-textmate": "^3.0.1",
     "onigasm": "^2.2.5",

packages/solid-repl/package.json

@@ -25,14 +25,22 @@ function babelTransform(filename: string, code: string) {
           visitor: {
             Import(path: any) {
               const importee: string = path.parent.arguments[0].value;
-
               cache[importee] = path.parent.arguments[0].value = transformImportee(importee);
             },
             ImportDeclaration(path: any) {
               const importee: string = path.node.source.value;
-              // Replace relative imports, as import maps don't seem to be able to handle them properly
               cache[importee] = path.node.source.value = transformImportee(importee);
             },
+            ExportAllDeclaration(path: any) {
+              const importee: string = path.node.source.value;
+              cache[importee] = path.node.source.value = transformImportee(importee);
+            },
+            ExportNamedDeclaration(path: any) {
+              const importee: string = path.node.source?.value;
+              if (importee) {
+                cache[importee] = path.node.source.value = transformImportee(importee);
+              }
+            },
           },
         };
       },
@@ -121,7 +129,7 @@ function bundle(entryPoint: string, fileRecord: Record<string, string>) {
   return dataToReturn;
 }
 
-async function compile(tabs: Tab[], event: string) {
+function compile(tabs: Tab[], event: string) {
   const tabsRecord: Record<string, string> = {};
   for (const tab of tabs) {
     tabsRecord[`./${tab.name.replace(/.(tsx|jsx)$/, '')}`] = tab.source;
@@ -130,8 +138,8 @@ async function compile(tabs: Tab[], event: string) {
   return { event, compiled: bundled };
 }
 
-async function babel(tab: Tab, compileOpts: any) {
-  const { code } = await transform(tab.source, {
+function babel(tab: Tab, compileOpts: any) {
+  const { code } = transform(tab.source, {
     presets: [
       [babelPresetSolid, compileOpts],
       ['typescript', { onlyRemoveTypeImports: true }],
@@ -141,14 +149,14 @@ async function babel(tab: Tab, compileOpts: any) {
   return { event: 'BABEL', compiled: code };
 }
 
-self.addEventListener('message', async ({ data }) => {
+self.addEventListener('message', ({ data }) => {
   const { event, tabs, tab, compileOpts } = data;
 
   try {
     if (event === 'BABEL') {
-      self.postMessage(await babel(tab, compileOpts));
+      self.postMessage(babel(tab, compileOpts));
     } else if (event === 'ROLLUP') {
-      self.postMessage(await compile(tabs, event));
+      self.postMessage(compile(tabs, event));
     }
   } catch (e) {
     self.postMessage({ event: 'ERROR', error: e });

packages/solid-repl/repl/compiler.ts

@@ -1,12 +1,11 @@
-// @ts-ignore
-import prettier from 'prettier/esm/standalone.mjs';
-// @ts-ignore
-import parserBabel from 'prettier/esm/parser-babel.mjs';
+import { format as prettierFormat } from 'prettier/standalone';
+import * as prettierPluginBabel from 'prettier/plugins/babel';
+import * as prettierPluginEstree from 'prettier/plugins/estree';
 
 function format(code: string) {
-  return prettier.format(code, {
+  return prettierFormat(code, {
     parser: 'babel-ts',
-    plugins: [parserBabel],
+    plugins: [prettierPluginBabel, prettierPluginEstree],
   });
 }
 

packages/solid-repl/repl/formatter.ts

@@ -100,6 +100,7 @@ const Editor: Component<{
       const disabled = props.disabled == true ? true : false;
       editor.updateOptions({ readOnly: disabled });
     });
+
     if (props.linter) {
       editor.addAction({
         id: 'eslint.executeAutofix',
@@ -119,13 +120,11 @@ const Editor: Component<{
     }
 
     editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, () => {
-      if (editor) {
-        // auto-format
-        editor.getAction('editor.action.formatDocument')?.run();
-        // auto-fix problems
-        props.displayErrors && editor.getAction('eslint.executeAutofix')?.run();
-        editor.focus();
-      }
+      // auto-format
+      editor.getAction('editor.action.formatDocument')?.run();
+      // auto-fix problems
+      props.displayErrors && editor.getAction('eslint.executeAutofix')?.run();
+      editor.focus();
     });
 
     editor.onDidChangeModelContent(() => {
@@ -134,7 +133,7 @@ const Editor: Component<{
       runLinter(code);
     });
   });
-  onCleanup(() => editor?.dispose());
+  onCleanup(() => editor.dispose());
 
   createEffect(() => {
     editor.setModel(model());

packages/solid-repl/src/components/editor/index.tsx

@@ -12,7 +12,7 @@ import { editor, Uri } from 'monaco-editor';
 
 import MonacoTabs from './editor/monacoTabs';
 import Editor from './editor';
-import type { Repl as ReplProps } from 'solid-repl/lib/repl';
+import type { Repl as ReplProps } from 'solid-repl/dist/repl';
 
 const compileMode = {
   SSR: { generate: 'ssr', hydratable: true },