diff --git a/packages/volto/__tests__/create-addons-loader.test.js b/packages/volto/__tests__/create-addons-loader.test.js index 770987a8c8..1813fc1b44 100644 --- a/packages/volto/__tests__/create-addons-loader.test.js +++ b/packages/volto/__tests__/create-addons-loader.test.js @@ -5,7 +5,7 @@ import { getAddonsLoaderCode, nameFromPackage, } from '@plone/registry/create-addons-loader'; -import { describe, expect } from 'vitest'; +import jiti from 'jiti'; describe('create-addons-loader code generation', () => { test('no addon creates simple loader, default = no loadProjectConfig', () => { @@ -166,9 +166,10 @@ describe('create-addons-loader default name generation', () => { }); }); +const _import = jiti(import.meta.url, { esmResolve: true }); + function transpile(fpath) { const code = fs.readFileSync(fpath, 'utf-8'); - // console.log('original code', code); const output = transform(code, { root: '.', plugins: ['@babel/plugin-transform-modules-commonjs'], @@ -179,18 +180,18 @@ function transpile(fpath) { function makeAddonLoader(addons, load = true) { addons = addons.map((name) => name.includes(':') - ? `${require.resolve(name.split(':')[0])}:${name.substring( + ? `${_import.resolve(name.split(':')[0])}:${name.substring( name.indexOf(':') + 1, name.length, )}` - : require.resolve(name), + : _import.resolve(name), ); const loaderPath = createAddonsLoader(addons); transpile(loaderPath); if (load) { - return require(loaderPath).default; + return _import(loaderPath).default; } else { return loaderPath; } diff --git a/packages/volto/__tests__/volto-slate/deserialize.test.js b/packages/volto/__tests__/volto-slate/deserialize.test.js index 7e482a40d5..db0125d46c 100644 --- a/packages/volto/__tests__/volto-slate/deserialize.test.js +++ b/packages/volto/__tests__/volto-slate/deserialize.test.js @@ -4,7 +4,8 @@ import { deserialize } from '@plone/volto-slate/editor/deserialize'; import * as htmlUtils from '@plone/volto-slate/editor/utils'; import { makeEditor } from '@plone/volto-slate/utils/editor'; import installSlate from '@plone/volto-slate/index'; -import { it, describe, expect } from 'vitest'; + +vi.mock('@plone/volto-slate/editor/less/editor.less', () => ({})); const tojson = (html) => { const parsed = new JSDOM(html); diff --git a/packages/volto/package.json b/packages/volto/package.json index 2f9717ca39..0eaec62bbb 100644 --- a/packages/volto/package.json +++ b/packages/volto/package.json @@ -352,6 +352,7 @@ "jest": "26.6.3", "jest-environment-jsdom": "^26", "jest-file": "1.0.0", + "jiti": "^2.4.2", "jsdom": "^16.7.0", "jsonwebtoken": "9.0.0", "less": "3.11.1", diff --git a/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/SelectFacet.test.jsx.snap b/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/SelectFacet.test.jsx.snap index b4ddcda442..c97ebf8906 100644 --- a/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/SelectFacet.test.jsx.snap +++ b/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/SelectFacet.test.jsx.snap @@ -15,7 +15,7 @@ exports[`SelectFacet > renders a facet component with select dropdown 1`] = ` class="react-select__control css-1i6qwov-control" >