Skip to content

Commit eb946dd

Browse files
committed
feat(popover): second test to fix broken build
Signed-off-by: aurore.stagnol <[email protected]>
1 parent dfdf38b commit eb946dd

File tree

7 files changed

+14
-36
lines changed

7 files changed

+14
-36
lines changed

packages/libraries/core/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
"@ovhcloud/ods-cdk": "^11.0.1"
2323
},
2424
"peerDependencies": {
25-
"@ovhcloud/ods-cdk": "^11.0.1",
2625
"@ovhcloud/ods-theming": ">=2"
2726
},
2827
"devDependencies": {
29-
"@ovhcloud/ods-cdk": "^11.0.1",
3028
"@ovhcloud/ods-library-dev": "^11.0.1",
3129
"@ovhcloud/ods-theming": "^11.0.1"
3230
},

packages/libraries/core/tsconfig.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"compilerOptions": {
44
"declaration": true,
55
"paths": {
6-
"@ovhcloud/ods-theming": ["./packages/libraries/theming/src/index"],
7-
"@ovhcloud/ods-cdk": ["./packages/libraries/cdk/src/index"]
6+
"@ovhcloud/ods-theming": ["./packages/libraries/theming/src/index"]
87
}
98
},
109
"include": [

packages/libraries/theming/size/ods-size-definitions.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@import './ods-theming-size.divider';
88
@import './ods-theming-size.icon';
99
@import './ods-theming-size.input';
10+
@import './ods-theming-size.popover.scss';
1011
@import './ods-theming-size.radio-button';
1112
@import './ods-theming-size.range';
1213
@import './ods-theming-size.skeleton';
@@ -41,4 +42,3 @@ $ods-size-definitions: (
4142
@function ods-get-size-definitions() {
4243
@return $ods-size-definitions;
4344
}
44-
@import './ods-theming-size.popover.scss';@import './ods-theming-size.popover.scss';

packages/stencil/components/libraries/stencil-core/src/stencilConfig.js

+8-27
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import { vueOutputTarget } from '@stencil/vue-output-target';
6767
* @param prod - production specific options to set
6868
*/
6969
export function getStencilConfig({ namespace, args, jestConfig, distCustomElements, distCustomElementsBundle, reactOutput, vueOutput, dev, prod }) {
70-
const isCi = args.some((arg) => arg.match(/(--|:)ci/g)),
70+
const isCi = args.some((arg) => arg.match(/(--|:)ci/g)),
7171
/**
7272
* stencil doc:
7373
* ```
@@ -76,7 +76,7 @@ export function getStencilConfig({ namespace, args, jestConfig, distCustomElemen
7676
* ```
7777
* @see https://stenciljs.com/docs/cli
7878
*/
79-
isDev = args.includes('--dev'),
79+
isDev = args.includes('--dev'),
8080
/**
8181
* stencil doc:
8282
* ```
@@ -92,28 +92,11 @@ export function getStencilConfig({ namespace, args, jestConfig, distCustomElemen
9292
jestConfig = args.includes('test') ? jestConfig : undefined;
9393
let convertedJestConfig = {};
9494
if (jestConfig) {
95-
convertedJestConfig = Object.assign(Object.assign({}, jestConfig), {
96-
// preset: "../../../../node_modules/jest-puppeteer",
97-
// transform: { "^.+\\.(js|ts|tsx)$": "<rootDir>/../../../../node_modules/@stencil/core/testing/jest-preprocessor.js" },
98-
// testEnvironment: "<rootDir>/../../../../node_modules/@stencil/core/testing/jest-environment.js"
99-
// incompatible props
100-
bail: undefined, restoreMocks: undefined, transform: jestConfig.transform,
101-
// adaptations
102-
testRegex: jestConfig.testRegex, globalSetup: jestConfig.globalSetup === null ? undefined : jestConfig.globalSetup, globalTeardown: jestConfig.globalTeardown === null ? undefined : jestConfig.globalTeardown, prettierPath: jestConfig.prettierPath === null ? undefined : jestConfig.prettierPath, resolver: jestConfig.resolver === null ? undefined : jestConfig.resolver,
103-
// force erase preset
104-
preset: undefined
105-
});
106-
// warning incompatible props
107-
Object.keys(jestConfig)
108-
.filter(k => ['bail', 'restoreMocks', 'transform'].some(p => p === k))
109-
.forEach((k) => {
110-
if (!(jestConfig === null || jestConfig === void 0 ? void 0 : jestConfig[k])) {
111-
throw new Error(`[getStencilConfig] incompatible property from jest config not integrated into jest stencil. property=${k}`);
112-
}
113-
});
114-
if (jestConfig.preset) {
115-
console.warn(`[ WARN ] [getStencilConfig] ignoring property from jest config not integrated into jest stencil. property=preset`);
116-
}
95+
convertedJestConfig = {
96+
verbose: jestConfig.verbose,
97+
testRegex: jestConfig.testRegex,
98+
moduleNameMapper: jestConfig.moduleNameMapper,
99+
};
117100
}
118101
// manage copy task with custom-element package.json if needed (prod)
119102
let distCustomElementsCopy = [];
@@ -200,9 +183,7 @@ export function getStencilConfig({ namespace, args, jestConfig, distCustomElemen
200183
};
201184
return [output];
202185
})() : []),
203-
] }), globalScriptOption), { devServer: {
204-
startupTimeout: 30000
205-
}, testing: Object.assign(Object.assign(Object.assign({}, (jestConfig ? convertedJestConfig : {})), { browserHeadless: false, browserSlowMo: 2000 }), (isCi ? {
186+
] }), globalScriptOption), { testing: Object.assign(Object.assign(Object.assign({}, (jestConfig ? convertedJestConfig : {})), { browserHeadless: false, browserSlowMo: 2000 }), (isCi ? {
206187
browserHeadless: true,
207188
browserSlowMo: 0,
208189
/**

packages/stencil/libraries/stencil-testing/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
},
2424
"devDependencies": {
2525
"@ovhcloud/ods-core": "^11.0.1",
26+
"@ovhcloud/ods-testing": "^11.0.1",
2627
"@stencil/core": "~2.18.1",
2728
"typescript": "4.7.4"
2829
},
29-
"dependencies": {
30-
"@ovhcloud/ods-testing": "^11.0.1"
31-
},
3230
"publishConfig": {
3331
"registry": ""
3432
}

packages/stencil/libraries/stencil-testing/tsconfig.json

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"compilerOptions": {
44
"declaration": true
55
},
6+
"paths": {
7+
"@ovhcloud/ods-testing": ["./packages/libraries/testing/src/index"]
8+
},
69
"include": [
710
"src"
811
]

yarn.lock

-1
Original file line numberDiff line numberDiff line change
@@ -5438,7 +5438,6 @@ __metadata:
54385438
"@ovhcloud/ods-library-dev": ^11.0.1
54395439
"@ovhcloud/ods-theming": ^11.0.1
54405440
peerDependencies:
5441-
"@ovhcloud/ods-cdk": ^11.0.1
54425441
"@ovhcloud/ods-theming": ">=2"
54435442
languageName: unknown
54445443
linkType: soft

0 commit comments

Comments
 (0)