Build(package.json): Update version from 1.0.0-SNAPSHOT to 1.0.0

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "oxygen-ui",
-  "version": "1.0.1-SNAPSHOT",
+  "version": "1.0.0-SNAPSHOT",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oxygen-ui",
-      "version": "1.0.1-SNAPSHOT",
+      "version": "1.0.0-SNAPSHOT",
       "dependencies": {
         "@ant-design/icons": "^5.3.7",
         "@dnd-kit/core": "^6.1.0",
@@ -2153,9 +2153,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
+      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"

package.json

@@ -2,9 +2,9 @@
   "name": "oxygen-ui",
   "private": true,
   "type": "module",
-  "version": "1.0.1-SNAPSHOT",
+  "version": "1.0.0",
   "description": "Oxygen Toolbox browser version",
-  "author": {
+  "author":  {
     "name": "FatttSnake",
     "email": "fatttsnake@fatweb.top",
     "url": "https://fatweb.top"

src/components/Playground/Output/Preview/index.tsx

@@ -32,7 +32,7 @@ const Preview = ({
         Compiler.compile(files, importMap, entryPoint)
             .then((result) => {
                 setCompiledCode(
-                    `(()=>{${preExpansionCode}})();\n(()=>{${result.outputFiles[0].text}})();\n(()=>{${postExpansionCode}})();`
+                    `${preExpansionCode}\n${result.outputFiles[0].text}\n${postExpansionCode}`
                 )
                 setErrorMsg('')
             })

src/components/Playground/compiler.ts

@@ -2,7 +2,7 @@ import esbuild, { Loader, OnLoadArgs, Plugin, PluginBuild } from 'esbuild-wasm'
 import localforage from 'localforage'
 import axios from 'axios'
 import { IFiles, IImportMap } from '@/components/Playground/shared'
-import { addReactImport, cssToJs, jsonToJs } from '@/components/Playground/files'
+import { cssToJs, jsonToJs, addReactImport } from '@/components/Playground/files'
 
 class Compiler {
     private init = false
@@ -73,149 +73,151 @@ class Compiler {
         files: IFiles,
         importMap: IImportMap,
         entryPoint: string
-    ): Plugin => ({
+    ): Plugin => {
-        name: 'file-resolver-plugin',
+        return {
-        setup: (build: PluginBuild) => {
+            name: 'file-resolver-plugin',
-            build.onResolve({ filter: /.*/ }, (args: esbuild.OnResolveArgs) => {
+            setup: (build: PluginBuild) => {
-                if (entryPoint === args.path) {
+                build.onResolve({ filter: /.*/ }, (args: esbuild.OnResolveArgs) => {
-                    return {
+                    if (entryPoint === args.path) {
-                        namespace: 'OxygenToolbox',
+                        return {
-                        path: args.path
+                            namespace: 'OxygenToolbox',
+                            path: args.path
+                        }
                     }
-                }
+                    if (args.path.startsWith('./') && files[args.path.substring(2)]) {
-                if (args.path.startsWith('./') && files[args.path.substring(2)]) {
+                        return {
-                    return {
+                            namespace: 'OxygenToolbox',
-                        namespace: 'OxygenToolbox',
+                            path: args.path.substring(2)
-                        path: args.path.substring(2)
+                        }
                     }
-                }
+                    if (args.path.startsWith('./') && files[`${args.path.substring(2)}.tsx`]) {
-                if (args.path.startsWith('./') && files[`${args.path.substring(2)}.tsx`]) {
+                        return {
-                    return {
+                            namespace: 'OxygenToolbox',
-                        namespace: 'OxygenToolbox',
+                            path: `${args.path.substring(2)}.tsx`
-                        path: `${args.path.substring(2)}.tsx`
+                        }
                     }
-                }
+                    if (args.path.startsWith('./') && files[`${args.path.substring(2)}.jsx`]) {
-                if (args.path.startsWith('./') && files[`${args.path.substring(2)}.jsx`]) {
+                        return {
-                    return {
+                            namespace: 'OxygenToolbox',
-                        namespace: 'OxygenToolbox',
+                            path: `${args.path.substring(2)}.jsx`
-                        path: `${args.path.substring(2)}.jsx`
+                        }
                     }
-                }
+                    if (args.path.startsWith('./') && files[`${args.path.substring(2)}.ts`]) {
-                if (args.path.startsWith('./') && files[`${args.path.substring(2)}.ts`]) {
+                        return {
-                    return {
+                            namespace: 'OxygenToolbox',
-                        namespace: 'OxygenToolbox',
+                            path: `${args.path.substring(2)}.ts`
-                        path: `${args.path.substring(2)}.ts`
+                        }
                     }
-                }
+                    if (args.path.startsWith('./') && files[`${args.path.substring(2)}.js`]) {
-                if (args.path.startsWith('./') && files[`${args.path.substring(2)}.js`]) {
+                        return {
-                    return {
+                            namespace: 'OxygenToolbox',
-                        namespace: 'OxygenToolbox',
+                            path: `${args.path.substring(2)}.js`
-                        path: `${args.path.substring(2)}.js`
+                        }
+                    }
+                    if (/\.\/.*\.css/.test(args.path) && !args.resolveDir) {
+                        throw Error(`Css '${args.path}' not found`)
+                    }
+
+                    if (/^https?:\/\/.*/.test(args.path)) {
+                        return {
+                            namespace: 'default',
+                            path: args.path
+                        }
+                    }
+
+                    if (
+                        args.path.includes('./') ||
+                        args.path.includes('../') ||
+                        args.path.startsWith('/')
+                    ) {
+                        return {
+                            namespace: 'default',
+                            path: new URL(args.path, args.resolveDir.substring(1)).href
+                        }
+                    }
+
+                    const path = importMap.imports[args.path]
+
+                    if (!path) {
+                        throw Error(`Import '${args.path}' not found in Import Map`)
                     }
-                }
-                if (/\.\/.*\.css/.test(args.path) && !args.resolveDir) {
-                    throw Error(`Css '${args.path}' not found`)
-                }
 
-                if (/^https?:\/\/.*/.test(args.path)) {
                     return {
                         namespace: 'default',
-                        path: args.path
+                        path
                     }
-                }
+                })
 
-                if (
+                build.onLoad({ filter: /.*\.css$/ }, (args: OnLoadArgs) => {
-                    args.path.includes('./') ||
+                    const contents = cssToJs(files[args.path])
-                    args.path.includes('../') ||
-                    args.path.startsWith('/')
-                ) {
                     return {
-                        namespace: 'default',
+                        loader: 'js',
-                        path: new URL(args.path, args.resolveDir.substring(1)).href
-                    }
-                }
-
-                const path = importMap.imports[args.path]
-
-                if (!path) {
-                    throw Error(`Import '${args.path}' not found in Import Map`)
-                }
-
-                return {
-                    namespace: 'default',
-                    path
-                }
-            })
-
-            build.onLoad({ filter: /.*\.css$/ }, (args: OnLoadArgs) => {
-                const contents = cssToJs(files[args.path])
-                return {
-                    loader: 'js',
-                    contents
-                }
-            })
-
-            build.onLoad({ filter: /.*\.json$/ }, (args: OnLoadArgs) => {
-                const contents = jsonToJs(files[args.path])
-                return {
-                    loader: 'js',
-                    contents
-                }
-            })
-
-            build.onLoad({ filter: /.*/ }, async (args: OnLoadArgs) => {
-                if (entryPoint === args.path) {
-                    return {
-                        loader: 'tsx',
-                        contents: addReactImport(files[entryPoint].value)
-                    }
-                }
-
-                if (files[args.path]) {
-                    const contents = addReactImport(files[args.path].value)
-                    if (args.path.endsWith('.jsx')) {
-                        return {
-                            loader: 'jsx',
-                            contents
-                        }
-                    }
-                    if (args.path.endsWith('.ts')) {
-                        return {
-                            loader: 'ts',
-                            contents
-                        }
-                    }
-                    if (args.path.endsWith('.js')) {
-                        return {
-                            loader: 'js',
-                            contents
-                        }
-                    }
-                    return {
-                        loader: 'tsx',
                         contents
                     }
-                }
+                })
 
-                const cached = await this.fileCache.getItem<esbuild.OnLoadResult>(args.path)
+                build.onLoad({ filter: /.*\.json$/ }, (args: OnLoadArgs) => {
+                    const contents = jsonToJs(files[args.path])
+                    return {
+                        loader: 'js',
+                        contents
+                    }
+                })
 
-                if (cached) {
+                build.onLoad({ filter: /.*/ }, async (args: OnLoadArgs) => {
-                    return cached
+                    if (entryPoint === args.path) {
-                }
+                        return {
+                            loader: 'tsx',
+                            contents: addReactImport(files[entryPoint].value)
+                        }
+                    }
 
-                const axiosResponse = await axios.get<string>(args.path)
+                    if (files[args.path]) {
-                const result: esbuild.OnLoadResult = {
+                        const contents = addReactImport(files[args.path].value)
-                    loader: 'jsx',
+                        if (args.path.endsWith('.jsx')) {
-                    contents: axiosResponse.data,
+                            return {
-                    resolveDir: (axiosResponse.request as XMLHttpRequest).responseURL
+                                loader: 'jsx',
-                }
+                                contents
+                            }
+                        }
+                        if (args.path.endsWith('.ts')) {
+                            return {
+                                loader: 'ts',
+                                contents
+                            }
+                        }
+                        if (args.path.endsWith('.js')) {
+                            return {
+                                loader: 'js',
+                                contents
+                            }
+                        }
+                        return {
+                            loader: 'tsx',
+                            contents
+                        }
+                    }
 
-                await this.fileCache.setItem(args.path, result)
+                    const cached = await this.fileCache.getItem<esbuild.OnLoadResult>(args.path)
 
-                return result
+                    if (cached) {
-            })
+                        return cached
+                    }
+
+                    const axiosResponse = await axios.get<string>(args.path)
+                    const result: esbuild.OnLoadResult = {
+                        loader: 'jsx',
+                        contents: axiosResponse.data,
+                        resolveDir: (axiosResponse.request as XMLHttpRequest).responseURL
+                    }
+
+                    await this.fileCache.setItem(args.path, result)
+
+                    return result
+                })
+            }
         }
-    })
+    }
 }
 
 export default new Compiler()

src/pages/System/Tools/Execute.tsx

@@ -27,7 +27,7 @@ const Execute = () => {
                     const output = result.outputFiles[0].text
                     setCompiledCode('')
                     setTimeout(() => {
-                        setCompiledCode(`(() => {${output}})();\n(() => {${baseDist}})();`)
+                        setCompiledCode(`${output}\n${baseDist}`)
                     }, 100)
                 })
                 .catch((reason) => {

src/pages/Tools/Create.tsx

@@ -145,7 +145,7 @@ const Create = () => {
                 .compile(files, importMap, template.entryPoint)
                 .then((result) => {
                     const output = result.outputFiles[0].text
-                    setCompiledCode(`(() => {${output}})();\n(() => {${baseDist}})();`)
+                    setCompiledCode(`${output}\n${baseDist}`)
                 })
                 .catch((reason) => {
                     void message.error(`编译失败：${reason}`)

src/pages/Tools/View.tsx

@@ -34,7 +34,7 @@ const View = () => {
                         const output = result.outputFiles[0].text
                         setCompiledCode('')
                         setTimeout(() => {
-                            setCompiledCode(`(() => {${output}})();\n(() => {${baseDist}})();`)
+                            setCompiledCode(`${output}\n${baseDist}`)
                         }, 100)
                     })
                     .catch((reason) => {
@@ -49,7 +49,7 @@ const View = () => {
                 const dist = base64ToStr(toolVo.dist.data!)
                 setCompiledCode('')
                 setTimeout(() => {
-                    setCompiledCode(`(() => {${dist}})();\n(() => {${baseDist}})();`)
+                    setCompiledCode(`${dist}\n${baseDist}`)
                 }, 100)
             } catch (e) {
                 void message.error('载入工具失败')