diff --git a/package.json b/package.json index 040f2af8..b70a8961 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "watch-esm": "tsc -p ./tsconfig.esm.json --watch", "test": "npm run build-amd && mocha ./test/all.js", "dev": "node --max_old_space_size=4092 & cd website && npm run dev", - "prod": "rm -rf ./docs && node --max_old_space_size=4092 & cd website && npm run build", + "prod": "npm run build && rm -rf ./docs && node --max_old_space_size=4092 & cd website && npm run build", "deploy": "npm run prod && gh-pages -d docs -r git@github.com:DTStack/monaco-sql-languages.git", "format": "prettier --write .", "prettier-check": "prettier --check .", diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js index cfcc8cd3..a777ce4e 100644 --- a/scripts/bumpVersion.js +++ b/scripts/bumpVersion.js @@ -59,6 +59,7 @@ function execStandardVersion(res) { .then(({ message }) => { console.log('Please checkout recent commit, and then'); console.log('Push branch and new tag to github, publish package to npm'); + console.log('Please run "npm run deploy" to deploy website to github pages.'); // message && console.log(message) }) .catch(({ error, code }) => { diff --git a/website/src/App.tsx b/website/src/App.tsx index 51ecc1da..dd01cf11 100644 --- a/website/src/App.tsx +++ b/website/src/App.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { create, Workbench } from '@dtinsight/molecule'; import InstanceService from '@dtinsight/molecule/esm/services/instanceService'; import { ExtendsWorkbench } from './extensions/workbench'; +import { version, dependencies } from '../../package.json'; import './languages'; @@ -28,4 +29,9 @@ function App(): React.ReactElement { return
{MyWorkbench}
; } +window.console.log( + `%c dt-sql-parser: v${dependencies['dt-sql-parser']} \n monaco-sql-languages: v${version}`, + 'font-family: Cabin, Helvetica, Arial, sans-serif;text-align: left;font-size:32px;color:#B21212;' +); + export default App; diff --git a/website/src/extensions/workbench/sidebar.tsx b/website/src/extensions/workbench/sidebar.tsx index 1e1f7bb2..8b39574e 100644 --- a/website/src/extensions/workbench/sidebar.tsx +++ b/website/src/extensions/workbench/sidebar.tsx @@ -9,7 +9,7 @@ import { IEditorTab, IProblemsItem, MarkerSeverity } from '@dtinsight/molecule/e import { defaultLanguage, defaultEditorTab, defaultLanguageStatusItem, languages } from './common'; import { LanguageService, ParseError } from 'monaco-sql-languages/esm/languageService'; -import { debounce } from 'monaco-sql-languages/esm/common/utils'; +import { debounce } from './utils'; export default class Sidebar extends React.Component { private _language = defaultLanguage; diff --git a/website/src/extensions/workbench/utils.ts b/website/src/extensions/workbench/utils.ts new file mode 100644 index 00000000..e635b7f5 --- /dev/null +++ b/website/src/extensions/workbench/utils.ts @@ -0,0 +1,21 @@ +export function debounce unknown>( + func: T, + timeout: number, + immediate?: boolean +): (...args: Parameters) => unknown { + let timer: NodeJS.Timeout | null = null; + return (...args) => { + if (timer) { + clearTimeout(timer); + } + if (immediate && !timer) { + return func?.(...args); + } + + timer = setTimeout(() => { + timer && clearTimeout(timer); + timer = null; + func?.(...args); + }, timeout); + }; +} diff --git a/website/vite.config.ts b/website/vite.config.ts index f3e8046b..31cc2c73 100644 --- a/website/vite.config.ts +++ b/website/vite.config.ts @@ -12,6 +12,12 @@ export default defineConfig({ } }, base: '/monaco-sql-languages/', + build: { + commonjsOptions: { + transformMixedEsModules: true + }, + outDir: resolve(__dirname, '../docs') + }, server: { fs: { allow: ['..']