-
SETTINGS
-
+
SETTINGS
diff --git a/src/components/modals/settings/ThemeSection.tsx b/src/components/modals/settings/ThemeSection.tsx
index 0cefdc1..4d48099 100644
--- a/src/components/modals/settings/ThemeSection.tsx
+++ b/src/components/modals/settings/ThemeSection.tsx
@@ -46,7 +46,7 @@ export default function ThemeSection() {
{([id, name]) => (
{
- if ('serviceWorker' in navigator) {
- navigator.serviceWorker.getRegistrations().then((registrations) => {
- for (const registration of registrations) {
- registration.unregister();
- }
- });
- }
- });
-
return (
<>
diff --git a/src/pages/(editor)/editor.css b/src/pages/(editor)/editor.css
new file mode 100644
index 0000000..3659e18
--- /dev/null
+++ b/src/pages/(editor)/editor.css
@@ -0,0 +1,53 @@
+@import "tailwindcss";
+
+@plugin "daisyui" {
+ /* biome-ignore lint/correctness/noUnknownProperty: test */
+ logs: false;
+ /* biome-ignore lint/correctness/noUnknownProperty: test */
+ themes: dark, light;
+}
+
+@plugin "daisyui/theme" {
+ /* biome-ignore lint/correctness/noUnknownProperty: test */
+ name: "default";
+ /* biome-ignore lint/correctness/noUnknownProperty: test */
+ default: true;
+ color-scheme: dark;
+ --color-base-100: #202020;
+ --color-base-200: #1a1a1a;
+ --color-base-300: #151515;
+ --color-base-content: #cdcdcd;
+
+ --color-primary: #ffe184;
+ --color-primary-content: #161206;
+
+ --color-secondary: #202020;
+ --color-secondary-content: #cdcdcd;
+
+ --color-accent: #303030;
+ --color-accent-content: #d1d1d1;
+
+ --color-neutral: #202020;
+ --color-neutral-content: #cdcdcd;
+
+ --color-info: #5954ef;
+ --color-info-content: #d9dfff;
+
+ --color-success: #70ef54;
+ --color-success-content: #041402;
+
+ --color-warning: #efd554;
+ --color-warning-content: #141002;
+
+ --color-error: #ef5454;
+ --color-error-content: #140202;
+
+ --radius-badge: 1.9rem;
+ --radius-btn: .375rem;
+ --radius-box: .5rem;
+}
+
+:root {
+ isolation: isolate;
+ user-select: none;
+}
diff --git a/src/pages/(editor)/root.css b/src/pages/(editor)/root.css
deleted file mode 100644
index 2720236..0000000
--- a/src/pages/(editor)/root.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-:root {
- --rounded-box: 0.5rem !important;
- --rounded-btn: 0.375rem !important;
- --rounded-badge: 1.9rem !important;
-}
-
-#root {
- isolation: isolate;
- user-select: none;
-}
diff --git a/src/server.ts b/src/server.ts
new file mode 100644
index 0000000..06f594b
--- /dev/null
+++ b/src/server.ts
@@ -0,0 +1,62 @@
+import { LogLevels, logger } from '@x-util/logger.ts';
+import { serve } from 'bun';
+import { get as envvar } from 'env-var';
+import { serveStatic } from 'hono/bun';
+import { Hono } from 'hono/tiny';
+import { renderPage } from 'vike/server';
+
+process.on('SIGTERM', async () => await frontend.stop());
+
+export const env = {
+ port: envvar('PORT').default(3000).asPortNumber(),
+ logLevel: envvar('LOGLEVEL').default(LogLevels.info).asIntPositive()
+} as const;
+
+logger.set(env.logLevel);
+
+const server = new Hono();
+
+server.use(
+ '*',
+ serveStatic({
+ root: './client/',
+ precompressed: true,
+ onFound: (file, ctx) => {
+ logger.debug('(STATIC)', ctx.req.method, ctx.req.path);
+
+ if (ctx.req.path.startsWith('/assets/')) {
+ ctx.header('Cache-Control', 'max-age=31536000, public, immutable');
+ } else {
+ ctx.header('Cache-Control', 'max-age=3600, public, no-transform');
+ }
+
+ if (file.endsWith('.html')) {
+ ctx.header('Cache-Control', 'max-age=0, no-store');
+ }
+ }
+ })
+);
+
+server.all('*', async (ctx) => {
+ logger.debug('(DYNAMIC)', ctx.req.method, ctx.req.path);
+
+ const pageContext = await renderPage({ urlOriginal: ctx.req.url });
+ const response = pageContext.httpResponse;
+
+ const { readable, writable } = new TransformStream();
+
+ response.pipe(writable);
+
+ return new Response(readable, {
+ status: response.statusCode,
+ headers: response.headers
+ });
+});
+
+// TODO: https://github.com/oven-sh/bun/issues/8690
+const frontend = serve({
+ fetch: server.fetch,
+ port: env.port
+});
+
+logger.info(`Listening on http://${frontend.hostname}:${frontend.port}`);
diff --git a/src/server/index.ts b/src/server/index.ts
deleted file mode 100644
index e7720c1..0000000
--- a/src/server/index.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { logger } from '@x-util/logger';
-import { env, serve } from 'bun';
-import { renderPage } from 'vike/server';
-
-process.on('SIGTERM', () => frontend.stop());
-
-logger.set(Number.parseInt(env.LOGLEVEL as string, 10));
-
-const encodings = {
- br: '.br',
- // zstd: '.zst',
- gzip: '.gz'
-} as const;
-
-const encodingsSortedKeys = Object.keys(encodings) as (keyof typeof encodings)[];
-
-const encodingCompatibleMIME =
- /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
-
-const port = env.PORT || 3000;
-
-// TODO: 103 Early Hints -> https://github.com/oven-sh/bun/issues/8690
-const frontend = serve({
- async fetch(req) {
- const reqURL = new URL(req.url);
-
- // Static files
- let localStatic = `./client${reqURL.pathname}`;
- let content = Bun.file(localStatic);
-
- if (!(await content.exists())) {
- content = Bun.file((localStatic += '/index.html'));
- }
-
- if (await content.exists()) {
- const headers: HeadersInit = {};
-
- if (encodingCompatibleMIME.test(content.type)) {
- const acceptEncodings = new Set(
- req.headers
- .get('Accept-Encoding')
- ?.split(',')
- .map((encoding) => encoding.trim())
- );
-
- for (const encoding of encodingsSortedKeys) {
- if (!acceptEncodings.has(encoding)) continue;
-
- const candidateContent = Bun.file(localStatic + encodings[encoding]);
-
- if (await candidateContent.exists()) {
- headers['Content-Encoding'] = encoding;
- headers['Content-Type'] = content.type;
- headers.Vary = 'Accept-Encoding';
- content = candidateContent;
- break;
- }
- }
- }
-
- if (reqURL.pathname.startsWith('/assets/')) {
- headers['Cache-Control'] = 'max-age=31536000, public, immutable';
- } else {
- headers['Cache-Control'] = 'max-age=3600, public, no-transform';
- }
-
- if (localStatic.endsWith('.html')) {
- headers['Cache-Control'] = 'max-age=0, no-store';
- }
-
- logger.debug(req.method, reqURL.pathname);
-
- return new Response(content, { headers });
- }
-
- // Dynamic pages
- const pageContext = await renderPage({ urlOriginal: reqURL.href });
- const response = pageContext.httpResponse;
-
- if (!response) {
- logger.debug(req.method, reqURL.pathname, '(DYNAMIC UNKNOWN)');
-
- return new Response(null, { status: 500 });
- }
-
- const { readable, writable } = new TransformStream();
-
- response.pipe(writable);
-
- logger.debug(req.method, reqURL.pathname, '(DYNAMIC)');
-
- return new Response(readable, {
- status: response.statusCode,
- headers: response.headers
- });
- },
- static: {
- '/github': Response.redirect('https://github.com/jspaste', 301)
- },
- port: port
-});
-
-logger.info(`Listening on http://${frontend.hostname}:${frontend.port}`);
diff --git a/src/utils/colors.ts b/src/utils/colors.ts
new file mode 100644
index 0000000..c4cb40e
--- /dev/null
+++ b/src/utils/colors.ts
@@ -0,0 +1,22 @@
+import { type ColorInput, color as bunColor } from 'bun';
+
+const colorString =
+ (color: ColorInput) =>
+ (...text: unknown[]): string => {
+ return bunColor(color, 'ansi') + text.join(' ') + colors.reset;
+ };
+
+export const colors = {
+ red: colorString('#ef5454'),
+ orange: colorString('#ef8354'),
+ yellow: colorString('#efd554'),
+ green: colorString('#70ef54'),
+ turquoise: colorString('#54efef'),
+ blue: colorString('#5954ef'),
+ purple: colorString('#a454ef'),
+ pink: colorString('#ef54d5'),
+ gray: colorString('#888'),
+ black: colorString('#000'),
+ white: colorString('#fff'),
+ reset: '\x1b[0m'
+} as const;
diff --git a/src/utils/editorThemes.ts b/src/utils/editorThemes.ts
deleted file mode 100644
index 677c199..0000000
--- a/src/utils/editorThemes.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-import type { Extension } from '@codemirror/state';
-import { tags as t } from '@lezer/highlight';
-import createTheme from '@uiw/codemirror-themes';
-import type { ThemeKeys } from '@x-util/themes';
-
-export const editorThemes: Record = {
- default: createTheme({
- settings: {
- background: '#202020',
- foreground: '#CDCDCD',
- caret: '#FFE184',
- selection: '#FFE18419',
- selectionMatch: '#FFE18433',
- gutterBackground: '#1A1A1A',
- gutterForeground: '#838383',
- gutterActiveForeground: '#CDCDCD',
- lineHighlight: '#FFE18407'
- },
- styles: [
- {
- tag: [t.comment],
- color: '#c8c5bb'
- },
- {
- tag: [t.operator],
- color: '#e8b000'
- },
- {
- tag: [t.unit, t.punctuation],
- color: '#c19200'
- },
- {
- tag: [t.propertyName],
- color: '#fcbe00'
- },
- {
- tag: [t.bracket, t.variableName, t.emphasis, t.heading, t.tagName, t.className, t.namespace],
- color: '#dee2e6'
- },
- {
- tag: [t.typeName, t.atom, t.number, t.keyword, t.link, t.attributeName, t.quote],
- color: '#FFE184'
- },
- {
- tag: [t.number],
- color: '#84b6ff'
- },
- {
- tag: [t.string, t.url],
- color: '#84ffb0'
- }
- ],
- theme: 'dark'
- }),
- dark: createTheme({
- theme: 'dark',
- settings: {
- background: '#1e1e1e',
- foreground: '#9cdcfe',
- caret: '#c6c6c6',
- selection: '#6199ff2f',
- selectionMatch: '#72a1ff59',
- lineHighlight: '#ffffff0f',
- gutterBackground: '#1e1e1e',
- gutterForeground: '#838383',
- gutterActiveForeground: '#fff',
- fontFamily: 'Menlo, Monaco, Consolas, "Andale Mono", "Ubuntu Mono", "Courier New", monospace'
- },
- styles: [
- {
- tag: [
- t.keyword,
- t.operatorKeyword,
- t.modifier,
- t.color,
- t.constant(t.name),
- t.standard(t.name),
- t.standard(t.tagName),
- t.special(t.brace),
- t.atom,
- t.bool,
- t.special(t.variableName)
- ],
- color: '#569cd6'
- },
- {
- tag: [t.controlKeyword, t.moduleKeyword],
- color: '#c586c0'
- },
- {
- tag: [
- t.name,
- t.deleted,
- t.character,
- t.macroName,
- t.propertyName,
- t.variableName,
- t.labelName,
- t.definition(t.name)
- ],
- color: '#9cdcfe'
- },
- {
- tag: t.heading,
- fontWeight: 'bold',
- color: '#9cdcfe'
- },
- {
- tag: [t.typeName, t.className, t.tagName, t.number, t.changed, t.annotation, t.self, t.namespace],
- color: '#4ec9b0'
- },
- {
- tag: [t.function(t.variableName), t.function(t.propertyName)],
- color: '#dcdcaa'
- },
- {
- tag: [t.number],
- color: '#b5cea8'
- },
- {
- tag: [t.operator, t.punctuation, t.separator, t.url, t.escape, t.regexp],
- color: '#d4d4d4'
- },
- {
- tag: [t.regexp],
- color: '#d16969'
- },
- {
- tag: [t.special(t.string), t.processingInstruction, t.string, t.inserted],
- color: '#ce9178'
- },
- {
- tag: [t.angleBracket],
- color: '#808080'
- },
- {
- tag: t.strong,
- fontWeight: 'bold'
- },
- {
- tag: t.emphasis,
- fontStyle: 'italic'
- },
- {
- tag: t.strikethrough,
- textDecoration: 'line-through'
- },
- {
- tag: [t.meta, t.comment],
- color: '#6a9955'
- },
- {
- tag: t.link,
- color: '#6a9955',
- textDecoration: 'underline'
- },
- {
- tag: t.invalid,
- color: '#ff0000'
- }
- ]
- }),
- light: createTheme({
- theme: 'light',
- settings: {
- background: '#ffffff',
- foreground: '#383a42',
- caret: '#000',
- selection: '#add6ff',
- selectionMatch: '#a8ac94',
- lineHighlight: '#f0f0f0',
- gutterBackground: '#fff',
- gutterForeground: '#237893',
- gutterActiveForeground: '#0b216f',
- fontFamily: 'Menlo, Monaco, Consolas, "Andale Mono", "Ubuntu Mono", "Courier New", monospace'
- },
- styles: [
- {
- tag: [
- t.keyword,
- t.operatorKeyword,
- t.modifier,
- t.color,
- t.constant(t.name),
- t.standard(t.name),
- t.standard(t.tagName),
- t.special(t.brace),
- t.atom,
- t.bool,
- t.special(t.variableName)
- ],
- color: '#0000ff'
- },
- {
- tag: [t.moduleKeyword, t.controlKeyword],
- color: '#af00db'
- },
- {
- tag: [
- t.name,
- t.deleted,
- t.character,
- t.macroName,
- t.propertyName,
- t.variableName,
- t.labelName,
- t.definition(t.name)
- ],
- color: '#0070c1'
- },
- {
- tag: t.heading,
- fontWeight: 'bold',
- color: '#0070c1'
- },
- {
- tag: [t.typeName, t.className, t.tagName, t.number, t.changed, t.annotation, t.self, t.namespace],
- color: '#267f99'
- },
- {
- tag: [t.function(t.variableName), t.function(t.propertyName)],
- color: '#795e26'
- },
- {
- tag: [t.number],
- color: '#098658'
- },
- {
- tag: [t.operator, t.punctuation, t.separator, t.url, t.escape, t.regexp],
- color: '#383a42'
- },
- {
- tag: [t.regexp],
- color: '#af00db'
- },
- {
- tag: [t.special(t.string), t.processingInstruction, t.string, t.inserted],
- color: '#a31515'
- },
- {
- tag: [t.angleBracket],
- color: '#383a42'
- },
- {
- tag: t.strong,
- fontWeight: 'bold'
- },
- {
- tag: t.emphasis,
- fontStyle: 'italic'
- },
- {
- tag: t.strikethrough,
- textDecoration: 'line-through'
- },
- {
- tag: [t.meta, t.comment],
- color: '#008000'
- },
- {
- tag: t.link,
- color: '#4078f2',
- textDecoration: 'underline'
- },
- {
- tag: t.invalid,
- color: '#e45649'
- }
- ]
- })
-};
diff --git a/scripts/utils.ts b/src/utils/fs.ts
similarity index 100%
rename from scripts/utils.ts
rename to src/utils/fs.ts
diff --git a/src/utils/langs.ts b/src/utils/langs.ts
index d6c522f..11496e7 100644
--- a/src/utils/langs.ts
+++ b/src/utils/langs.ts
@@ -1,20 +1,16 @@
export const langs = {
- angular: () => import('@codemirror/lang-angular').then((lang) => lang.angular),
cpp: () => import('@codemirror/lang-cpp').then((lang) => lang.cpp),
css: () => import('@codemirror/lang-css').then((lang) => lang.css),
go: () => import('@codemirror/lang-go').then((lang) => lang.go),
html: () => import('@codemirror/lang-html').then((lang) => lang.html),
java: () => import('@codemirror/lang-java').then((lang) => lang.java),
javascript: () => import('@codemirror/lang-javascript').then((lang) => lang.javascript),
- typescript: () => import('@codemirror/lang-javascript').then((lang) => lang.javascript),
json: () => import('@codemirror/lang-json').then((lang) => lang.json),
- liquid: () => import('@codemirror/lang-liquid').then((lang) => lang.liquid),
markdown: () => import('@codemirror/lang-markdown').then((lang) => lang.markdown),
php: () => import('@codemirror/lang-php').then((lang) => lang.php),
python: () => import('@codemirror/lang-python').then((lang) => lang.python),
rust: () => import('@codemirror/lang-rust').then((lang) => lang.rust),
- sass: () => import('@codemirror/lang-sass').then((lang) => lang.sass),
- vue: () => import('@codemirror/lang-vue').then((lang) => lang.vue),
+ typescript: () => import('@codemirror/lang-javascript').then((lang) => lang.javascript),
xml: () => import('@codemirror/lang-xml').then((lang) => lang.xml),
yaml: () => import('@codemirror/lang-yaml').then((lang) => lang.yaml)
} as const;
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index 40142a1..2e207eb 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,48 +1,41 @@
-import chalk from 'chalk';
-import log from 'loglevel';
+import { colors } from '@x-util/colors.ts';
+
+export enum LogLevels {
+ none = 0,
+ error = 1,
+ warn = 2,
+ info = 3,
+ debug = 4
+}
+
+let logLevel: LogLevels = LogLevels.info;
export const logger = {
- set: (level: number | undefined) => {
- switch (level) {
- case 0: {
- log.setLevel('error');
- break;
- }
- case 1: {
- log.setLevel('warn');
- break;
- }
- case 2: {
- log.setLevel('info');
- break;
- }
- case 3: {
- log.setLevel('debug');
- break;
- }
- default: {
- log.setLevel('info');
- }
- }
+ set: (level: LogLevels): void => {
+ logLevel = level;
},
- // biome-ignore lint/suspicious/noExplicitAny: We don't know the type
- error: (...msg: any[]) => {
- log.error(chalk.red('[ERROR]'), chalk.yellow('[SERVER]'), ...msg);
+ error: (...text: unknown[]): void => {
+ if (logLevel >= LogLevels.error) {
+ console.error(colors.gray('[FRONTEND]'), colors.red('[ERROR]'), text.join(' '));
+ }
},
- // biome-ignore lint/suspicious/noExplicitAny: We don't know the type
- warn: (...msg: any[]) => {
- log.warn(chalk.yellow('[WARN]'), chalk.yellow('[SERVER]'), ...msg);
+ warn: (...text: unknown[]): void => {
+ if (logLevel >= LogLevels.warn) {
+ console.warn(colors.gray('[FRONTEND]'), colors.yellow('[WARN]'), text.join(' '));
+ }
},
- // biome-ignore lint/suspicious/noExplicitAny: We don't know the type
- info: (...msg: any[]) => {
- log.info(chalk.blue('[INFO]'), chalk.yellow('[SERVER]'), ...msg);
+ info: (...text: unknown[]): void => {
+ if (logLevel >= LogLevels.info) {
+ console.info(colors.gray('[FRONTEND]'), colors.blue('[INFO]'), text.join(' '));
+ }
},
- // biome-ignore lint/suspicious/noExplicitAny: We don't know the type
- debug: (...msg: any[]) => {
- log.debug(chalk.gray('[DEBUG]'), chalk.yellow('[SERVER]'), ...msg);
+ debug: (...text: unknown[]): void => {
+ if (logLevel >= LogLevels.debug) {
+ console.debug(colors.gray('[FRONTEND]'), colors.gray('[DEBUG]'), text.join(' '));
+ }
}
} as const;
diff --git a/src/utils/themes.ts b/src/utils/themes.ts
index bb918a3..ac334a4 100644
--- a/src/utils/themes.ts
+++ b/src/utils/themes.ts
@@ -1,3 +1,7 @@
+import type { Extension } from '@codemirror/state';
+import { tags as t } from '@lezer/highlight';
+import createTheme from '@uiw/codemirror-themes';
+
export enum Themes {
default = 'JSPaste',
dark = 'Dark',
@@ -5,3 +9,270 @@ export enum Themes {
}
export type ThemeKeys = keyof typeof Themes;
+
+export const editorThemes: Record = {
+ default: createTheme({
+ settings: {
+ background: '#202020',
+ foreground: '#CDCDCD',
+ caret: '#FFE184',
+ selection: '#FFE18419',
+ selectionMatch: '#FFE18433',
+ gutterBackground: '#1A1A1A',
+ gutterForeground: '#838383',
+ gutterActiveForeground: '#CDCDCD',
+ lineHighlight: '#FFE18407'
+ },
+ styles: [
+ {
+ tag: [t.comment],
+ color: '#c8c5bb'
+ },
+ {
+ tag: [t.operator],
+ color: '#e8b000'
+ },
+ {
+ tag: [t.unit, t.punctuation],
+ color: '#c19200'
+ },
+ {
+ tag: [t.propertyName],
+ color: '#fcbe00'
+ },
+ {
+ tag: [t.bracket, t.variableName, t.emphasis, t.heading, t.tagName, t.className, t.namespace],
+ color: '#dee2e6'
+ },
+ {
+ tag: [t.typeName, t.atom, t.number, t.keyword, t.link, t.attributeName, t.quote],
+ color: '#FFE184'
+ },
+ {
+ tag: [t.number],
+ color: '#84b6ff'
+ },
+ {
+ tag: [t.string, t.url],
+ color: '#84ffb0'
+ }
+ ],
+ theme: 'dark'
+ }),
+ dark: createTheme({
+ theme: 'dark',
+ settings: {
+ background: '#1e1e1e',
+ foreground: '#9cdcfe',
+ caret: '#c6c6c6',
+ selection: '#6199ff2f',
+ selectionMatch: '#72a1ff59',
+ lineHighlight: '#ffffff0f',
+ gutterBackground: '#1e1e1e',
+ gutterForeground: '#838383',
+ gutterActiveForeground: '#fff',
+ fontFamily: 'Menlo, Monaco, Consolas, "Andale Mono", "Ubuntu Mono", "Courier New", monospace'
+ },
+ styles: [
+ {
+ tag: [
+ t.keyword,
+ t.operatorKeyword,
+ t.modifier,
+ t.color,
+ t.constant(t.name),
+ t.standard(t.name),
+ t.standard(t.tagName),
+ t.special(t.brace),
+ t.atom,
+ t.bool,
+ t.special(t.variableName)
+ ],
+ color: '#569cd6'
+ },
+ {
+ tag: [t.controlKeyword, t.moduleKeyword],
+ color: '#c586c0'
+ },
+ {
+ tag: [
+ t.name,
+ t.deleted,
+ t.character,
+ t.macroName,
+ t.propertyName,
+ t.variableName,
+ t.labelName,
+ t.definition(t.name)
+ ],
+ color: '#9cdcfe'
+ },
+ {
+ tag: t.heading,
+ fontWeight: 'bold',
+ color: '#9cdcfe'
+ },
+ {
+ tag: [t.typeName, t.className, t.tagName, t.number, t.changed, t.annotation, t.self, t.namespace],
+ color: '#4ec9b0'
+ },
+ {
+ tag: [t.function(t.variableName), t.function(t.propertyName)],
+ color: '#dcdcaa'
+ },
+ {
+ tag: [t.number],
+ color: '#b5cea8'
+ },
+ {
+ tag: [t.operator, t.punctuation, t.separator, t.url, t.escape, t.regexp],
+ color: '#d4d4d4'
+ },
+ {
+ tag: [t.regexp],
+ color: '#d16969'
+ },
+ {
+ tag: [t.special(t.string), t.processingInstruction, t.string, t.inserted],
+ color: '#ce9178'
+ },
+ {
+ tag: [t.angleBracket],
+ color: '#808080'
+ },
+ {
+ tag: t.strong,
+ fontWeight: 'bold'
+ },
+ {
+ tag: t.emphasis,
+ fontStyle: 'italic'
+ },
+ {
+ tag: t.strikethrough,
+ textDecoration: 'line-through'
+ },
+ {
+ tag: [t.meta, t.comment],
+ color: '#6a9955'
+ },
+ {
+ tag: t.link,
+ color: '#6a9955',
+ textDecoration: 'underline'
+ },
+ {
+ tag: t.invalid,
+ color: '#ff0000'
+ }
+ ]
+ }),
+ light: createTheme({
+ theme: 'light',
+ settings: {
+ background: '#ffffff',
+ foreground: '#383a42',
+ caret: '#000',
+ selection: '#add6ff',
+ selectionMatch: '#a8ac94',
+ lineHighlight: '#f0f0f0',
+ gutterBackground: '#fff',
+ gutterForeground: '#237893',
+ gutterActiveForeground: '#0b216f',
+ fontFamily: 'Menlo, Monaco, Consolas, "Andale Mono", "Ubuntu Mono", "Courier New", monospace'
+ },
+ styles: [
+ {
+ tag: [
+ t.keyword,
+ t.operatorKeyword,
+ t.modifier,
+ t.color,
+ t.constant(t.name),
+ t.standard(t.name),
+ t.standard(t.tagName),
+ t.special(t.brace),
+ t.atom,
+ t.bool,
+ t.special(t.variableName)
+ ],
+ color: '#0000ff'
+ },
+ {
+ tag: [t.moduleKeyword, t.controlKeyword],
+ color: '#af00db'
+ },
+ {
+ tag: [
+ t.name,
+ t.deleted,
+ t.character,
+ t.macroName,
+ t.propertyName,
+ t.variableName,
+ t.labelName,
+ t.definition(t.name)
+ ],
+ color: '#0070c1'
+ },
+ {
+ tag: t.heading,
+ fontWeight: 'bold',
+ color: '#0070c1'
+ },
+ {
+ tag: [t.typeName, t.className, t.tagName, t.number, t.changed, t.annotation, t.self, t.namespace],
+ color: '#267f99'
+ },
+ {
+ tag: [t.function(t.variableName), t.function(t.propertyName)],
+ color: '#795e26'
+ },
+ {
+ tag: [t.number],
+ color: '#098658'
+ },
+ {
+ tag: [t.operator, t.punctuation, t.separator, t.url, t.escape, t.regexp],
+ color: '#383a42'
+ },
+ {
+ tag: [t.regexp],
+ color: '#af00db'
+ },
+ {
+ tag: [t.special(t.string), t.processingInstruction, t.string, t.inserted],
+ color: '#a31515'
+ },
+ {
+ tag: [t.angleBracket],
+ color: '#383a42'
+ },
+ {
+ tag: t.strong,
+ fontWeight: 'bold'
+ },
+ {
+ tag: t.emphasis,
+ fontStyle: 'italic'
+ },
+ {
+ tag: t.strikethrough,
+ textDecoration: 'line-through'
+ },
+ {
+ tag: [t.meta, t.comment],
+ color: '#008000'
+ },
+ {
+ tag: t.link,
+ color: '#4078f2',
+ textDecoration: 'underline'
+ },
+ {
+ tag: t.invalid,
+ color: '#e45649'
+ }
+ ]
+ })
+};
diff --git a/tailwind.config.ts b/tailwind.config.ts
index a47b95e..32c193d 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -1,28 +1,2 @@
-import daisyui from 'daisyui';
-import type { Config } from 'tailwindcss';
-
-export default {
- content: ['./src/**/*.{html,js,jsx,ts,tsx,vue}'],
- daisyui: {
- themes: [
- {
- default: {
- primary: '#FFE184',
- secondary: '#202020',
- accent: '#303030',
- neutral: '#202020',
- 'base-100': '#202020',
- 'base-200': '#1A1A1A',
- 'base-300': '#151515',
- info: '#04B6FF',
- success: '#84FF8F',
- warning: '#FFCC84',
- error: '#FF848D'
- }
- },
- 'light',
- 'dark'
- ]
- },
- plugins: [daisyui]
-} satisfies Config;
+// Config moved to "./src/pages/(editor)/editor.css"
+// Kept temporary for backward plugin compatibility.
diff --git a/tsconfig.json b/tsconfig.json
index 969e178..c8aff97 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,6 +12,7 @@
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
+ "incremental": true,
"noEmit": true,
"resolveJsonModule": true,
"skipLibCheck": true,
@@ -27,7 +28,7 @@
"noImplicitReturns": true,
"noPropertyAccessFromIndexSignature": false,
"noUncheckedIndexedAccess": true,
- "noUncheckedSideEffectImports": true,
+ //"noUncheckedSideEffectImports": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"verbatimModuleSyntax": true,
@@ -39,6 +40,7 @@
"@x-page/*": ["./src/pages/*"],
"@x-util/*": ["./src/utils/*"]
},
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo",
"types": ["vite/client", "vike-solid/client"]
},
"exclude": ["./dist/**"]
diff --git a/vite.config.ts b/vite.config.ts
index 7ca1cdb..dda8254 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,25 +1,33 @@
import { resolve } from 'node:path';
+import tailwindcss from '@tailwindcss/vite';
+import browserslist from 'browserslist';
+import { browserslistToTargets } from 'lightningcss';
+import { visualizer } from 'rollup-plugin-visualizer';
import solid from 'vike-solid/vite';
import vike from 'vike/plugin';
import type { UserConfig } from 'vite';
export default {
+ appType: 'custom',
build: {
- reportCompressedSize: false
+ reportCompressedSize: false,
+ cssMinify: 'lightningcss'
},
- resolve: {
- alias: {
- '@x-component': resolve('./src/components'),
- '@x-hook': resolve('./src/hooks'),
- '@x-page': resolve('./src/pages'),
- '@x-util': resolve('./src/utils')
+ css: {
+ transformer: 'lightningcss',
+ lightningcss: {
+ targets: browserslistToTargets(browserslist('defaults'))
}
},
+ json: {
+ stringify: true
+ },
plugins: [
solid(),
+ tailwindcss(),
vike({
- // Other static redirects on "server.ts"...
redirects: {
+ '/github': 'https://github.com/jspaste',
// TODO: Expose Backend API route locations
'/@documentName/r': '/api/document/@documentName/raw',
'/@documentName/raw': '/api/document/@documentName/raw'
@@ -27,6 +35,19 @@ export default {
prerender: {
partial: true
}
+ }),
+ visualizer({
+ emitFile: true,
+ filename: 'bundle.html',
+ template: 'treemap'
})
- ]
+ ],
+ resolve: {
+ alias: {
+ '@x-component': resolve('./src/components'),
+ '@x-hook': resolve('./src/hooks'),
+ '@x-page': resolve('./src/pages'),
+ '@x-util': resolve('./src/utils')
+ }
+ }
} satisfies UserConfig;