From 0939b3278930974c1118f82089e8f6a8826af361 Mon Sep 17 00:00:00 2001 From: ThinLiquid Date: Sun, 22 Oct 2023 19:41:08 +0100 Subject: [PATCH 01/11] =?UTF-8?q?[=F0=9F=93=9A]=20Fix=20layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1188d60..1019901 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # FlowOS Next - +
From f2f59ef9c199362d8037d85c61e89b2da49a6520 Mon Sep 17 00:00:00 2001 From: ThinLiquid Date: Sun, 22 Oct 2023 19:44:13 +0100 Subject: [PATCH 02/11] =?UTF-8?q?[=F0=9F=93=9A]=20Add=20URL=20to=20badge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1019901..235cc3f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # FlowOS Next -
+
From 36b3f616fc7d56f86b85ad48786827666c717495 Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:22:04 +0200 Subject: [PATCH 03/11] =?UTF-8?q?[=E2=9E=95]=20Add=20@types/node=20depende?= =?UTF-8?q?ncy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 13 +++++-------- package.json | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c70befc..ed5e6c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "uuid": "^9.0.1" }, "devDependencies": { + "@types/node": "^20.8.7", "@types/uuid": "^9.0.5", "@types/web": "^0.0.117", "ts-standard": "^12.0.2", @@ -729,12 +730,10 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.8.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz", - "integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==", + "version": "20.8.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz", + "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "undici-types": "~5.25.1" } @@ -5807,9 +5806,7 @@ "version": "5.25.3", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/universalify": { "version": "2.0.0", diff --git a/package.json b/package.json index afab852..0530eb4 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "author": "", "license": "MIT", "devDependencies": { + "@types/node": "^20.8.7", "@types/uuid": "^9.0.5", "@types/web": "^0.0.117", "ts-standard": "^12.0.2", From 6b0f6e527d0e6088f06e7abd2f498f0cc1629472 Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:24:57 +0200 Subject: [PATCH 04/11] =?UTF-8?q?[=F0=9F=91=95]=20Update=20tsconfig=20to?= =?UTF-8?q?=20better=20work=20with=20vite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tsconfig.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index a2d9131..02d2cea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,11 +9,14 @@ "jsx": "react", "jsxFactory": "h", "allowJs": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "esModuleInterop": true, "declaration": true, "emitDeclarationOnly": true, "allowImportingTsExtensions": true, - "strictNullChecks": true + "strictNullChecks": true, + "skipLibCheck": true, + "isolatedModules": true, + "types": ["vite/client", "node"] } } \ No newline at end of file From e716d4a76cbe7815fb09c82c7c8e8692594aaa13 Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:27:17 +0200 Subject: [PATCH 05/11] =?UTF-8?q?[=F0=9F=94=A5]=20Remove=20unnecessary=20d?= =?UTF-8?q?eclaration=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files.d.ts | 5 ----- src/prism-code-editor.d.ts | 3 --- 2 files changed, 8 deletions(-) delete mode 100644 src/files.d.ts delete mode 100644 src/prism-code-editor.d.ts diff --git a/src/files.d.ts b/src/files.d.ts deleted file mode 100644 index 2101ae6..0000000 --- a/src/files.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module '*.png' { - const image: string - export = image -} -declare module '*.json' diff --git a/src/prism-code-editor.d.ts b/src/prism-code-editor.d.ts deleted file mode 100644 index 643089f..0000000 --- a/src/prism-code-editor.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module 'prism-code-editor'; -declare module 'prism-code-editor/setups'; -declare module 'prism-code-editor/prism-core'; From c96382b03da996b71e1184e702f8e57a56bbb056 Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:38:41 +0200 Subject: [PATCH 06/11] =?UTF-8?q?[=E2=AC=86=EF=B8=8F]=20Migrate=20to=20pri?= =?UTF-8?q?sm-code-editor=202.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 16 ++++++++-------- package.json | 2 +- src/apps/editor.ts | 21 ++++++++------------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed5e6c0..be543c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@ptkdev/logger": "^1.8.0", "eruda": "^3.0.1", "filer": "^1.4.1", - "prism-code-editor": "^1.2.2", + "prism-code-editor": "^2.0.1", "prismjs": "^1.29.0", "uuid": "^9.0.1" }, @@ -739,9 +739,9 @@ } }, "node_modules/@types/prismjs": { - "version": "1.26.1", - "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.1.tgz", - "integrity": "sha512-Q7jDsRbzcNHIQje15CS/piKhu6lMLb9jwjxSfEIi4KcFKXW23GoJMkwQiJ8VObyfx+VmUaDcJxXaWN+cTCjVog==" + "version": "1.26.2", + "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.2.tgz", + "integrity": "sha512-/r7Cp7iUIk7gts26mHXD66geUC+2Fo26TZYjQK6Nr4LDfi6lmdRmMqM0oPwfiMhUwoBAOFe8GstKi2pf6hZvwA==" }, "node_modules/@types/semver": { "version": "7.5.3", @@ -4767,11 +4767,11 @@ } }, "node_modules/prism-code-editor": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/prism-code-editor/-/prism-code-editor-1.2.2.tgz", - "integrity": "sha512-jmVlSNCp40BWauhzjv3GGFmXVaZkXcuVa7G/5RWV+iSPAugYfL1gQlOkXxC+E2gd/Z3/wbQIEr5RC1kyoohqlg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/prism-code-editor/-/prism-code-editor-2.0.1.tgz", + "integrity": "sha512-93APxLnz6ow6TU8Mw2MC16d/Xb4k2FdjfrzIqb1finFPB/X4ejQyngEF1NkHKpggrIvR33QodW638KeN/gXEfA==", "dependencies": { - "@types/prismjs": "^1.26.0" + "@types/prismjs": "^1.26.2" } }, "node_modules/prismjs": { diff --git a/package.json b/package.json index 0530eb4..8093938 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@ptkdev/logger": "^1.8.0", "eruda": "^3.0.1", "filer": "^1.4.1", - "prism-code-editor": "^1.2.2", + "prism-code-editor": "^2.0.1", "prismjs": "^1.29.0", "uuid": "^9.0.1" } diff --git a/src/apps/editor.ts b/src/apps/editor.ts index 334198a..9e50a4b 100644 --- a/src/apps/editor.ts +++ b/src/apps/editor.ts @@ -2,15 +2,11 @@ import icon from '../assets/icons/editor.png' import { App } from '../types.ts' import { fullEditor } from 'prism-code-editor/setups' -import Prism from 'prism-code-editor/prism-core' -import 'prismjs/components/prism-markup.js' -import 'prismjs/components/prism-clike.js' -import 'prismjs/components/prism-javascript.js' -import 'prismjs/components/prism-typescript.js' -import 'prismjs/components/prism-jsx.js' -import 'prismjs/components/prism-tsx.js' -import 'prism-code-editor/languages' -import 'prism-code-editor/prism-markdown' +// this will also import markup, clike, javascript, typescript and jsx +import 'prism-code-editor/grammars/tsx' +import 'prism-code-editor/grammars/css-extras' +import 'prism-code-editor/grammars/markdown' +import 'prism-code-editor/grammars/python' import { FlowWindow } from '../wm.ts' @@ -193,8 +189,7 @@ export default class EditorApp implements App { const value = (await window.fs.promises.readFile(data.path)).toString() const editor = fullEditor( - Prism, - win.content.querySelector('.editor'), + win.content.querySelector('.editor')!, { language, theme: 'github-dark', @@ -204,7 +199,7 @@ export default class EditorApp implements App { const style = document.createElement('style') style.innerHTML = ` - .prism-editor { + .prism-code-editor { border-radius: 10px 10px 0 0; caret-color: var(--text); font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace; @@ -237,7 +232,7 @@ export default class EditorApp implements App { ` editor.scrollContainer.appendChild(style); (win.content.querySelector('#find') as HTMLElement).onclick = () => { - editor.extensions.searchWidget.open() + editor.extensions.searchWidget!.open() } (win.content.querySelector('#save') as HTMLElement).onclick = async () => { await window.fs.promises.writeFile(data.path, editor.value) From beebf83271ff48042c41f552ad899d78ee5643fb Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:40:16 +0200 Subject: [PATCH 07/11] =?UTF-8?q?[=E2=9E=96]=20Remove=20prismjs=20dependen?= =?UTF-8?q?cy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 9 --------- package.json | 1 - 2 files changed, 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index be543c8..f1f5581 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,6 @@ "eruda": "^3.0.1", "filer": "^1.4.1", "prism-code-editor": "^2.0.1", - "prismjs": "^1.29.0", "uuid": "^9.0.1" }, "devDependencies": { @@ -4774,14 +4773,6 @@ "@types/prismjs": "^1.26.2" } }, - "node_modules/prismjs": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", - "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==", - "engines": { - "node": ">=6" - } - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/package.json b/package.json index 8093938..0148d15 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "eruda": "^3.0.1", "filer": "^1.4.1", "prism-code-editor": "^2.0.1", - "prismjs": "^1.29.0", "uuid": "^9.0.1" } } From e1c6e828237560dfa829d822afee7d73946cd439 Mon Sep 17 00:00:00 2001 From: FIameCaster <82079841+FIameCaster@users.noreply.github.com> Date: Sun, 22 Oct 2023 23:48:24 +0200 Subject: [PATCH 08/11] =?UTF-8?q?[=F0=9F=90=9B]=20Make=20the=20editor=20sc?= =?UTF-8?q?roll=20properly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/editor.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/apps/editor.ts b/src/apps/editor.ts index 9e50a4b..6c65e16 100644 --- a/src/apps/editor.ts +++ b/src/apps/editor.ts @@ -54,7 +54,7 @@ export default class EditorApp implements App { -
+