Fix svelte-kit build

2021-05-22 23:22:02 +05:30
parent ff591da9e7
commit ccb354e826
5 changed files with 64 additions and 35 deletions
@@ -9,6 +9,8 @@
    "format": "prettier --write --plugin-search-dir=. ."
  },
  "devDependencies": {
+    "@sveltejs/adapter-netlify": "^1.0.0-next.14",
+    "@sveltejs/adapter-static": "^1.0.0-next.11",
    "@sveltejs/kit": "next",
    "@types/mermaid": "^8.2.5",
    "@typescript-eslint/eslint-plugin": "^4.19.0",
@@ -42,4 +44,4 @@
    "random-word-slugs": "^0.0.2",
    "svelte-watch-resize": "^1.0.3"
  }
-}
+}
@@ -23,6 +23,36 @@
 			integrity="sha256-aQCGsx3/OLAXwNyOUrAedielIQAjIrMFkcWdXMlIkGc="
 			crossorigin="anonymous"
 		></script>
+		<link
+			rel="stylesheet"
+			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.23.0/min/vs/editor/editor.main.min.css"
+			integrity="sha512-RhnuJxgda82cBylRysVDqdpwnBcSkMzxz1+BxGwBPNMzBJlvaOjHz7P2kXELC0bdNxazsNSyJb7KAww0T5iUdQ=="
+			crossorigin="anonymous"
+			referrerpolicy="no-referrer"
+		/>
+		<script>
+			var require = {
+				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.23.0/min/vs' }
+			};
+		</script>
+		<script
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.23.0/min/vs/loader.min.js"
+			integrity="sha512-+8+MX2hyUZxaUfMJT0ew+rPsrTGiTmCg8oksa6uVE/ZlR/g3SJtyozqcqDGkw/W785xYAvcx1LxXPP+ywD0SNw=="
+			crossorigin="anonymous"
+			referrerpolicy="no-referrer"
+		></script>
+		<script
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.23.0/min/vs/editor/editor.main.nls.min.js"
+			integrity="sha512-3aAqsDS5ClTlwyzxufRhW9WMwZlYn3V8GLRl324pMIftp+CA6kvxfjlm8TG7Wi53eBcerEdX0YfXm3QLvf1Pqg=="
+			crossorigin="anonymous"
+			referrerpolicy="no-referrer"
+		></script>
+		<script
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.23.0/min/vs/editor/editor.main.js"
+			integrity="sha512-sOJZBKiSvh/6vxIimdXkjO45Nd3v2n3ZYtrwktgj5SJh0+PCqNQ5oqzxEr6c/o4ULczn1Wo2yh1qrz+ghduDUA=="
+			crossorigin="anonymous"
+			referrerpolicy="no-referrer"
+		></script>
 		%svelte.head%
 	</head>
 	<body>
@@ -1,11 +1,6 @@
 <script lang="ts">
 	import type monaco from 'monaco-editor';
 	import { createEventDispatcher, onMount } from 'svelte';
-	import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
-	import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
-	import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker';
-	import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker';
-	import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
 	import { initEditor } from './util';

 	let divEl: HTMLDivElement = null;
@@ -33,25 +28,8 @@
 	const dispatch = createEventDispatcher<EditorEvents>();

 	onMount(async () => {
-		// @ts-ignore
-		self.MonacoEnvironment = {
-			getWorker: function (_moduleId: any, label: string) {
-				if (label === 'json') {
-					return new jsonWorker();
-				}
-				if (label === 'css' || label === 'scss' || label === 'less') {
-					return new cssWorker();
-				}
-				if (label === 'html' || label === 'handlebars' || label === 'razor') {
-					return new htmlWorker();
-				}
-				if (label === 'typescript' || label === 'javascript') {
-					return new tsWorker();
-				}
-				return new editorWorker();
-			}
-		};
-		Monaco = await import('monaco-editor');
+		//@ts-ignore
+		Monaco = monaco; // This is a hack to handle a svelte-kit error when importing monaco.
 		initEditor(Monaco);

 		editor = Monaco.editor.create(divEl, editorOptions);
@@ -1,4 +1,5 @@
 import preprocess from 'svelte-preprocess';
+import adapter from '@sveltejs/adapter-static';

 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -11,17 +12,12 @@ const config = {
 	],

 	kit: {
+		adapter: adapter({
+			pages: 'docs'
+		}),
+		ssr: false,
 		// hydrate the <div id="svelte"> element in src/app.html
-		target: '#svelte',
-		vite: {
-			// ssr: {
-			// 	noExternal: []
-			// },
-			optimizeDeps: {
-				include: ['mermaid']
-			}
-		},
-		ssr: false
+		target: '#svelte'
 	}
 };

@@ -62,6 +62,11 @@
  dependencies:
    purgecss "^3.1.3"

+"@iarna/toml@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
+  integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
+
 "@lukeed/csprng@^1.0.0":
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/@lukeed/csprng/-/csprng-1.0.0.tgz#733a122382749d27e2e46ec38f8c71c9d53a9636"
@@ -111,6 +116,19 @@
    estree-walker "^2.0.1"
    picomatch "^2.2.2"

+"@sveltejs/adapter-netlify@^1.0.0-next.14":
+  version "1.0.0-next.14"
+  resolved "https://registry.yarnpkg.com/@sveltejs/adapter-netlify/-/adapter-netlify-1.0.0-next.14.tgz#6b2f0adff0dd61a897b58c9c6ed3b3e353a6c797"
+  integrity sha512-TIyiFRYjEFYTKEQuht5Ln8HnzBRCVHUJwG5npigJjlVdwyuENXi9B/kO6gJ9I5/Hg49Fs7lc5crBlL6XHezAqw==
+  dependencies:
+    "@iarna/toml" "^2.2.5"
+    esbuild "^0.11.18"
+
+"@sveltejs/adapter-static@^1.0.0-next.11":
+  version "1.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-1.0.0-next.11.tgz#f7bac062b96644d7a4617a3f44bf6f084b0e0052"
+  integrity sha512-flqdt6nJxzRPfhYDZbvrw1iFmc87E3rLJ/Rz7K+d4or/slyqHSxH+yOmQ7CJKej5DidliuTpAOvulithuDc0yw==
+
 "@sveltejs/kit@next":
  version "1.0.0-next.102"
  resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.102.tgz#7f8ecc50a1ebed04b99c1ceb79968f40f82d125a"
@@ -1107,6 +1125,11 @@ error-ex@^1.3.1:
  dependencies:
    is-arrayish "^0.2.1"

+esbuild@^0.11.18:
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.23.tgz#c42534f632e165120671d64db67883634333b4b8"
+  integrity sha512-iaiZZ9vUF5wJV8ob1tl+5aJTrwDczlvGP0JoMmnpC2B0ppiMCu8n8gmy5ZTGl5bcG081XBVn+U+jP+mPFm5T5Q==
+
 esbuild@^0.9.3:
  version "0.9.7"
  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b"