Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typescript rule change and dependencies packages updated #60

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
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
3 changes: 0 additions & 3 deletions .github/FUNDING.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
{ "language": "typescript", "autoFix": true },
{ "language": "typescriptreact", "autoFix": true }
],
"editor.formatOnSave": true
"editor.formatOnSave": true,
"deepscan.enable": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
4 changes: 3 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"useWorkspaces": true,
"packages": ["packages/*/*"],
"npmClient": "yarn",
"version": "1.0.0",
"command": {
"run": {
"npmClient": "yarn"
"npmClient": "yarn",
"useWorkspaces": true
}
}
}
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
]
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^2.15.0",
"@typescript-eslint/parser": "^2.15.0",
"@typescript-eslint/eslint-plugin": "^3.6.1",
"@typescript-eslint/parser": "^3.6.1",
"babel-eslint": "10.0.3",
"eslint": "6.8.0",
"eslint-config-prettier": "^6.9.0",
"eslint-config-react-app": "^5.1.0",
"eslint-plugin-flowtype": "^4.5.3",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.17.0",
"eslint-plugin-react-hooks": "^2.3.0",
"husky": "^4.0.6",
"eslint": "^6.6.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.8",
"husky": "^4.2.5",
"jest-prop-type-error": "^1.1.0",
"lerna": "^3.20.2",
"prettier": "^1.19.1"
"lerna": "^3.22.1",
"prettier": "^2.0.5"
},
"husky": {
"hooks": {
Expand All @@ -56,5 +56,6 @@
"!src/serviceWorker.{js,jsx,ts,tsx}",
"!src/**/*.(spec|test|stories).{js,jsx,ts,tsx}"
]
}
},
"dependencies": {}
}
22 changes: 11 additions & 11 deletions packages/apps/app-ant-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"dependencies": {
"@project/components": "1.0.0",
"@react-workspaces/react-scripts": "^3.3.0-alpha-08",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"react-app-rewired": "^2.1.5",
"antd": "^3.26.6",
"antd": "^4.4.2",
"babel-plugin-import": "^1.13.0",
"customize-cra": "^0.9.1",
"cross-env": "6.0.3",
"cross-env": "^7.0.2",
"customize-cra": "^1.0.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"gh-pages": "^2.2.0",
"source-map-explorer": "^2.2.2",
"eslint-config-react-app": "^5.1.0",
"eslint-config-prettier": "^6.9.0",
"eslint-plugin-prettier": "^3.1.2"
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-prettier": "^3.1.4",
"gh-pages": "^3.1.0",
"react-app-rewired": "^2.1.6",
"source-map-explorer": "^2.4.2"
},
"browserslist": {
"production": [
Expand Down
16 changes: 8 additions & 8 deletions packages/apps/app-multi-comps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"dependencies": {
"@project/components": "1.0.0",
"@react-workspaces/react-scripts": "^3.3.0-alpha-08",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"cross-env": "6.0.3",
"cross-env": "^7.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"gh-pages": "^2.2.0",
"source-map-explorer": "^2.2.2",
"eslint-config-react-app": "^5.1.0",
"eslint-config-prettier": "^6.9.0",
"eslint-plugin-prettier": "^3.1.2"
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-prettier": "^3.1.4",
"gh-pages": "^3.1.0",
"source-map-explorer": "^2.4.2"
},
"browserslist": {
"production": [
Expand Down
16 changes: 8 additions & 8 deletions packages/apps/app-single-comp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"dependencies": {
"@project/components": "1.0.0",
"@react-workspaces/react-scripts": "^3.3.0-alpha-08",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"cross-env": "6.0.3",
"cross-env": "^7.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"gh-pages": "^2.2.0",
"source-map-explorer": "^2.2.2",
"eslint-config-react-app": "^5.1.0",
"eslint-config-prettier": "^6.9.0",
"eslint-plugin-prettier": "^3.1.2"
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-prettier": "^3.1.4",
"gh-pages": "^3.1.0",
"source-map-explorer": "^2.4.2"
},
"browserslist": {
"production": [
Expand Down
7 changes: 6 additions & 1 deletion packages/apps/app-typescript/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ module.exports = {
},
rules: {
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
// e.g. '@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/prefer-as-const': 'off',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
settings: {
react: {
Expand Down
22 changes: 12 additions & 10 deletions packages/apps/app-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
"dependencies": {
"@project/components-typescript": "1.0.0",
"@react-workspaces/react-scripts": "^3.3.0-alpha-08",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.4.0",
"@testing-library/user-event": "^8.0.3",
"@types/jest": "^24.0.25",
"@types/node": "^13.1.6",
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"typescript": "~3.7.4"
"@testing-library/jest-dom": "^5.11.1",
"@testing-library/react": "^10.4.7",
"@testing-library/user-event": "^12.0.11",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"typescript": "^3.9.7"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -54,5 +50,11 @@
"lines": 98
}
}
},
"devDependencies": {
"@types/jest": "^26.0.5",
"@types/node": "^14.0.23",
"@types/react": "^16.9.43",
"@types/react-dom": "^16.9.8"
}
}
4 changes: 4 additions & 0 deletions packages/apps/app-typescript/src/@types/svg.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module '*.svg' {
const value: any;
export default value;
}
2 changes: 1 addition & 1 deletion packages/apps/app-typescript/src/serviceWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type Config = {
};

export function register(config?: Config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
if (process.env.NODE_ENV === 'production' && process.env.PUBLIC_URL && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
Expand Down
31 changes: 16 additions & 15 deletions packages/components-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,13 @@
},
"dependencies": {
"@react-workspaces/react-scripts": "3.3.0-alpha-08",
"@storybook/react": "^5.2.8",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.4.0",
"@testing-library/user-event": "^8.0.3",
"@types/jest": "^24.0.25",
"@types/node": "^13.1.6",
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"@typescript-eslint/eslint-plugin": "^2.15.0",
"@typescript-eslint/parser": "^2.15.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-scripts": "3.3.0",
"typescript": "~3.7.4"
"@storybook/react": "^5.3.19",
"@testing-library/jest-dom": "^5.11.1",
"@testing-library/react": "^10.4.7",
"@testing-library/user-event": "^12.0.11",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"typescript": "^3.9.7"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -49,5 +42,13 @@
}
}
},
"license": "MIT"
"license": "MIT",
"devDependencies": {
"@types/jest": "^26.0.5",
"@types/node": "^14.0.23",
"@types/react": "^16.9.43",
"@types/react-dom": "^16.9.8",
"@typescript-eslint/eslint-plugin": "^3.6.1",
"@typescript-eslint/parser": "^3.6.1"
}
}
16 changes: 8 additions & 8 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
},
"dependencies": {
"@react-workspaces/react-scripts": "3.3.0-alpha-08",
"@storybook/react": "^5.2.8",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"@storybook/react": "^5.3.19",
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"cross-env": "6.0.3",
"cross-env": "^7.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"prop-types": "^15.7.2",
"eslint-config-prettier": "^6.9.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-config-react-app": "^5.1.0"
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-prettier": "^3.1.4",
"prop-types": "^15.7.2"
},
"browserslist": [
">0.2%",
Expand Down
26 changes: 13 additions & 13 deletions packages/storybook-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"dependencies": {
"@project/components-typescript": "1.0.0",
"@react-workspaces/react-scripts": "3.3.0-alpha-08",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"@babel/core": "^7.7.7",
"@storybook/addon-actions": "^5.2.8",
"@storybook/addon-docs": "^5.2.8",
"@storybook/addon-info": "^5.2.8",
"@storybook/addon-links": "^5.2.8",
"@storybook/addons": "^5.2.8",
"@storybook/preset-create-react-app": "^1.5.0",
"@storybook/react": "^5.2.8",
"@storybook/theming": "^5.2.8",
"babel-loader": "^8.0.6",
"cross-env": "6.0.3"
"@babel/core": "^7.10.5",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-docs": "^5.3.19",
"@storybook/addon-info": "^5.3.19",
"@storybook/addon-links": "^5.3.19",
"@storybook/addons": "^5.3.19",
"@storybook/preset-create-react-app": "^3.1.4",
"@storybook/react": "^5.3.19",
"@storybook/theming": "^5.3.19",
"babel-loader": "~8.0.6",
"cross-env": "^7.0.2"
}
}
21 changes: 10 additions & 11 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@
"build-storybook": "build-storybook"
},
"dependencies": {
"@project/components": "1.0.0",
"@babel/core": "^7.7.7",
"@project/components": "^1.0.0",
"@react-workspaces/react-scripts": "3.3.0-alpha-08",
"babel-loader": "^8.0.6",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"cross-env": "6.0.3"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"@storybook/react": "^5.2.8",
"@storybook/addon-actions": "^5.2.8",
"@storybook/addon-links": "^5.2.8",
"@storybook/addons": "^5.2.8",
"@storybook/theming": "^5.2.8"
"@babel/core": "^7.10.5",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-links": "^5.3.19",
"@storybook/addons": "^5.3.19",
"@storybook/react": "^5.3.19",
"@storybook/theming": "^5.3.19",
"babel-loader": "~8.0.6"
}
}
Loading