diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2082b926..1a3dcb74 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -157,9 +157,8 @@ jobs: strategy: fail-fast: false matrix: - #node-version: ['latest', '22.x', '20.x'] - node-version: ["22.x", "20.x"] - os: [ubuntu-latest, windows-latest, macos-latest] + node-version: ["22.x"] + os: [ubuntu-latest, windows-2022, macos-latest] runs-on: ${{ matrix.os }} diff --git a/Kadabra-JS/package.json b/Kadabra-JS/package.json index 4b15353c..d511beb2 100644 --- a/Kadabra-JS/package.json +++ b/Kadabra-JS/package.json @@ -69,7 +69,7 @@ "eslint-config-prettier": "^10.1.8", "eslint-plugin-jest": "^29.12.1", "eslint-plugin-tsdoc": "^0.5.0", - "jest": "^30.2.0", + "jest": "~30.3.0", "node-notifier": "^10.0.1", "ts-jest": "^29.4.6", "typescript": "^5.9.3", diff --git a/Kadabra-JS/src-api/jest.config.js b/Kadabra-JS/src-api/jest.config.js index 55488e9e..4a344f8e 100644 --- a/Kadabra-JS/src-api/jest.config.js +++ b/Kadabra-JS/src-api/jest.config.js @@ -2,15 +2,22 @@ import { weaverConfig } from "../code/WeaverConfiguration.js"; const config = { preset: "ts-jest/presets/default-esm", + testEnvironment: "@specs-feup/lara/jest/jestEnvironment.js", + globalSetup: "@specs-feup/lara/jest/jestGlobalSetup.js", globalTeardown: "@specs-feup/lara/jest/jestGlobalTeardown.js", + setupFiles: ["@specs-feup/lara/jest/setupFiles/sharedJavaModule.js"], setupFilesAfterEnv: ["@specs-feup/lara/jest/setupFiles/importSideEffects.js"], + moduleNameMapper: { - "@specs-feup/kadabra/api/(.+).js": "@specs-feup/kadabra/src-api/$1", - "(.+)\\.js": "$1", + "^@specs-feup/kadabra/api/(.+)\\.js$": "/$1", + "^@specs-feup/lara/jest/WeaverLegacyTester\\.js$": + "@specs-feup/lara/jest/WeaverLegacyTester.ts", + "^(\\.{1,2}/.*)\\.js$": "$1", }, + testEnvironmentOptions: { weaverConfig, }, diff --git a/Kadabra-JS/src-code/WeaverConfiguration.ts b/Kadabra-JS/src-code/WeaverConfiguration.ts index 44a8d96e..3542de88 100644 --- a/Kadabra-JS/src-code/WeaverConfiguration.ts +++ b/Kadabra-JS/src-code/WeaverConfiguration.ts @@ -8,8 +8,9 @@ export const weaverConfig: WeaverConfiguration = { weaverFileName: "@specs-feup/lara/code/Weaver.js", jarPath: path.join( path.dirname(path.dirname(fileURLToPath(import.meta.url))), - "./java-binaries/" + "./java-binaries/", ), javaWeaverQualifiedName: "weaver.kadabra.JavaWeaver", - importForSideEffects: ["@specs-feup/kadabra/api/Joinpoints.js"], + //importForSideEffects: ["@specs-feup/kadabra/api/Joinpoints.js"], + importForSideEffects: [new URL("../api/Joinpoints.js", import.meta.url).href], };