Skip to content

Commit bc0b0f4

Browse files
committed
PR Changes
1 parent 6fd3b06 commit bc0b0f4

File tree

6 files changed

+77
-67
lines changed

6 files changed

+77
-67
lines changed

config/jestsetup.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import contentLoaderSerializer from '@shared/tests/serializer/content-loader-serializer.js';
2-
import jssSerializer from '@shared/tests/serializer/jss-snapshot-serializer';
1+
import contentLoaderSerializer from '@shared/tests/serializer/content-loader-serializer.cjs';
2+
import jssSerializer from '@shared/tests/serializer/jss-snapshot-serializer.cjs';
33
import '@testing-library/jest-dom';
44
import Enzyme from 'enzyme';
55
import Adapter from 'enzyme-adapter-react-16';
@@ -27,11 +27,17 @@ expect.addSnapshotSerializer(
2727
createSerializer({
2828
map: (el) => {
2929
// @ts-ignore
30-
el.node && el.node.attribs && el.node.attribs.theme && delete el.node.attribs.theme;
30+
el.node &&
31+
el.node.attribs &&
32+
el.node.attribs.theme &&
33+
delete el.node.attribs.theme;
3134
// @ts-ignore
32-
el.node && el.node.attribs && el.node.attribs.classes && delete el.node.attribs.classes;
35+
el.node &&
36+
el.node.attribs &&
37+
el.node.attribs.classes &&
38+
delete el.node.attribs.classes;
3339
return el;
34-
}
40+
},
3541
})
3642
);
3743
expect.addSnapshotSerializer(jssSerializer);
@@ -48,8 +54,8 @@ export const setupMatchMedia = () => {
4854
removeListener: jest.fn(), // deprecated
4955
addEventListener: jest.fn(),
5056
removeEventListener: jest.fn(),
51-
dispatchEvent: jest.fn()
52-
}))
57+
dispatchEvent: jest.fn(),
58+
})),
5359
});
5460
};
5561

packages/base/scripts/cssVariables/parse.js

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
const { writeFileSync } = require('fs');
2+
const {
3+
root: ThemingParameters,
4+
} = require('@sap-theming/theming-base-content/content/Base/baseLib/sap_fiori_3/variables.json');
5+
const PATHS = require('../config/paths');
6+
const path = require('path');
7+
const prettier = require('prettier');
8+
const prettierConfig = require('../prettier.config');
9+
10+
let fileContent = `/* eslint-disable camelcase */
11+
12+
/*
13+
* ### WARNING ###
14+
* This is an autogenerated file, do not change manually.
15+
* In order to recreate this file, please run 'node scripts/generate-theming-parameters.js'
16+
*/
17+
18+
`;
19+
20+
fileContent += 'export const ThemingParameters = {\n';
21+
for (const variable in ThemingParameters) {
22+
fileContent += ` '${variable}': 'var(--${variable})',\n`;
23+
}
24+
fileContent += '}\n';
25+
26+
writeFileSync(
27+
path.join(PATHS.packages, 'base', 'src', 'styling', 'ThemingParameters.ts'),
28+
prettier.format(fileContent, { ...prettierConfig, parser: 'typescript' })
29+
);
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
module.exports = {
2+
test(value) {
3+
return (value && typeof value === 'string' && /url\(/.test(value)) || /-aria$/.test(value) || /-diff$/.test(value);
4+
},
5+
6+
print(value, serialize) {
7+
if (/-aria$/.test(value)) {
8+
value = 'TITLE_ARIA_ID';
9+
}
10+
11+
value = value.replace(/url\((.*)\)/, 'STYLE-URL');
12+
13+
if (/-diff$/.test(value)) {
14+
value = 'DIFF_ID';
15+
}
16+
17+
return serialize(value);
18+
}
19+
};

shared/tests/serializer/content-loader-serializer.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

shared/tests/serializer/jss-snapshot-serializer.js renamed to shared/tests/serializer/jss-snapshot-serializer.cjs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,23 @@ const replaceJssClassNames = (elements) => {
5252
});
5353
};
5454

55-
export function test(value) {
56-
// apply the serializer only to react elements that we haven't marked(processed) before
57-
return value && !value[MARKER] && value.$$typeof === Symbol.for('react.test.json');
58-
}
55+
module.exports = {
56+
test(value) {
57+
// apply the serializer only to react elements that we haven't marked(processed) before
58+
return value && !value[MARKER] && value.$$typeof === Symbol.for('react.test.json');
59+
},
5960

60-
export function print(value, serialize) {
61-
// collect all react element nodes in the tree of the value
62-
const elements = collectElements(value);
61+
print(value, serialize) {
62+
// collect all react element nodes in the tree of the value
63+
const elements = collectElements(value);
6364

64-
// mark the collected element nodes to avoid processing them several times
65-
markElements(elements);
65+
// mark the collected element nodes to avoid processing them several times
66+
markElements(elements);
6667

67-
// remove the non-deterministic part from the JSS class names
68-
// to keep the snapshots repeatable
69-
replaceJssClassNames(elements);
68+
// remove the non-deterministic part from the JSS class names
69+
// to keep the snapshots repeatable
70+
replaceJssClassNames(elements);
7071

71-
return serialize(value);
72-
}
72+
return serialize(value);
73+
}
74+
};

0 commit comments

Comments
 (0)