From adf7eca5b7323e47fdf31889189dabf82d8a537f Mon Sep 17 00:00:00 2001 From: cjb873 Date: Tue, 3 Dec 2024 19:01:47 -0700 Subject: [PATCH 1/9] Make correct path --- src/containers/Editor/components/TextEditor.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/containers/Editor/components/TextEditor.tsx b/src/containers/Editor/components/TextEditor.tsx index cd9ae836541..f39baa4bf34 100644 --- a/src/containers/Editor/components/TextEditor.tsx +++ b/src/containers/Editor/components/TextEditor.tsx @@ -1,16 +1,18 @@ import React from "react"; import { LoadingOverlay } from "@mantine/core"; import styled from "styled-components"; -import Editor, { type EditorProps, loader, useMonaco } from "@monaco-editor/react"; +import Editor, { type EditorProps, useMonaco, loader } from "@monaco-editor/react"; import useConfig from "src/store/useConfig"; import useFile from "src/store/useFile"; + loader.config({ paths: { - vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs", + vs: "node_modules/.pnpm/monaco-editor@0.50.0/node_modules/monaco-editor/min/vs", }, }); + const editorOptions: EditorProps["options"] = { formatOnPaste: true, formatOnType: true, From 4aeb613e4d2e98342eac4ae485e0c06635c08fdb Mon Sep 17 00:00:00 2001 From: cjb873 Date: Wed, 4 Dec 2024 15:36:13 -0700 Subject: [PATCH 2/9] Update for use monaco use without cdn --- package.json | 1 + pnpm-lock.yaml | 27 ++++++++++--------- public/monaco-editor | 1 + .../Editor/components/TextEditor.tsx | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 120000 public/monaco-editor diff --git a/package.json b/package.json index 710a32af302..a772624c835 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-unused-imports": "^3.2.0", + "monaco-editor": "^0.34.0", "prettier": "^3.3.3", "ts-node": "^10.9.2", "typescript": "5.3.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a523ebb2fcb..87a05975779 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 7.11.2(react@18.3.1) '@monaco-editor/react': specifier: ^4.6.0 - version: 4.6.0(monaco-editor@0.50.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.6.0(monaco-editor@0.34.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@sentry/nextjs': specifier: ^7.118.0 version: 7.118.0(next@14.2.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) @@ -180,6 +180,9 @@ importers: eslint-plugin-unused-imports: specifier: ^3.2.0 version: 3.2.0(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0) + monaco-editor: + specifier: ^0.34.0 + version: 0.34.0 prettier: specifier: ^3.3.3 version: 3.3.3 @@ -1975,8 +1978,8 @@ packages: resolution: {integrity: sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ==} engines: {node: '>= 0.4'} - monaco-editor@0.50.0: - resolution: {integrity: sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==} + monaco-editor@0.34.0: + resolution: {integrity: sha512-VF+S5zG8wxfinLKLrWcl4WUizMx+LeJrG4PM/M78OhcwocpV0jiyhX/pG6Q9jIOhrb/ckYi6nHnaR5OojlOZCQ==} mousetrap@1.6.5: resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==} @@ -3076,15 +3079,15 @@ snapshots: dependencies: react: 18.3.1 - '@monaco-editor/loader@1.4.0(monaco-editor@0.50.0)': + '@monaco-editor/loader@1.4.0(monaco-editor@0.34.0)': dependencies: - monaco-editor: 0.50.0 + monaco-editor: 0.34.0 state-local: 1.0.7 - '@monaco-editor/react@4.6.0(monaco-editor@0.50.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@monaco-editor/react@4.6.0(monaco-editor@0.34.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@monaco-editor/loader': 1.4.0(monaco-editor@0.50.0) - monaco-editor: 0.50.0 + '@monaco-editor/loader': 1.4.0(monaco-editor@0.34.0) + monaco-editor: 0.34.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -4069,7 +4072,7 @@ snapshots: debug: 4.3.5 enhanced-resolve: 5.17.0 eslint: 8.56.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0) fast-glob: 3.3.2 get-tsconfig: 4.7.6 @@ -4081,7 +4084,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): dependencies: debug: 3.2.7 optionalDependencies: @@ -4102,7 +4105,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) hasown: 2.0.2 is-core-module: 2.15.0 is-glob: 4.0.3 @@ -4847,7 +4850,7 @@ snapshots: hasown: 2.0.2 isarray: 2.0.5 - monaco-editor@0.50.0: {} + monaco-editor@0.34.0: {} mousetrap@1.6.5: {} diff --git a/public/monaco-editor b/public/monaco-editor new file mode 120000 index 00000000000..e420d12f298 --- /dev/null +++ b/public/monaco-editor @@ -0,0 +1 @@ +../node_modules/.pnpm/monaco-editor@0.34.0 \ No newline at end of file diff --git a/src/containers/Editor/components/TextEditor.tsx b/src/containers/Editor/components/TextEditor.tsx index f39baa4bf34..4f826fc57b4 100644 --- a/src/containers/Editor/components/TextEditor.tsx +++ b/src/containers/Editor/components/TextEditor.tsx @@ -8,7 +8,7 @@ import useFile from "src/store/useFile"; loader.config({ paths: { - vs: "node_modules/.pnpm/monaco-editor@0.50.0/node_modules/monaco-editor/min/vs", + vs: './monaco-editor/node_modules/monaco-editor/min/vs', }, }); From 808c9a2d735e8e3c2ebb8d117490212bc0c46c26 Mon Sep 17 00:00:00 2001 From: cjb873 Date: Wed, 4 Dec 2024 16:49:10 -0700 Subject: [PATCH 3/9] Add option for cdn if online --- src/containers/Editor/components/TextEditor.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/containers/Editor/components/TextEditor.tsx b/src/containers/Editor/components/TextEditor.tsx index 4f826fc57b4..465450b12a2 100644 --- a/src/containers/Editor/components/TextEditor.tsx +++ b/src/containers/Editor/components/TextEditor.tsx @@ -5,14 +5,18 @@ import Editor, { type EditorProps, useMonaco, loader } from "@monaco-editor/reac import useConfig from "src/store/useConfig"; import useFile from "src/store/useFile"; +let monaco_url = "./monaco-editor/node_modules/monaco-editor/min/vs" + +if (window.navigator.onLine) { + monaco_url = "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs" +} loader.config({ paths: { - vs: './monaco-editor/node_modules/monaco-editor/min/vs', + vs: monaco_url, }, }); - const editorOptions: EditorProps["options"] = { formatOnPaste: true, formatOnType: true, From 6781168d7eb0ea77097f2a51389a8f3beef6e722 Mon Sep 17 00:00:00 2001 From: cjb873 Date: Wed, 4 Dec 2024 16:52:39 -0700 Subject: [PATCH 4/9] Add semicolons for prettier --- src/containers/Editor/components/TextEditor.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/Editor/components/TextEditor.tsx b/src/containers/Editor/components/TextEditor.tsx index 465450b12a2..15e1245a6ee 100644 --- a/src/containers/Editor/components/TextEditor.tsx +++ b/src/containers/Editor/components/TextEditor.tsx @@ -5,10 +5,10 @@ import Editor, { type EditorProps, useMonaco, loader } from "@monaco-editor/reac import useConfig from "src/store/useConfig"; import useFile from "src/store/useFile"; -let monaco_url = "./monaco-editor/node_modules/monaco-editor/min/vs" +let monaco_url = "./monaco-editor/node_modules/monaco-editor/min/vs"; if (window.navigator.onLine) { - monaco_url = "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs" + monaco_url = "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs"; } loader.config({ From cafa0ca48807e5ef22c5b0ce2ee3c7eadefc73b5 Mon Sep 17 00:00:00 2001 From: Cody Beck Date: Wed, 4 Dec 2024 17:53:30 -0700 Subject: [PATCH 5/9] reset --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index a772624c835..710a32af302 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,6 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-unused-imports": "^3.2.0", - "monaco-editor": "^0.34.0", "prettier": "^3.3.3", "ts-node": "^10.9.2", "typescript": "5.3.3" From 57507e2ed5ba87ecc548b1b6a617430cf63d315d Mon Sep 17 00:00:00 2001 From: Cody Beck Date: Wed, 4 Dec 2024 17:53:52 -0700 Subject: [PATCH 6/9] Update pnpm-lock.yaml --- pnpm-lock.yaml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87a05975779..a523ebb2fcb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 7.11.2(react@18.3.1) '@monaco-editor/react': specifier: ^4.6.0 - version: 4.6.0(monaco-editor@0.34.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.6.0(monaco-editor@0.50.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@sentry/nextjs': specifier: ^7.118.0 version: 7.118.0(next@14.2.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) @@ -180,9 +180,6 @@ importers: eslint-plugin-unused-imports: specifier: ^3.2.0 version: 3.2.0(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0) - monaco-editor: - specifier: ^0.34.0 - version: 0.34.0 prettier: specifier: ^3.3.3 version: 3.3.3 @@ -1978,8 +1975,8 @@ packages: resolution: {integrity: sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ==} engines: {node: '>= 0.4'} - monaco-editor@0.34.0: - resolution: {integrity: sha512-VF+S5zG8wxfinLKLrWcl4WUizMx+LeJrG4PM/M78OhcwocpV0jiyhX/pG6Q9jIOhrb/ckYi6nHnaR5OojlOZCQ==} + monaco-editor@0.50.0: + resolution: {integrity: sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==} mousetrap@1.6.5: resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==} @@ -3079,15 +3076,15 @@ snapshots: dependencies: react: 18.3.1 - '@monaco-editor/loader@1.4.0(monaco-editor@0.34.0)': + '@monaco-editor/loader@1.4.0(monaco-editor@0.50.0)': dependencies: - monaco-editor: 0.34.0 + monaco-editor: 0.50.0 state-local: 1.0.7 - '@monaco-editor/react@4.6.0(monaco-editor@0.34.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@monaco-editor/react@4.6.0(monaco-editor@0.50.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@monaco-editor/loader': 1.4.0(monaco-editor@0.34.0) - monaco-editor: 0.34.0 + '@monaco-editor/loader': 1.4.0(monaco-editor@0.50.0) + monaco-editor: 0.50.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -4072,7 +4069,7 @@ snapshots: debug: 4.3.5 enhanced-resolve: 5.17.0 eslint: 8.56.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0) fast-glob: 3.3.2 get-tsconfig: 4.7.6 @@ -4084,7 +4081,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0): dependencies: debug: 3.2.7 optionalDependencies: @@ -4105,7 +4102,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0))(eslint@8.56.0) hasown: 2.0.2 is-core-module: 2.15.0 is-glob: 4.0.3 @@ -4850,7 +4847,7 @@ snapshots: hasown: 2.0.2 isarray: 2.0.5 - monaco-editor@0.34.0: {} + monaco-editor@0.50.0: {} mousetrap@1.6.5: {} From 0f48b00ec79d6571483f21bd076eae3a84dd0198 Mon Sep 17 00:00:00 2001 From: cjb873 Date: Wed, 4 Dec 2024 17:55:55 -0700 Subject: [PATCH 7/9] update link --- public/monaco-editor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/monaco-editor b/public/monaco-editor index e420d12f298..dea96340e49 120000 --- a/public/monaco-editor +++ b/public/monaco-editor @@ -1 +1 @@ -../node_modules/.pnpm/monaco-editor@0.34.0 \ No newline at end of file +../node_modules/.pnpm/monaco-editor@0.50.0 \ No newline at end of file From b6886d8cdd55cf045c40304145941601d9aef9e9 Mon Sep 17 00:00:00 2001 From: cjb873 Date: Wed, 4 Dec 2024 18:01:44 -0700 Subject: [PATCH 8/9] retrigger checks From c87bccd6885d0b3f1c0c5bd3724286acab5025c2 Mon Sep 17 00:00:00 2001 From: Cody Beck Date: Wed, 4 Dec 2024 21:57:44 -0700 Subject: [PATCH 9/9] Update pull-request.yml --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 505dd6b1f76..ae61236bf15 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -20,7 +20,7 @@ jobs: - uses: pnpm/action-setup@v2 name: Install pnpm with: - version: 8 + version: 9.1.4 run_install: false - name: Get pnpm store directory @@ -45,4 +45,4 @@ jobs: - name: Build run: pnpm run build - \ No newline at end of file +