Skip to content

Commit

Permalink
Merge branch 'main' into 2221-add-a-label-for-component-version
Browse files Browse the repository at this point in the history
  • Loading branch information
imagoiq authored Nov 30, 2023
2 parents 547be0a + dd41e0e commit a50c8aa
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 24 deletions.
1 change: 1 addition & 0 deletions packages/components/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ www
cypress
stencil.config.ts
cypress.config.js
jest.config.js
.eslintrc.js
4 changes: 2 additions & 2 deletions packages/components/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
module.exports = {
preset: '@stencil/core/testing',
testEnvironment: 'node',
preset: 'ts-jest',
testEnvironment: 'jsdom',
};
3 changes: 1 addition & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"devDependencies": {
"@percy/cli": "1.27.4",
"@percy/cypress": "3.1.2",
"@stencil-community/eslint-plugin": "0.7.1",
"@stencil/core": "4.7.2",
"@stencil-community/eslint-plugin": "0.7.1",
"@stencil/react-output-target": "0.5.3",
"@stencil/sass": "3.0.7",
"@types/jest": "27.5.2",
Expand All @@ -60,7 +60,6 @@
"eslint-plugin-react": "7.33.2",
"jest": "27.5.1",
"jest-cli": "27.5.1",
"jest-environment-node": "27.5.1",
"npm-run-all": "4.1.5",
"rimraf": "5.0.5",
"sass": "1.69.5",
Expand Down
34 changes: 14 additions & 20 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a50c8aa

Please sign in to comment.