Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ dist
symphony-uitoolkit-*.tgz
icons.stories.js
package-lock.json

yarn-error.log
.yarn/cache
.yarn/install-state.gz
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry=https://registry.npmjs.org
engine-strict=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.8.1
v22.11.0
1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
compressionLevel: mixed
enableGlobalCache: false
nodeLinker: node-modules
npmRegistryServer: "https://registry.yarnpkg.com"
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
"*.{ts,tsx,js,jsx}": "eslint --cache --fix",
"*.{js,css,md}": "prettier --write"
},
"dependencies": {},
"devDependencies": {
"husky": "^8.0.3"
},
"packageManager": "yarn@1.22.11",
"packageManager": "yarn@4.5.1",
"engines": {
"node": ">=14.21.2"
"node": ">=22.14.0"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
3 changes: 2 additions & 1 deletion packages/components/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: 2.1

orbs:
node: circleci/node@5.1.0
node: circleci/node@7.1.0
aws-cli: circleci/aws-cli@2.0

jobs:
Expand All @@ -16,6 +16,7 @@ jobs:
steps:
- attach_workspace:
at: ~/project
- run: sudo corepack enable
- run: yarn
- run: yarn workspace @symphony-ui/uitoolkit-styles build # Build UI-TK Styles because some files from 'dist' folder are used in UI-TK Components
- run: yarn lint
Expand Down
8 changes: 5 additions & 3 deletions packages/components/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { dirname, join } from 'path';
import type { StorybookConfig } from '@storybook/react-webpack5';
import { moduleResolve } from 'import-meta-resolve';

const configuation: StorybookConfig = {
addons: [
Expand Down Expand Up @@ -28,7 +29,7 @@ const configuation: StorybookConfig = {
test: /\.(ts|tsx)$/,
use: [
{
loader: require.resolve('ts-loader'),
loader: moduleResolve('ts-loader', import.meta.url as any).pathname,
},
],
},
Expand All @@ -46,8 +47,9 @@ const configuation: StorybookConfig = {
},
}

module.exports = configuation;
export default configuation;

function getAbsolutePath(value) {
return dirname(require.resolve(join(value, 'package.json')));
const URL = moduleResolve(join(value, 'package.json'), import.meta.url as any);
return dirname(URL.pathname);
}
20 changes: 9 additions & 11 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@
"linkit": "yarn build && cp package.json ./dist && cd ./dist && yarn link && cd .."
},
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0"
},
"engines": {
"node": ">=14.21.2"
"react": ">=17.0.2",
"react-dom": ">=17.0.2"
},
"dependencies": {
"@emotion/cache": "^11.11.0",
Expand All @@ -46,7 +43,7 @@
"emoji-js": "^3.5.0",
"github-markdown-css": "^4.0.0",
"prop-types": "^15.8.1",
"react-resize-detector": "^5.0.3",
"react-resize-detector": "^9.1.0",
"react-select": "^4.3.1",
"react-virtualized": "^9.22.2",
"uuid": "^8.3.2"
Expand Down Expand Up @@ -77,33 +74,34 @@
"@testing-library/react": "^11.2.2",
"@testing-library/user-event": "^12.6.0",
"@types/enzyme": "^3.10.5",
"@types/react": "^16.9.35",
"@types/react-dom": "^16.9.8",
"@types/react": "^17.0.84",
"@types/react-dom": "^17.0.26",
"@types/react-select": "^4.0.17",
"@types/react-virtualized": "^9.21.10",
"@types/styled-components": "5.1.26",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"@vitest/coverage-v8": "^3.1.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"css-loader": "^4.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^8.51.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^2.5.1",
"html-react-parser": "^0.14.0",
"husky": "^8.0.3",
"import-meta-resolve": "^4.1.0",
"lint-staged": "^12.1.2",
"madge": "^6.1.0",
"markdown-loader": "^6.0.0",
"mdx-embed": "^1.1.2",
"prettier": "^2.2.1",
"react": "^16.13.1",
"react": "^17.0.2",
"react-docgen-typescript-loader": "^3.7.2",
"react-docgen-typescript-plugin": "^1.0.5",
"react-dom": "^16.13.1",
"react-dom": "^17.0.2",
"react-hooks-testing-library": "^0.6.0",
"sass": "^1.26.11",
"sass-loader": "^10.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/spec/init/setupTests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '@testing-library/jest-dom';
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

Enzyme.configure({ adapter: new Adapter() });
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ const VirtualizedList: React.FC<ListProps> = ({
rowRenderer,
...rest
}: ListProps) => {
return (
<List
rowCount={rowCount}
rowHeight={rowHeight}
width={width}
height={height}
rowRenderer={rowRenderer}
{...rest}
/>
);
return <List
rowCount={rowCount}
rowHeight={rowHeight}
width={width}
height={height}
rowRenderer={rowRenderer}
{...rest}
/>
}

export default VirtualizedList;
3 changes: 2 additions & 1 deletion packages/styles/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cdn-credentials: &cdn-credentials
aws-region: AWS_REGION_CDN

orbs:
node: circleci/node@5.1.0
node: circleci/node@7.1.0
aws-cli: circleci/aws-cli@2.0
browser-tools: circleci/browser-tools@1.4.8

Expand All @@ -37,6 +37,7 @@ jobs:
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- run: curl -L -O https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.1.jar
- run: sudo corepack enable
- run: yarn
- run: yarn build
- run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
Expand Down
7 changes: 2 additions & 5 deletions packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"scripts": {
"prepare": "cd ../.. && husky install",
"prestart": "yarn icons",
"start": "storybook dev -p 6006 -c .storybook watch-css -s ./src",
"start": "yarn prestart && storybook dev -p 6006 -c .storybook watch-css -s ./src",
"prebuild": "yarn icons && sh src/scripts/generate-cdn.sh",
"build-storybook": "storybook build -c .storybook -o dist/storybook",
"build": "bash ./build.sh",
"build": "yarn prebuild && bash ./build.sh",
"watch": "sass --watch --no-source-map --load-path=node_modules --style compressed uitoolkit.scss:dist/css/uitoolkit.css",
"icons": "node src/scripts/generate-icons",
"test": "yarn creevey"
Expand All @@ -25,9 +25,6 @@
],
"author": "",
"license": "ISC",
"engines": {
"node": ">=14.21.2"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.10.4",
"@babel/preset-env": "^7.23.2",
Expand Down
Loading