Skip to content

Commit

Permalink
Bump typescript to 4.9.5 (#63)
Browse files Browse the repository at this point in the history
* Bump typescript to 4.9.5

* Update typescript

* Upgrade storybook

* Dedupe dependencies

* Update yarn.lock following rebase

* Lint fixes
  • Loading branch information
fcollonval authored Nov 17, 2023
1 parent 468e12f commit 6cb723a
Show file tree
Hide file tree
Showing 5 changed files with 2,187 additions and 2,144 deletions.
13 changes: 9 additions & 4 deletions packages/components/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { dirname, join } from 'path';
import remarkGfm from 'remark-gfm';

module.exports = {
Expand All @@ -18,9 +19,9 @@ module.exports = {
}
}
},
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-a11y'
getAbsolutePath('@storybook/addon-links'),
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@storybook/addon-a11y')
],
webpackFinal: async config => {
config.module.rules.push(
Expand All @@ -44,11 +45,15 @@ module.exports = {
return config;
},
framework: {
name: '@storybook/html-webpack5',
name: getAbsolutePath('@storybook/html-webpack5'),
options: {}
},
docs: {
autodocs: true,
defaultName: 'Documentation'
}
};

function getAbsolutePath(value) {
return dirname(require.resolve(join(value, 'package.json')));
}
30 changes: 15 additions & 15 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@microsoft/fast-colors": "^5.3.1",
"@microsoft/fast-components": "^2.30.6",
"@microsoft/fast-element": "^1.12.0",
"@microsoft/fast-foundation": "^2.49.0",
"@microsoft/fast-web-utilities": "^6.0.0"
"@microsoft/fast-foundation": "^2.49.4",
"@microsoft/fast-web-utilities": "^5.4.1"
},
"devDependencies": {
"@babel/preset-env": "^7.22.5",
Expand All @@ -56,22 +56,22 @@
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-node-resolve": "^11.2.0",
"@rollup/plugin-typescript": "^8.2.0",
"@storybook/addon-a11y": "^7.0.23",
"@storybook/addon-actions": "^7.0.23",
"@storybook/addon-docs": "^7.0.24",
"@storybook/addon-essentials": "^7.0.23",
"@storybook/addon-links": "^7.0.23",
"@storybook/addons": "^7.0.23",
"@storybook/blocks": "^7.0.24",
"@storybook/html": "^7.0.23",
"@storybook/html-webpack5": "^7.0.23",
"@storybook/theming": "^7.0.23",
"@storybook/addon-a11y": "^7.5.3",
"@storybook/addon-actions": "^7.5.3",
"@storybook/addon-docs": "^7.5.3",
"@storybook/addon-essentials": "^7.5.3",
"@storybook/addon-links": "^7.5.3",
"@storybook/addons": "^7.5.3",
"@storybook/blocks": "^7.5.3",
"@storybook/html": "^7.5.3",
"@storybook/html-webpack5": "^7.5.3",
"@storybook/theming": "^7.5.3",
"@types/jest": "^29.0.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-storybook": "^0.6.12",
"eslint-plugin-storybook": "^0.6.15",
"gh-pages": "^5.0.0",
"jest": "^29.5.0",
"prettier": "^3.0.0",
Expand All @@ -84,11 +84,11 @@
"rollup-plugin-filesize": "^9.1.1",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-transform-tagged-template": "0.0.3",
"storybook": "^7.0.23",
"storybook": "^7.5.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"tslib": "^2.6.0",
"typescript": "~4.3.5",
"typescript": "~5.2.2",
"webpack": "^5.0.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/lab-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"rimraf": "^5.0.1",
"source-map-loader": "^1.0.2",
"style-loader": "^3.3.1",
"typescript": "~4.3.5"
"typescript": "~5.2.2"
},
"sideEffects": [
"style/*.css",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@jupyter/web-components": "^0.13.3",
"@microsoft/fast-react-wrapper": "^0.3.18",
"@microsoft/fast-react-wrapper": "^0.3.22",
"react": ">=17.0.0 <19.0.0"
},
"devDependencies": {
Expand All @@ -44,7 +44,7 @@
"eslint-plugin-import": "^2.25.2",
"prettier": "^3.0.0",
"rimraf": "^5.0.1",
"typescript": "~4.3.5"
"typescript": "~5.2.2"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 6cb723a

Please sign in to comment.