Merge branch 'master' into milkdown

packages/ui-default/build/config/webpack.js

@@ -81,6 +81,7 @@ export default function (env = {}) {
     mode: (env.production || env.measure) ? 'production' : 'development',
     profile: true,
     context: root(),
+    devtool: env.production ? 'source-map' : false,
     entry: {
       hydro: './entry.js',
       polyfill: './polyfill.ts',
@@ -100,8 +101,6 @@ export default function (env = {}) {
       extensions: ['.js', '.jsx', '.ts', '.tsx'],
       alias: {
         vj: root(),
-        'js-yaml': root('utils/yamlCompact'),
-        'real-js-yaml': require.resolve('js-yaml'),
       },
     },
     module: {
@@ -205,12 +204,12 @@ export default function (env = {}) {
         patterns: [
           { from: root('static') },
           { from: `${dirname(require.resolve('monaco-themes/package.json'))}/themes`, to: 'monaco/themes/' },
-          { from: root('.build/sharedworker.js'), to: 'sharedworker.js' },
         ],
       }),
       new webpack.DefinePlugin({
         'process.env': {
           NODE_ENV: env.production ? '"production"' : '"debug"',
+          VERSION: JSON.stringify(require('@hydrooj/ui-default/package.json').version),
         },
       }),
       new webpack.LoaderOptionsPlugin({
@@ -224,10 +223,10 @@ export default function (env = {}) {
         filename: '[name].[hash:10].worker.js',
         customLanguages: [{
           label: 'yaml',
-          entry: require.resolve('@undefined-moe/monaco-yaml/lib/esm/monaco.contribution'),
+          entry: require.resolve('monaco-yaml/index.js'),
           worker: {
             id: 'vs/language/yaml/yamlWorker',
-            entry: require.resolve('@undefined-moe/monaco-yaml/lib/esm/yaml.worker.js'),
+            entry: require.resolve('monaco-yaml/yaml.worker.js'),
           },
         }],
       }),

packages/ui-default/build/main.ts

@@ -3,7 +3,6 @@
 import cac from 'cac';
 import fs from 'fs-extra';
 import webpack from 'webpack';
-import esbuild from 'esbuild';
 import WebpackDevServer from 'webpack-dev-server';
 import gulp from 'gulp';
 import log from 'fancy-log';
@@ -18,15 +17,6 @@ const argv = cac().parse();
 async function runWebpack({
   watch, production, measure, dev,
 }) {
-  const result = esbuild.build({
-    bundle: true,
-    format: 'iife',
-    entryPoints: [root('sharedworker.ts')],
-    outfile: root('.build/sharedworker.js'),
-    watch: dev || watch,
-    minify: production,
-  });
-  if (!dev && !watch) await result;
   const compiler = webpack(webpackConfig({ watch, production, measure }));
   if (dev) {
     const server = new WebpackDevServer(compiler, {
@@ -36,7 +26,7 @@ async function runWebpack({
       stats: 'none',
       index: root('public'),
       proxy: {
-        context: (path) => !path.includes('sharedworker.js'),
+        context: (path) => !path.includes('sockjs-node'),
         target: 'http://localhost:2333',
         ws: true,
       },
@@ -98,6 +88,10 @@ async function main() {
     if (fs.existsSync('public/default.theme.css')) {
       fs.copyFileSync('public/default.theme.css', `public/default-${pkg.version}.theme.css`);
     }
+    if (argv.options.production) {
+      const files = fs.readdirSync('public');
+      files.filter((i) => /(^[in]\..+|worker)\.js\.map$/.test(i)).forEach((i) => fs.removeSync(`public/${i}`));
+    }
   }
   process.chdir(dir);
 }