Merge pull request #731 from live-codes/develop

release v41

Author: hatemhosny

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. See [standa
 
 ---
 
+## [v41](https://github.com/live-codes/livecodes/compare/v40...v41) (2025-01-25)
+
+This release fixes invalid cache for codemirror build and simplifies the build process.
+
+---
+
 ## [v40](https://github.com/live-codes/livecodes/compare/v39...v40) (2025-01-24)
 
 ### Highlights for this release

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "livecodes",
   "version": "0.0.0",
-  "appVersion": "40",
+  "appVersion": "41",
   "description": "Code Playground That Just Works!",
   "author": "Hatem Hosny",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "url": "https://github.com/live-codes/livecodes"
   },
   "scripts": {
-    "start": "run-p watch serve",
+    "start": "run-p copy:assets watch serve",
     "docs": "cd docs && npm run start",
     "storybook": "cd storybook && npm run storybook",
     "serve": "live-server build --watch=build/tmp/ --cors --quiet",
@@ -71,43 +71,9 @@
     "check-types": "tsc -p tsconfig.full.json --noEmit"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "6.18.4",
-    "@codemirror/commands": "6.8.0",
-    "@codemirror/lang-cpp": "6.0.2",
-    "@codemirror/lang-css": "6.3.1",
-    "@codemirror/lang-html": "6.4.9",
-    "@codemirror/lang-javascript": "6.2.2",
-    "@codemirror/lang-json": "6.0.1",
-    "@codemirror/lang-markdown": "6.3.2",
-    "@codemirror/lang-php": "6.0.1",
-    "@codemirror/lang-python": "6.1.6",
-    "@codemirror/lang-sass": "6.0.2",
-    "@codemirror/lang-sql": "6.8.0",
-    "@codemirror/lang-vue": "0.1.3",
-    "@codemirror/lang-wast": "6.0.2",
-    "@codemirror/language": "6.10.8",
-    "@codemirror/legacy-modes": "6.4.2",
-    "@codemirror/lint": "6.8.4",
-    "@codemirror/search": "6.5.8",
-    "@codemirror/state": "6.5.1",
-    "@codemirror/theme-one-dark": "6.1.2",
-    "@codemirror/view": "6.36.2",
-    "@emmetio/codemirror6-plugin": "0.4.0",
-    "@lezer/common": "1.2.3",
-    "@lezer/highlight": "1.2.1",
-    "@lezer/javascript": "1.4.21",
-    "@lezer/lr": "1.4.2",
-    "@replit/codemirror-css-color-picker": "6.0.0",
-    "@replit/codemirror-emacs": "6.0.0",
-    "@replit/codemirror-indentation-markers": "6.1.0",
-    "@replit/codemirror-vim": "6.0.3",
-    "@replit/codemirror-vscode-keymap": "6.0.2",
     "@snackbar/core": "1.7.0",
     "@types/deep-diff": "1.0.1",
-    "@valtown/codemirror-codeium": "1.0.1",
-    "@valtown/codemirror-ts": "2.1.2",
     "codejar": "4.1.1",
-    "codemirror": "6.0.1",
     "deep-diff": "1.0.2",
     "eslint-plugin-no-only-tests": "3.1.0",
     "firebase": "9.6.6",

package.json

@@ -5,7 +5,6 @@ const path = require('path');
 
 const { applyHash } = require('./hash');
 const { injectCss } = require('./inject-css');
-const { buildVendors } = require('./vendors');
 const { buildStyles } = require('./styles');
 const { buildI18n, buildLocalePathLoader } = require('./i18n');
 const { arrToObj, mkdir, uint8arrayToString, iife, getFileNames, getEnvVars } = require('./utils');
@@ -63,7 +62,7 @@ const baseOptions = {
   },
   loader: { '.html': 'text', '.ttf': 'file' },
   logLevel: 'error',
-  external: ['@codemirror/*', '@lezer/*'],
+  external: ['codemirror', '@codemirror/*', '@lezer/*', '@replit/codemirror-*'],
   plugins: [
     ...(devMode
       ? []
@@ -149,6 +148,11 @@ const esmBuild = () =>
       'headless.ts',
       'templates/starter/index.ts',
       'editor/monaco/monaco.ts',
+      'editor/monaco/languages/monaco-lang-astro.ts',
+      'editor/monaco/languages/monaco-lang-clio.ts',
+      'editor/monaco/languages/monaco-lang-imba.ts',
+      // 'editor/monaco/languages/monaco-lang-sql.ts',
+      'editor/monaco/languages/monaco-lang-wat.ts',
       'editor/codemirror/codemirror.ts',
       'editor/codejar/codejar.ts',
       'editor/blockly/blockly.ts',
@@ -290,7 +294,6 @@ prepareDir().then(async () => {
     buildI18n(),
   ]).then(async () => {
     if (!devMode) {
-      buildVendors();
       functionsBuild();
     }
     await applyHash({ devMode });

scripts/build.js

@@ -55,29 +55,24 @@ const getVars = (/** @type {boolean} */ devMode) => {
       ? 'https://livecodes.io/docs/'
       : process.env.DOCS_BASE_URL || (devMode ? 'http://localhost:3000/docs/' : '/docs/');
 
-  const codemirrorVersion = `v${pkg.dependencies['codemirror']}`;
-
   return {
     appVersion,
     sdkVersion,
     gitCommit,
     repoUrl,
     docsBaseUrl,
-    codemirrorVersion,
   };
 };
 
 const getEnvVars = (/** @type {boolean} */ devMode) => {
-  const { appVersion, sdkVersion, gitCommit, repoUrl, docsBaseUrl, codemirrorVersion } =
-    getVars(devMode);
+  const { appVersion, sdkVersion, gitCommit, repoUrl, docsBaseUrl } = getVars(devMode);
   return {
     'process.env.VERSION': `"${appVersion || ''}"`,
     'process.env.SDK_VERSION': `"${sdkVersion || ''}"`,
     'process.env.GIT_COMMIT': `"${gitCommit || ''}"`,
     'process.env.REPO_URL': `"${repoUrl || ''}"`,
     'process.env.DOCS_BASE_URL': `"${docsBaseUrl}"`,
     'process.env.CI': `${process.env.CI || false}`,
-    'process.env.codemirrorVersion': `"${codemirrorVersion}"`,
     define: 'undefined', // prevent using AMD (e.g. in lz-string),
   };
 };

scripts/utils.js

@@ -2,7 +2,7 @@
 import type TS from 'typescript';
 import type { Compilers, Config, CompileOptions, EditorLibrary, Language } from '../models';
 import { languages, processors } from '../languages';
-import { comlinkBaseUrl, vendorsBaseUrl } from '../vendors';
+import { codeMirrorBaseUrl, comlinkBaseUrl, vendorsBaseUrl } from '../vendors';
 import { doOnce, objectFilter } from '../utils/utils';
 import { getCompilerOptions } from '../editor/ts-compiler-options';
 import type { LanguageOrProcessor, CompilerMessage, CompilerMessageEvent } from './models';
@@ -266,9 +266,7 @@ const initCodemirrorTS = doOnce(async () => {
   await loadTypeScript();
   importScripts(comlinkBaseUrl + 'umd/comlink.js');
   importScripts(typescriptVfsUrl);
-  importScripts(
-    `${baseUrl}vendor/codemirror/${process.env.codemirrorVersion}/codemirror-ts.worker.js`,
-  );
+  importScripts(codeMirrorBaseUrl + 'codemirror-ts.worker.js');
   const { createWorker } = worker.CodemirrorTsWorker;
   const { createDefaultMapFromCDN, createSystem, createVirtualTypeScriptEnvironment } =
     worker.typescriptVFS;