From 50ac0373429aa5d27d1093b133af8ec26517c98a Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Tue, 24 Jan 2023 15:32:13 -0500 Subject: [PATCH 1/2] Deps: Upgrade fs-extra to 11.1.0 --- code/addons/docs/package.json | 2 +- code/addons/links/package.json | 2 +- code/frameworks/nextjs/package.json | 2 +- code/lib/builder-manager/package.json | 2 +- code/lib/builder-vite/package.json | 2 +- code/lib/builder-webpack5/package.json | 2 +- code/lib/cli/package.json | 2 +- code/lib/core-common/package.json | 2 +- code/lib/core-server/package.json | 2 +- code/lib/csf-tools/package.json | 4 +- code/lib/telemetry/package.json | 2 +- code/lib/theming/package.json | 4 +- code/package.json | 4 +- code/presets/react-webpack/package.json | 2 +- code/presets/server-webpack/package.json | 2 +- code/ui/manager/package.json | 2 +- code/yarn.lock | 72 +++++++++++++++++------- scripts/package.json | 2 +- scripts/yarn.lock | 21 +------ 19 files changed, 72 insertions(+), 61 deletions(-) diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index c2e82a602ea8..a4044e36a15d 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -115,7 +115,7 @@ "@storybook/preview-api": "7.0.0-beta.33", "@storybook/theming": "7.0.0-beta.33", "@storybook/types": "7.0.0-beta.33", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", "ts-dedent": "^2.0.0" diff --git a/code/addons/links/package.json b/code/addons/links/package.json index a314d0cf02bb..fc373b53a04f 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -92,7 +92,7 @@ "ts-dedent": "^2.0.0" }, "devDependencies": { - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "typescript": "~4.9.3" }, "peerDependencies": { diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index b319ea2d0525..d8fdb57c1cf3 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -69,7 +69,7 @@ "@storybook/react": "7.0.0-beta.33", "@types/node": "^16.0.0", "find-up": "^5.0.0", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "image-size": "^1.0.0", "loader-utils": "^3.2.0", "pnp-webpack-plugin": "^1.7.0", diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index 6e132f7fa99a..4b4df529d2fe 100644 --- a/code/lib/builder-manager/package.json +++ b/code/lib/builder-manager/package.json @@ -56,7 +56,7 @@ "esbuild-plugin-alias": "^0.2.1", "express": "^4.17.3", "find-cache-dir": "^3.0.0", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "process": "^0.11.10", "slash": "^3.0.0", "util": "^0.12.4" diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index 368831c5c518..4275e5c1b450 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -56,7 +56,7 @@ "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", "express": "^4.17.3", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "glob": "^7.2.0", "glob-promise": "^4.2.0", "magic-string": "^0.26.1", diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index 0200a702dbf5..cb985564ce76 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -86,7 +86,7 @@ "css-loader": "^6.7.1", "express": "^4.17.3", "fork-ts-checker-webpack-plugin": "^7.2.8", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "html-webpack-plugin": "^5.5.0", "path-browserify": "^1.0.1", "process": "^0.11.10", diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 0b0aa6ab3755..b1b1047c6611 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -73,7 +73,7 @@ "execa": "^5.0.0", "express": "^4.17.3", "find-up": "^5.0.0", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "get-port": "^5.1.1", "giget": "^1.0.0", "globby": "^11.0.2", diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index 8f2dfa54ed41..4e2d6ba4ced9 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -56,7 +56,7 @@ "express": "^4.17.3", "file-system-cache": "^2.0.0", "find-up": "^5.0.0", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "glob": "^7.1.6", "handlebars": "^4.7.7", "lazy-universal-dotenv": "^3.0.1", diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index ffe5abf969f2..76f76302b7fa 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -81,7 +81,7 @@ "compression": "^1.7.4", "detect-port": "^1.3.0", "express": "^4.17.3", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "globby": "^11.0.2", "ip": "^2.0.0", "lodash": "^4.17.21", diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index 4a957359e123..c74e43f12d3b 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -46,7 +46,7 @@ "@babel/types": "^7.20.2", "@storybook/csf": "next", "@storybook/types": "7.0.0-beta.33", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "recast": "^0.23.1", "ts-dedent": "^2.0.0" }, @@ -54,7 +54,7 @@ "@babel/generator": "^7.20.4", "@babel/parser": "^7.20.3", "@babel/traverse": "^7.20.1", - "@types/fs-extra": "^9.0.6", + "@types/fs-extra": "^11.0.1", "@types/js-yaml": "^3.12.6", "js-yaml": "^3.14.1", "typescript": "~4.9.3" diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index be1ef7e1ccfe..2bf00a219182 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -48,7 +48,7 @@ "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "isomorphic-unfetch": "^3.1.0", "nanoid": "^3.3.1", "read-pkg-up": "^7.0.1" diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index e01a3f8d0fcb..8ce7a716f95b 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -58,10 +58,10 @@ "@emotion/is-prop-valid": "^1.2.0", "@emotion/react": "^11.10.4", "@emotion/styled": "^11.10.4", - "@types/fs-extra": "^9.0.6", + "@types/fs-extra": "^11.0.1", "@types/node": "^16.0.0", "deep-object-diff": "^1.1.0", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "polished": "^4.2.2", "ts-dedent": "^2.0.0", "typescript": "~4.9.3" diff --git a/code/package.json b/code/package.json index ddc361e7016a..a4b2740549b7 100644 --- a/code/package.json +++ b/code/package.json @@ -197,7 +197,7 @@ "@testing-library/react": "^11.2.2", "@testing-library/user-event": "^13.2.1", "@types/express": "^4.17.11", - "@types/fs-extra": "^9.0.6", + "@types/fs-extra": "^11.0.1", "@types/lodash": "^4.14.167", "@types/node": "^16.0.0", "@types/react": "^16.14.34", @@ -224,7 +224,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-react": "^7.31.10", "eslint-plugin-storybook": "^0.6.6", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "github-release-from-changelog": "^2.1.1", "glob": "^7.1.6", "http-server": "^0.12.3", diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index c1a037e3bd71..1a746a9c656e 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -80,7 +80,7 @@ "@types/semver": "^7.3.4", "babel-plugin-add-react-displayname": "^0.0.5", "babel-plugin-react-docgen": "^4.2.1", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "react-refresh": "^0.11.0", "semver": "^7.3.7" }, diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index ba27f5e2ce10..cb194ce6e4df 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -63,7 +63,7 @@ "yaml-loader": "^0.8.0" }, "devDependencies": { - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "jest-specific-snapshot": "^7.0.0", "typescript": "~4.9.3", "yaml": "^1.10.0" diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index 6ae8fc0acc30..9488729c5082 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -71,7 +71,7 @@ "@types/semver": "^7.3.4", "copy-to-clipboard": "^3.3.1", "downshift": "^6.0.15", - "fs-extra": "^9.0.1", + "fs-extra": "^11.1.0", "fuse.js": "^3.6.1", "lodash": "^4.17.21", "markdown-to-jsx": "^7.1.3", diff --git a/code/yarn.lock b/code/yarn.lock index dc560df023d0..59373af0e7c7 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5198,7 +5198,7 @@ __metadata: "@storybook/preview-api": 7.0.0-beta.33 "@storybook/theming": 7.0.0-beta.33 "@storybook/types": 7.0.0-beta.33 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 react: ^16.14.0 react-dom: ^16.8.0 remark-external-links: ^8.0.0 @@ -5320,7 +5320,7 @@ __metadata: "@storybook/preview-api": 7.0.0-beta.33 "@storybook/router": 7.0.0-beta.33 "@storybook/types": 7.0.0-beta.33 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 prop-types: ^15.7.2 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -5727,7 +5727,7 @@ __metadata: esbuild-plugin-alias: ^0.2.1 express: ^4.17.3 find-cache-dir: ^3.0.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 process: ^0.11.10 slash: ^3.0.0 typescript: ~4.9.3 @@ -5754,7 +5754,7 @@ __metadata: browser-assert: ^1.2.1 es-module-lexer: ^0.9.3 express: ^4.17.3 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 glob: ^7.2.0 glob-promise: ^4.2.0 magic-string: ^0.26.1 @@ -5816,7 +5816,7 @@ __metadata: css-loader: ^6.7.1 express: ^4.17.3 fork-ts-checker-webpack-plugin: ^7.2.8 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 html-webpack-plugin: ^5.5.0 path-browserify: ^1.0.1 pretty-hrtime: ^1.0.3 @@ -5926,7 +5926,7 @@ __metadata: execa: ^5.0.0 express: ^4.17.3 find-up: ^5.0.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 get-port: ^5.1.1 giget: ^1.0.0 globby: ^11.0.2 @@ -6060,7 +6060,7 @@ __metadata: express: ^4.17.3 file-system-cache: ^2.0.0 find-up: ^5.0.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 glob: ^7.1.6 handlebars: ^4.7.7 lazy-universal-dotenv: ^3.0.1 @@ -6124,7 +6124,7 @@ __metadata: compression: ^1.7.4 detect-port: ^1.3.0 express: ^4.17.3 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 globby: ^11.0.2 ip: ^2.0.0 jest-os-detection: ^1.3.1 @@ -6181,9 +6181,9 @@ __metadata: "@babel/types": ^7.20.2 "@storybook/csf": next "@storybook/types": 7.0.0-beta.33 - "@types/fs-extra": ^9.0.6 + "@types/fs-extra": ^11.0.1 "@types/js-yaml": ^3.12.6 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 js-yaml: ^3.14.1 recast: ^0.23.1 ts-dedent: ^2.0.0 @@ -6457,7 +6457,7 @@ __metadata: "@types/semver": ^7.3.4 copy-to-clipboard: ^3.3.1 downshift: ^6.0.15 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 fuse.js: ^3.6.1 lodash: ^4.17.21 markdown-to-jsx: ^7.1.3 @@ -6501,7 +6501,7 @@ __metadata: "@types/babel__core": ^7 "@types/node": ^16.0.0 find-up: ^5.0.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 image-size: ^1.0.0 loader-utils: ^3.2.0 next: ^13.0.5 @@ -6651,7 +6651,7 @@ __metadata: "@types/semver": ^7.3.4 babel-plugin-add-react-displayname: ^0.0.5 babel-plugin-react-docgen: ^4.2.1 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 react-refresh: ^0.11.0 semver: ^7.3.7 typescript: ~4.9.3 @@ -6677,7 +6677,7 @@ __metadata: "@storybook/global": ^5.0.0 "@storybook/server": 7.0.0-beta.33 "@types/node": ^16.0.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 jest-specific-snapshot: ^7.0.0 safe-identifier: ^0.4.1 ts-dedent: ^2.0.0 @@ -7061,7 +7061,7 @@ __metadata: "@testing-library/react": ^11.2.2 "@testing-library/user-event": ^13.2.1 "@types/express": ^4.17.11 - "@types/fs-extra": ^9.0.6 + "@types/fs-extra": ^11.0.1 "@types/lodash": ^4.14.167 "@types/node": ^16.0.0 "@types/react": ^16.14.34 @@ -7088,7 +7088,7 @@ __metadata: eslint-plugin-import: ^2.26.0 eslint-plugin-react: ^7.31.10 eslint-plugin-storybook: ^0.6.6 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 github-release-from-changelog: ^2.1.1 glob: ^7.1.6 http-server: ^0.12.3 @@ -7300,7 +7300,7 @@ __metadata: chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 isomorphic-unfetch: ^3.1.0 nanoid: ^3.3.1 read-pkg-up: ^7.0.1 @@ -7332,10 +7332,10 @@ __metadata: "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 "@storybook/client-logger": 7.0.0-beta.33 "@storybook/global": ^5.0.0 - "@types/fs-extra": ^9.0.6 + "@types/fs-extra": ^11.0.1 "@types/node": ^16.0.0 deep-object-diff: ^1.1.0 - fs-extra: ^9.0.1 + fs-extra: ^11.1.0 memoizerific: ^1.11.3 polished: ^4.2.2 ts-dedent: ^2.0.0 @@ -8069,6 +8069,16 @@ __metadata: languageName: node linkType: hard +"@types/fs-extra@npm:^11.0.1": + version: 11.0.1 + resolution: "@types/fs-extra@npm:11.0.1" + dependencies: + "@types/jsonfile": "*" + "@types/node": "*" + checksum: a65f1fae47849fe1a17441dcabc9400390303405972ff3cbb3578746cea8916b23d5e7652bf57a87767f75a9b2f37caac499b78b5230ae08fef0ba58b34c3a85 + languageName: node + linkType: hard + "@types/fs-extra@npm:^5.0.5": version: 5.1.0 resolution: "@types/fs-extra@npm:5.1.0" @@ -8078,7 +8088,7 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^9.0.13, @types/fs-extra@npm:^9.0.6": +"@types/fs-extra@npm:^9.0.13": version: 9.0.13 resolution: "@types/fs-extra@npm:9.0.13" dependencies: @@ -8258,6 +8268,15 @@ __metadata: languageName: node linkType: hard +"@types/jsonfile@npm:*": + version: 6.1.1 + resolution: "@types/jsonfile@npm:6.1.1" + dependencies: + "@types/node": "*" + checksum: 96dfca37e856978eaf256bf5200c46a01a27a0455b9323a72598e8d59ddd81095934bf15e9c84d6a30125cf63e1464aef6d70ab4a35f34ee2cdfa1fe0db0720b + languageName: node + linkType: hard + "@types/lodash@npm:^4.14.167": version: 4.14.191 resolution: "@types/lodash@npm:4.14.191" @@ -15603,6 +15622,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^11.1.0": + version: 11.1.0 + resolution: "fs-extra@npm:11.1.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: 8085a078ead6a95711cc3cb689f9a64ad7393a1cdf7ed1bdab9dbef384f4a8fac941d20b1eb3067c427c82730a1078f9cfe93d86b98e848ee5445024ad0a3fa4 + languageName: node + linkType: hard + "fs-extra@npm:^5.0.0": version: 5.0.0 resolution: "fs-extra@npm:5.0.0" @@ -15636,7 +15666,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.0.1, fs-extra@npm:^9.1.0": +"fs-extra@npm:^9.1.0": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" dependencies: diff --git a/scripts/package.json b/scripts/package.json index 29bace95c15d..fbbb66dbbcf2 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -104,7 +104,7 @@ "express": "^4.17.3", "fast-glob": "^3.2.12", "find-up": "^5.0.0", - "fs-extra": "^9.0.1", + "fs-extra": "^10.1.0", "github-release-from-changelog": "^2.1.1", "glob": "^7.1.6", "http-server": "^0.12.3", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 0f39d78e3026..29c32941b5ad 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2820,7 +2820,7 @@ __metadata: express: ^4.17.3 fast-glob: ^3.2.12 find-up: ^5.0.0 - fs-extra: ^9.0.1 + fs-extra: ^10.1.0 github-release-from-changelog: ^2.1.1 glob: ^7.1.6 http-server: ^0.12.3 @@ -4345,13 +4345,6 @@ __metadata: languageName: node linkType: hard -"at-least-node@npm:^1.0.0": - version: 1.0.0 - resolution: "at-least-node@npm:1.0.0" - checksum: 4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef - languageName: node - linkType: hard - "atob-lite@npm:^2.0.0": version: 2.0.0 resolution: "atob-lite@npm:2.0.0" @@ -7570,18 +7563,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.0.1": - version: 9.1.0 - resolution: "fs-extra@npm:9.1.0" - dependencies: - at-least-node: ^1.0.0 - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: 9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" From 8d595b81e6d0fa0e43ac6979cd0497814f024206 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Tue, 24 Jan 2023 15:54:10 -0500 Subject: [PATCH 2/2] Fix utf-8 encoding flag --- code/lib/cli/src/repro-generators/scripts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/repro-generators/scripts.ts b/code/lib/cli/src/repro-generators/scripts.ts index c8b0b9fe8d1d..e003f973c7b4 100644 --- a/code/lib/cli/src/repro-generators/scripts.ts +++ b/code/lib/cli/src/repro-generators/scripts.ts @@ -186,7 +186,7 @@ const addAdditionalFiles = async ({ additionalFiles, cwd }: Options) => { await Promise.all( additionalFiles.map(async (file) => { - await outputFile(path.resolve(cwd, file.path), file.contents, { encoding: 'UTF-8' }); + await outputFile(path.resolve(cwd, file.path), file.contents, { encoding: 'utf-8' }); }) ); };