@lvce-editor/server 0.0.29 → 0.0.32

package/ThirdPartyNotices.txt

@@ -2,7 +2,7 @@ This project incorporates components from the projects listed below, that may ha
 differing from this project:
 
 
-1) License Notice for static/bf7d47a/icons (from https://github.com/microsoft/vscode-icons)
+1) License Notice for static/37d2807/icons (from https://github.com/microsoft/vscode-icons)
 ---------------------------------------
 
 Attribution 4.0 International
@@ -402,7 +402,7 @@ public licenses.
 Creative Commons may be contacted at creativecommons.org.
 
 
-2) License Notice for static/bf7d47a/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/37d2807/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
 ---------------------------------------
 
 Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/server",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -10,6 +10,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@lvce-editor/shared-process": "0.0.29"
+    "@lvce-editor/shared-process": "0.0.32"
   }
 }

package/src/server.js

@@ -15,7 +15,9 @@ const ROOT = resolve(__dirname, '../')
 const STATIC = resolve(__dirname, '../static')
 const PORT = process.env.PORT || 3000
 
-let argv2 = process.argv[2]
+const argv = process.argv
+
+let argv2 = argv[2]
 
 if (!argv2) {
   argv2 = resolve(__dirname, '../../../playground')
@@ -23,6 +25,8 @@ if (!argv2) {
 
 const FOLDER = resolve(process.cwd(), argv2)
 
+const immutable = true
+
 const IS_WINDOWS = process.platform === 'win32'
 
 const textMimeType = {
@@ -60,9 +64,12 @@ const serveStatic = (root, skip = '') =>
       res.writeHead(304)
       return res.end()
     }
+    const cachingHeader =
+      immutable && root === STATIC ? 'public, max-age=31536000, immutable' : ''
     res.writeHead(200, {
       'Content-Type': textMimeType[extname(filePath)] || 'text/plain',
       Etag: etag,
+      'Cache-Control': cachingHeader,
       // enables access for performance.measureUserAgentSpecificMemory, see https://web.dev/monitor-total-page-memory-usage/
       'Cross-Origin-Embedder-Policy': 'require-corp',
       'Cross-Origin-Opener-Policy': 'same-origin',
@@ -268,20 +275,18 @@ const handleUpgrade = (request, socket) => {
 app.on('upgrade', handleUpgrade)
 
 app.on('error', (error) => {
-  console.error('[info: server error]', error)
+  // @ts-ignore
+  if (error && error.code === 'EADDRINUSE') {
+    console.error(
+      `[server] Error: port ${PORT} is already taken (possible solution: Run \`killall node\` to free up the port)`
+    )
+  } else {
+    console.error('[info: server error]', error)
+  }
 })
 
 const handleProcessExit = (code) => {
-  console.info(`[web] Process will exit with code ${code}`)
-  app.close()
-  if (state.sharedProcess && !state.sharedProcess.killed) {
-    state.sharedProcess.kill()
-    state.sharedProcess = undefined
-  }
-}
-
-const handleSigInt = () => {
-  console.info(`[web] Process will exit because of sigint`)
+  console.info(`[server] Process will exit with code ${code}`)
   app.close()
   if (state.sharedProcess && !state.sharedProcess.killed) {
     state.sharedProcess.kill()
@@ -294,19 +299,18 @@ const handleAppReady = () => {
     console.log('send ready')
     process.send('ready')
   } else {
-    console.info(`[web] listening on http://localhost:${PORT}`)
+    console.info(`[server] listening on http://localhost:${PORT}`)
   }
 }
 
 const handleUncaughtExceptionMonitor = (error, origin) => {
-  console.info('[web] Uncaught exception')
+  console.info('[server] Uncaught exception')
   console.info(error)
 }
 
 const main = () => {
   process.on('message', handleMessageFromParent)
   process.on('exit', handleProcessExit)
-  process.on('SIGINT', handleSigInt)
   process.on('uncaughtExceptionMonitor', handleUncaughtExceptionMonitor)
   app.listen(PORT, handleAppReady)
 }

package/static/{bf7d47a → 37d2807}/config/builtinCommands.json

@@ -133,7 +133,7 @@
     "label": "Extensions: Open Cached Extensions Folder"
   },
   {
-    "id": "Focus.ActivityBar",
+    "id": "ActivityBar.focus",
     "label": "Focus: ActivityBar"
   },
   {

package/static/{bf7d47a → 37d2807}/css/App.css

@@ -350,7 +350,7 @@ body {
 /*************/
 @font-face {
   font-family: 'Fira Code';
-  src: url(/bf7d47a/fonts/FiraCode-VariableFont.ttf) format('truetype');
+  src: url(/37d2807/fonts/FiraCode-VariableFont.ttf) format('truetype');
 }
 
 /* TODO check if contain strict also makes sense for html and body */
@@ -511,11 +511,6 @@ body {
 /*************/
 /* ViewletSearch.css */
 /*************/
-.Viewlet[data-viewlet-id='Search']:focus {
-  outline: 1px solid red;
-  outline-offset: -1px;
-}
-
 .ViewletSearchInput {
   /* background-color: rgb(36, 41, 42);
   color: rgb(225, 225, 225);
@@ -530,6 +525,11 @@ body {
   margin-left: 18px;
   width: calc(100% - 36px);
 }
+
+.ViewletSearchMessage {
+  color: rgba(156, 162, 160, 0.65);
+  padding: 0 22px 8px;
+}
 /*************/
 /* ViewletRunAndDebug.css */
 /*************/
@@ -776,8 +776,8 @@ body {
   height: 16px;
   contain: strict;
   background: #c5c5c5;
-  -webkit-mask: url(/bf7d47a/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
-  mask: url(/bf7d47a/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  -webkit-mask: url(/37d2807/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  mask: url(/37d2807/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
 }
 
 .NegativeMargin {
@@ -1455,7 +1455,7 @@ body {
   width: 0.75rem;
   height: 0.75rem;
   background: orchid;
-  -webkit-mask-image: url(/bf7d47a/icons/check.svg);
+  -webkit-mask-image: url(/37d2807/icons/check.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1470,7 +1470,7 @@ body {
   height: 16px;
   content: '';
   display: block;
-  -webkit-mask-image: url(/bf7d47a/icons/chevron-right.svg);
+  -webkit-mask-image: url(/37d2807/icons/chevron-right.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1789,7 +1789,7 @@ body {
   position: absolute;
   inset: 0;
   background: var(--TabActiveForeground);
-  -webkit-mask-image: url(/bf7d47a/icons/icon-close.svg);
+  -webkit-mask-image: url(/37d2807/icons/icon-close.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1870,7 +1870,7 @@ body {
   content: '';
   position: absolute;
   inset: 0;
-  /* -webkit-mask-image: url(/bf7d47a/icons/icon-close.svg); */
+  /* -webkit-mask-image: url(/37d2807/icons/icon-close.svg); */
   /* -webkit-mask-repeat: no-repeat; */
   /* mask-repeat: no-repeat; */
   /* -webkit-mask-position: center; */
@@ -1880,27 +1880,27 @@ body {
 }
 
 .IconProperty::before {
-  -webkit-mask-image: url(/bf7d47a/icons/symbol-property.svg);
+  -webkit-mask-image: url(/37d2807/icons/symbol-property.svg);
   background: #c5c5c5;
 }
 
 .IconValue::before {
-  -webkit-mask-image: url(/bf7d47a/icons/symbol-enum.svg);
+  -webkit-mask-image: url(/37d2807/icons/symbol-enum.svg);
   background: #ee9d28;
 }
 
 .IconVariable::before {
-  -webkit-mask-image: url(/bf7d47a/icons/symbol-variable.svg);
+  -webkit-mask-image: url(/37d2807/icons/symbol-variable.svg);
   background: #75beff;
 }
 
 .IconFunction::before {
-  -webkit-mask-image: url(/bf7d47a/icons/symbol-method.svg);
+  -webkit-mask-image: url(/37d2807/icons/symbol-method.svg);
   background: #b180d7;
 }
 
 .IconKeyword::before {
-  -webkit-mask-image: url(/bf7d47a/icons/symbol-keyword.svg);
+  -webkit-mask-image: url(/37d2807/icons/symbol-keyword.svg);
   background: #c5c5c5;
 }