mirror of
https://github.com/BookStackApp/BookStack.git
synced 2026-05-04 18:08:46 +03:00
Maintenance: Updated NPM packages (#6090)
* Maintenance: Updated NPM packages Includes typescript update to 6. Needed to update some typescript config to align with actual module environment used and built by esbuild. * Maintenance: Fixed testing issues after NPM dep version changes * Maintenance: Updated JS test workflow step version * Maintenance: Updated approach used for TS config in jest config
This commit is contained in:
2
.github/workflows/test-js.yml
vendored
2
.github/workflows/test-js.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
||||
if: ${{ github.ref != 'refs/heads/l10n_development' }}
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Install NPM deps
|
||||
run: npm ci
|
||||
|
||||
@@ -5,7 +5,15 @@
|
||||
|
||||
import type {Config} from 'jest';
|
||||
import {pathsToModuleNameMapper} from "ts-jest";
|
||||
import { compilerOptions } from './tsconfig.json';
|
||||
import fs from "node:fs";
|
||||
|
||||
const { compilerOptions } = JSON.parse(fs.readFileSync('./tsconfig.json', 'utf8'));
|
||||
const compilerPaths = compilerOptions.paths as Record<string, string[]>;
|
||||
const cleanedPaths: Record<string, string[]> = {};
|
||||
Object.keys(compilerPaths).forEach((key) => {
|
||||
const paths = compilerPaths[key];
|
||||
cleanedPaths[key] = paths.map(p => p.replace('./', ''));
|
||||
});
|
||||
|
||||
const config: Config = {
|
||||
// All imported modules in your tests should be mocked automatically
|
||||
@@ -98,7 +106,7 @@ const config: Config = {
|
||||
// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
|
||||
moduleNameMapper: {
|
||||
'lexical/shared/invariant': 'resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant',
|
||||
...pathsToModuleNameMapper(compilerOptions.paths),
|
||||
...pathsToModuleNameMapper(cleanedPaths),
|
||||
},
|
||||
|
||||
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
|
||||
@@ -111,7 +119,7 @@ const config: Config = {
|
||||
// notifyMode: "failure-change",
|
||||
|
||||
// A preset that is used as a base for Jest's configuration
|
||||
// preset: undefined,
|
||||
preset: 'ts-jest',
|
||||
|
||||
// Run tests from one or more projects
|
||||
// projects: undefined,
|
||||
|
||||
1279
package-lock.json
generated
1279
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@@ -20,22 +20,23 @@
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@lezer/generator": "^1.8.0",
|
||||
"@types/jest": "^30.0.0",
|
||||
"@types/markdown-it": "^14.1.2",
|
||||
"@types/sortablejs": "^1.15.9",
|
||||
"chokidar-cli": "^3.0",
|
||||
"esbuild": "^0.27.3",
|
||||
"eslint": "^10.0.2",
|
||||
"esbuild": "^0.28.0",
|
||||
"eslint": "^10.2.0",
|
||||
"globals": "^17.4.0",
|
||||
"jest": "^30.2.0",
|
||||
"jest-environment-jsdom": "^30.2.0",
|
||||
"jest": "^30.3.0",
|
||||
"jest-environment-jsdom": "^30.3.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"sass": "^1.97.3",
|
||||
"ts-jest": "^29.4.6",
|
||||
"sass": "^1.99.0",
|
||||
"ts-jest": "^29.4.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "5.9.*"
|
||||
"typescript": "6.0.*"
|
||||
},
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "^6.10.2",
|
||||
"@codemirror/commands": "^6.10.3",
|
||||
"@codemirror/lang-css": "^6.3.1",
|
||||
"@codemirror/lang-html": "^6.4.11",
|
||||
"@codemirror/lang-javascript": "^6.2.5",
|
||||
@@ -43,15 +44,14 @@
|
||||
"@codemirror/lang-markdown": "^6.5.0",
|
||||
"@codemirror/lang-php": "^6.0.2",
|
||||
"@codemirror/lang-xml": "^6.1.0",
|
||||
"@codemirror/language": "^6.12.2",
|
||||
"@codemirror/language": "^6.12.3",
|
||||
"@codemirror/legacy-modes": "^6.5.2",
|
||||
"@codemirror/state": "^6.5.4",
|
||||
"@codemirror/state": "^6.6.0",
|
||||
"@codemirror/theme-one-dark": "^6.1.3",
|
||||
"@codemirror/view": "^6.39.16",
|
||||
"@codemirror/view": "^6.41.0",
|
||||
"@lezer/highlight": "^1.2.3",
|
||||
"@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
|
||||
"@ssddanbrown/codemirror-lang-twig": "^1.0.0",
|
||||
"@types/jest": "^30.0.0",
|
||||
"codemirror": "^6.0.2",
|
||||
"idb-keyval": "^6.2.2",
|
||||
"markdown-it": "^14.1.1",
|
||||
|
||||
@@ -2,15 +2,16 @@
|
||||
"include": ["resources/js/**/*"],
|
||||
"exclude": ["resources/js/wysiwyg/lexical/yjs/*"],
|
||||
"compilerOptions": {
|
||||
"target": "es2022",
|
||||
"module": "commonjs",
|
||||
"target": "es2023",
|
||||
"module": "esnext",
|
||||
"moduleResolution": "bundler",
|
||||
"rootDir": "./resources/js/",
|
||||
"baseUrl": "./",
|
||||
"types": ["jest", "node"],
|
||||
"paths": {
|
||||
"@icons/*": ["resources/icons/*"],
|
||||
"lexical": ["resources/js/wysiwyg/lexical/core/index.ts"],
|
||||
"lexical/*": ["resources/js/wysiwyg/lexical/core/*"],
|
||||
"@lexical/*": ["resources/js/wysiwyg/lexical/*"]
|
||||
"@icons/*": ["./resources/icons/*"],
|
||||
"lexical": ["./resources/js/wysiwyg/lexical/core/index.ts"],
|
||||
"lexical/*": ["./resources/js/wysiwyg/lexical/core/*"],
|
||||
"@lexical/*": ["./resources/js/wysiwyg/lexical/*"]
|
||||
},
|
||||
"resolveJsonModule": true,
|
||||
"allowJs": true,
|
||||
|
||||
Reference in New Issue
Block a user