Skip to content

Commit

Permalink
Merge branch 'feature/lint9'
Browse files Browse the repository at this point in the history
  • Loading branch information
arietrouw committed Aug 6, 2024
2 parents 4256c3c + da35e7c commit e69b4f5
Show file tree
Hide file tree
Showing 1,428 changed files with 12,518 additions and 16,423 deletions.
49 changes: 0 additions & 49 deletions .eslintrc.cjs

This file was deleted.

74 changes: 5 additions & 69 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,77 +1,13 @@
// .storybook/main.ts

// Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-webpack5)
import type { StorybookConfig } from '@storybook/react-webpack5';
import { NormalModuleReplacementPlugin } from 'webpack';
import type { StorybookConfig } from '@storybook/react-vite';
import path from 'path';

const config: StorybookConfig = {
stories: [
'../packages/modules/packages/**/src/**/*.stories.@(ts|tsx)',
'../packages/plugins/packages/**/src/**/*.stories.@(ts|tsx)',
'../packages/sdk/packages/**/src/**/*.stories.@(ts|tsx)'
],
stories: ['../**/src/**/*.mdx', '../**/src/**/*.stories.@(ts|tsx|js|jsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'storybook-dark-mode',
'@storybook/addon-interactions',
],
typescript: {
check: true,
checkOptions: {},
reactDocgen: 'react-docgen-typescript',
reactDocgenTypescriptOptions: {
shouldExtractLiteralValuesFromEnum: true,
propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
},
},
features: { legacyMdx1: true },
framework: {
name: '@storybook/react-webpack5',
options: {

},
},
core: {
disableTelemetry: true,
},
docs: {
autodocs: 'tag',
},
/*refs: {
'design-system': {
title: 'Storybook Design System',
url: 'https://5ccbc373887ca40020446347-yldsqjoxzb.chromatic.com',
},
},*/
webpackFinal: async (config, { configType }) => {
config.plugins = config.plugins ?? []
config.plugins.push(
// Remove node: from import specifiers, because Next.js does not yet support node: scheme
// https://github.com/vercel/next.js/issues/28774
new NormalModuleReplacementPlugin(
/^node:/,
(resource) => {
resource.request = resource.request.replace(/^node:/, '');
},
)
);

/**
* Configure webpack to allow using .js extension for typescript file imports.
*
* Source - https://github.com/storybookjs/storybook/issues/11587#issuecomment-1374816054
* Webpack Reference - https://webpack.js.org/configuration/resolve/#resolveextensionalias
*/
const resolve = config?.resolve
if (resolve) {
resolve.extensionAlias = {
".js": [".tsx", ".ts", ".js"],
};
}

return config;
},
framework: '@storybook/react-vite'
};

export default config;
export default config;
13 changes: 0 additions & 13 deletions .storybook/manager.ts

This file was deleted.

2 changes: 1 addition & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Lexend+Deca:wght@100;200;300;400;500;600;700;800&display=swap"
rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@300;400;500;600;700&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@300;400;500;600;700&display=swap" rel="stylesheet">
3 changes: 0 additions & 3 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { CssBaseline } from '@mui/material';
import { Decorator } from '@storybook/react';
import { FlexCol } from '@xylabs/react-flexbox';
import { InvertibleCssVarsProvider, InvertibleThemeProvider } from '@xylabs/react-invertible-theme';
import { AppSettingsProvider } from '@xyo-network/react-app-settings';
import { appThemeOptions, osThemeOptions, themeOptions, webThemeOptions } from '@xyo-network/react-theme';
import React from 'react';
import { useDarkMode } from 'storybook-dark-mode';
Expand Down Expand Up @@ -58,7 +57,6 @@ const withThemeProvider: Decorator = (Story, context) => {
const themeOptions = getTheme(context.globals.theme)

return (
<AppSettingsProvider value={{darkMode}}>
<InvertibleThemeProvider dark={darkMode} options={themeOptions}>
<InvertibleCssVarsProvider defaultMode={darkMode ? 'dark' : 'light'}>
<CssBaseline enableColorScheme />
Expand All @@ -67,7 +65,6 @@ const withThemeProvider: Decorator = (Story, context) => {
</FlexCol>
</InvertibleCssVarsProvider>
</InvertibleThemeProvider>
</AppSettingsProvider>
);
};

Expand Down
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v3"

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
5 changes: 0 additions & 5 deletions babel.config.json

This file was deleted.

16 changes: 16 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// eslint.config.mjs

import { config as xylabsConfig } from '@xylabs/eslint-config-react-flat'

export default [
{
ignores: ['.yarn/**', 'jest.config.cjs', '**/dist/**', 'dist', 'build/**', 'node_modules/**', 'public', 'storybook-static', '.storybook'],
},
...xylabsConfig,
{
rules: {
'@typescript-eslint/no-misused-promises': ['off'],
'@eslint-react/no-array-index-key': ['off'],
},
},
]
97 changes: 53 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"packages/**/*"
],
"dependencies": {
"@mui/icons-material": "^5.16.5",
"@mui/material": "^5.16.5",
"@mui/styles": "^5.16.5",
"@mui/icons-material": "^5.16.6",
"@mui/material": "^5.16.6",
"@mui/styles": "^5.16.6",
"@xyo-network/react-modules": "workspace:^",
"@xyo-network/react-plugins": "workspace:^",
"@xyo-network/react-sdk": "workspace:^",
"axios": "^1.7.2",
"axios": "^1.7.3",
"geojson": "^0.5.0",
"mapbox-gl": "^3.5.2",
"react": "^18.3.1",
Expand All @@ -31,63 +31,71 @@
},
"description": "Common React library for all XYO projects that use React",
"devDependencies": {
"@babel/core": "^7.24.9",
"@babel/preset-env": "^7.24.8",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/core": "^7.25.2",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.5",
"@mui/material": "^5.16.5",
"@mui/styles": "^5.16.5",
"@storybook/addon-actions": "^7.6.20",
"@storybook/addon-controls": "^7.6.20",
"@storybook/addon-essentials": "^7.6.20",
"@storybook/addon-interactions": "^7.6.20",
"@storybook/addon-links": "^7.6.20",
"@storybook/addon-viewport": "^7.6.20",
"@storybook/addons": "7.6.20",
"@storybook/api": "7.6.20",
"@storybook/builder-webpack5": "^7.6.20",
"@storybook/components": "^7.6.20",
"@storybook/core-events": "^7.6.20",
"@eslint-react/eslint-plugin": "^1.9.0",
"@mui/icons-material": "^5.16.6",
"@mui/material": "^5.16.6",
"@mui/styles": "^5.16.6",
"@storybook/addon-actions": "^8.2.7",
"@storybook/addon-controls": "^8.2.7",
"@storybook/addon-essentials": "^8.2.7",
"@storybook/addon-interactions": "^8.2.7",
"@storybook/addon-links": "^8.2.7",
"@storybook/addon-viewport": "^8.2.7",
"@storybook/builder-webpack5": "^8.2.7",
"@storybook/components": "^8.2.7",
"@storybook/core-events": "^8.2.7",
"@storybook/mdx1-csf": "^1.0.0",
"@storybook/react": "^7.6.20",
"@storybook/react-webpack5": "^7.6.20",
"@storybook/react": "^8.2.7",
"@storybook/react-vite": "^8.2.7",
"@storybook/testing-library": "^0.2.2",
"@storybook/theming": "^7.6.20",
"@xylabs/eslint-config": "^3.12.4",
"@xylabs/eslint-config-react": "^3.12.4",
"@storybook/theming": "^8.2.7",
"@stylistic/eslint-plugin": "^2.6.1",
"@typescript-eslint/eslint-plugin": "^8.0.1",
"@typescript-eslint/parser": "^8.0.1",
"@xylabs/eslint-config": "^3.15.16",
"@xylabs/eslint-config-flat": "^3.15.16",
"@xylabs/eslint-config-react-flat": "^3.15.16",
"@xylabs/pixel": "^1.6.0",
"@xylabs/react-button": "^3.4.1",
"@xylabs/react-flexbox": "^3.4.1",
"@xylabs/react-invertible-theme": "^3.4.1",
"@xylabs/react-pixel": "^3.4.1",
"@xylabs/react-shared": "^3.4.1",
"@xylabs/ts-scripts-yarn3": "^3.12.4",
"@xylabs/tsconfig-react": "^3.12.4",
"@xylabs/react-button": "^3.4.2",
"@xylabs/react-flexbox": "^3.4.2",
"@xylabs/react-invertible-theme": "^3.4.2",
"@xylabs/react-pixel": "^3.4.2",
"@xylabs/react-shared": "^3.4.2",
"@xylabs/ts-scripts-yarn3": "^3.15.16",
"@xylabs/tsconfig-react": "^3.15.16",
"chromatic": "^7.6.0",
"copyfiles": "^2.4.1",
"eslint": "^8.57.0",
"eslint": "^9.8.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-sonarjs": "^1.0.4",
"eslint-plugin-workspaces": "^0.10.1",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-helmet": "^6.1.0",
"react-icons": "^5.2.1",
"storybook": "^7.6.20",
"storybook-dark-mode": "^3.0.3",
"ts-jest": "^29.2.3",
"storybook": "^8.2.7",
"storybook-dark-mode": "^4.0.2",
"ts-jest": "^29.2.4",
"typedoc": "^0.26.5",
"typescript": "^5.5.4"
"typescript": "^5.5.4",
"vite": "^5.3.5"
},
"docs": "dist/docs.json",
"exports": {
".": {
"node": {
"import": {
"types": "./dist/node/index.d.mts",
"default": "./dist/node/index.js"
"default": "./dist/node/index.mjs"
},
"require": {
"types": "./dist/node/index.d.cts",
Expand All @@ -97,20 +105,20 @@
"browser": {
"import": {
"types": "./dist/browser/index.d.mts",
"default": "./dist/browser/index.js"
"default": "./dist/browser/index.mjs"
},
"require": {
"types": "./dist/browser/index.d.cts",
"default": "./dist/browser/index.cjs"
}
},
"default": "./dist/browser/index.js"
"default": "./dist/browser/index.mjs"
},
"./package.json": "./package.json",
"./README.md": "./README.md"
},
"main": "dist/browser/index.cjs",
"module": "dist/browser/index.js",
"module": "dist/browser/index.mjs",
"homepage": "https://xyo.network",
"keywords": [
"xyo",
Expand All @@ -121,6 +129,7 @@
"license": "LGPL-3.0-only",
"name": "@xyo-network/sdk-xyo-react",
"resolutions": {
"bowser": "^1",
"ethers": "^6",
"typedoc": "0.26.3",
"@mui/x-tree-view": "^6.0.0-alpha.1"
Expand All @@ -144,7 +153,7 @@
"sideEffects": false,
"types": "dist/browser/index.d.ts",
"version": "2.81.10",
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.0",
"volta": {
"node": "22.3.0",
"yarn": "1.22.22"
Expand Down
Loading

0 comments on commit e69b4f5

Please sign in to comment.