From 7bfe261ac63876eb9c6b200ff18c24861ecb6879 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 18 May 2025 00:20:43 +0300 Subject: [PATCH] refactor(highlightjs): move dependency --- apps/desktop/package.json | 3 +-- apps/server/package.json | 3 +-- apps/server/src/routes/assets.ts | 2 -- apps/server/webpack.config.cjs | 1 - packages/highlightjs/package.json | 4 +++- pnpm-lock.yaml | 24 +++++++++++------------- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index d0ff256c3..71b61fcce 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -11,8 +11,7 @@ "electron-dl": "4.0.0", "electron-squirrel-startup": "1.0.1", "jquery.fancytree": "2.38.5", - "jquery-hotkeys": "0.2.2", - "@highlightjs/cdn-assets": "11.11.1" + "jquery-hotkeys": "0.2.2" }, "devDependencies": { "@types/electron-squirrel-startup": "1.0.2", diff --git a/apps/server/package.json b/apps/server/package.json index 62c7a9c30..4f09cccb3 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -6,8 +6,7 @@ "dependencies": { "better-sqlite3": "11.10.0", "jquery.fancytree": "2.38.5", - "jquery-hotkeys": "0.2.2", - "@highlightjs/cdn-assets": "11.11.1" + "jquery-hotkeys": "0.2.2" }, "devDependencies": { "@electron/remote": "2.1.2", diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index d41b4a4a9..8b8c85f3b 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -90,8 +90,6 @@ async function register(app: express.Application) { app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(nodeModulesDir, "normalize.css/"))); app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery.fancytree/dist/"))); - - app.use(`/${assetPath}/node_modules/@highlightjs/cdn-assets/`, persistentCacheStatic(path.join(nodeModulesDir, "@highlightjs/cdn-assets/"))); } export default { diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index cd5b54994..d93354438 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -22,7 +22,6 @@ function buildFilesToCopy() { "autocomplete.js/dist", "normalize.css/normalize.css", "jquery.fancytree/dist", - "@highlightjs/cdn-assets", // Required as they are native dependencies and cannot be well bundled. "better-sqlite3", diff --git a/packages/highlightjs/package.json b/packages/highlightjs/package.json index f474df945..ec07642fa 100644 --- a/packages/highlightjs/package.json +++ b/packages/highlightjs/package.json @@ -18,5 +18,7 @@ "nx": { "name": "highlightjs" }, - "dependencies": {} + "dependencies": { + "highlight.js": "11.11.1" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb47a0782..6b857fe13 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -340,9 +340,6 @@ importers: '@electron/remote': specifier: 2.1.2 version: 2.1.2(electron@36.2.1) - '@highlightjs/cdn-assets': - specifier: 11.11.1 - version: 11.11.1 better-sqlite3: specifier: ^11.9.1 version: 11.10.0 @@ -457,9 +454,6 @@ importers: apps/server: dependencies: - '@highlightjs/cdn-assets': - specifier: 11.11.1 - version: 11.11.1 better-sqlite3: specifier: 11.10.0 version: 11.10.0 @@ -1287,7 +1281,11 @@ importers: specifier: ^2.3.0 version: 2.8.1 - packages/highlightjs: {} + packages/highlightjs: + dependencies: + highlight.js: + specifier: 11.11.1 + version: 11.11.1 packages/turndown-plugin-gfm: dependencies: @@ -3371,10 +3369,6 @@ packages: '@hapi/topo@5.1.0': resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} - '@highlightjs/cdn-assets@11.11.1': - resolution: {integrity: sha512-VEPdHzwelZ12hEX18BHduqxMZGolcUsrbeokHYxOUIm8X2+M7nx5QPtPeQgRxR9XjhdLv4/7DD5BWOlSrJ3k7Q==} - engines: {node: '>=12.0.0'} - '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -8748,6 +8742,10 @@ packages: resolution: {integrity: sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==} engines: {node: '>=18.0.0'} + highlight.js@11.11.1: + resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==} + engines: {node: '>=12.0.0'} + history@4.10.1: resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==} @@ -17076,8 +17074,6 @@ snapshots: dependencies: '@hapi/hoek': 9.3.0 - '@highlightjs/cdn-assets@11.11.1': {} - '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.6': @@ -23998,6 +23994,8 @@ snapshots: helmet@8.1.0: {} + highlight.js@11.11.1: {} + history@4.10.1: dependencies: '@babel/runtime': 7.27.0