chore: dedupe and update packages (#4332)

* dedupe lodash * dedupe babel * Update api-extractor dependencies * update docusaurus and storybook dependencies * dedupe typescript * regenerate lockfile and switch from .babelrc to babel.config.js Co-authored-by: Chris Holt <chhol@microsoft.com>
microsoft · Feb 6, 2021 · 5643033 · 5643033
1 parent 4b63a20
commit 5643033
Show file tree

Hide file tree

Showing 25 changed files with 5,110 additions and 10,106 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+    presets: [
+        [
+            "@babel/preset-env",
+            {
+                targets: {
+                    node: "current",
+                },
+            },
+        ],
+    ],
+};
diff --git a/examples/todo-app-tutorial/package.json b/examples/todo-app-tutorial/package.json
@@ -15,7 +15,7 @@
     "@microsoft/fast-colors": "^5.0.12",
     "@microsoft/fast-element": "latest",
     "@microsoft/fast-foundation": "latest",
-    "lodash-es": "^4.17.15",
+    "lodash-es": "4.17.15",
     "tslib": "^1.11.1"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -105,18 +105,19 @@
     ]
   },
   "resolutions": {
+    "typescript": "^3.9.0",
     "@types/react": "*",
     "immer": "^8.0.1",
     "jimp": "^0.16.1",
     "jpeg-js": "^0.4.3"
   },
   "devDependencies": {
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
     "@octokit/rest": "^18.0.6",
     "@types/jest": "^25.2.1",
-    "@types/lodash-es": "^4.17.0",
+    "@types/lodash-es": "^4.17.4",
     "@types/node": "^9.4.7",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-preset-env": "^1.6.1",
     "beachball": "^1.36.2",
     "chalk": "^2.4.2",
     "docusaurus-init": "^1.11.0",

diff --git a/packages/tooling/fast-figma-plugin-msft/package.json b/packages/tooling/fast-figma-plugin-msft/package.json
@@ -26,8 +26,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.7.7",
-    "@babel/preset-env": "^7.7.7",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
     "@microsoft/fast-colors": "^5.1.0",
     "@microsoft/fast-components": "^1.15.0",
     "@microsoft/fast-components-react-msft": "^4.32.0",
@@ -37,7 +37,7 @@
     "@types/node": "^10.12.12",
     "@types/react": "^16.9.17",
     "@types/react-dom": "^16.9.4",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.2",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^3.4.1",

diff --git a/packages/tooling/fast-tooling-react/package.json b/packages/tooling/fast-tooling-react/package.json
@@ -73,22 +73,21 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-react": "^7.12.13",
     "@types/jest": "^25.2.1",
-    "@types/lodash-es": "^4.17.0",
+    "@types/lodash-es": "^4.17.4",
     "@types/node": "^9.6.7",
     "@types/react": "^16.8.0",
     "@types/react-router": "^4.0.0",
-    "babel-core": "^7.0.0-bridge.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
     "eslint-config-prettier": "^6.10.1",
     "focus-visible": "^4.1.5",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^25.4.0",
-    "lodash-es": "^4.0.0",
+    "lodash-es": "4.17.15",
     "prettier": "2.0.2",
     "react": "^16.8.0",
     "react-dnd-html5-backend": "^9.0.0",

diff --git a/packages/tooling/fast-tooling-react/src/form/controls/utilities/dictionary.spec.tsx b/packages/tooling/fast-tooling-react/src/form/controls/utilities/dictionary.spec.tsx
@@ -1,11 +1,7 @@
-import React from "react";
+import { configure, mount, shallow } from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
-import { configure, mount, render, shallow } from "enzyme";
-import { controls } from "./control-switch.spec";
-import { Dictionary } from "./dictionary";
-import { DictionaryProps } from "./dictionary.props";
-import { DictionaryClassNameContract } from "./dictionary.style";
-import { ControlType } from "../../templates";
+import React from "react";
+import defaultStrings from "../../form.strings";
 import {
     ArrayControl,
     ButtonControl,
@@ -16,7 +12,11 @@ import {
     SelectControl,
     TextareaControl,
 } from "../../index";
-import defaultStrings from "../../form.strings";
+import { ControlType } from "../../templates";
+import { controls } from "./control-switch.spec";
+import { Dictionary } from "./dictionary";
+import type { DictionaryProps } from "./dictionary.props";
+import type { DictionaryClassNameContract } from "./dictionary.style";
 
 /*
  * Configure Enzyme
@@ -348,7 +348,7 @@ describe("Dictionary", () => {
             randoma: "foo",
             b: "bar",
         };
-        const rendered: any = render(
+        const rendered: any = mount(
             <Dictionary
                 {...dictionaryProps}
                 managedClasses={managedClasses}

diff --git a/packages/tooling/fast-tooling/package.json b/packages/tooling/fast-tooling/package.json
@@ -76,7 +76,7 @@
     },
     "devDependencies": {
         "@types/jest": "^25.2.1",
-        "@types/lodash-es": "^4.17.0",
+        "@types/lodash-es": "^4.17.4",
         "@types/node": "^9.6.7",
         "ajv": "^6.10.0",
         "clean-webpack-plugin": "^3.0.0",
@@ -85,7 +85,7 @@
         "file-loader": "^6.0.0",
         "html-webpack-plugin": "^3.2.0",
         "jest": "^25.4.0",
-        "lodash-es": "^4.0.0",
+        "lodash-es": "4.17.15",
         "mdn-data": "^2.0.11",
         "mini-css-extract-plugin": "^0.9.0",
         "monaco-editor": "^0.21.2",

diff --git a/packages/utilities/fast-animation/package.json b/packages/utilities/fast-animation/package.json
@@ -66,20 +66,19 @@
     ]
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
-    "@babel/preset-react": "^7.0.0",
-    "@microsoft/api-extractor": "^7.7.13",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-react": "^7.12.13",
+    "@microsoft/api-extractor": "7.8.1",
     "@microsoft/eslint-config-fast-dna": "^1.2.0",
     "@types/jest": "^25.2.1",
+    "@types/lodash-es": "^4.17.4",
     "@types/node": "^7.0.22",
     "@types/react": "^16.3.0",
     "@types/react-dom": "^16.3.0",
     "@types/react-redux": "^4.4.47",
     "awesome-typescript-loader": "^5.2.1",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^8.2.2",
     "css-loader": "^0.27.1",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
@@ -88,7 +87,7 @@
     "fork-ts-checker-webpack-plugin": "^0.4.0",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^25.4.0",
-    "lodash-es": "^4.0.0",
+    "lodash-es": "4.17.15",
     "mini-css-extract-plugin": "^0.5.0",
     "modernizr-webpack-plugin": "^1.0.5",
     "postcss": "^5.2.16",

diff --git a/packages/utilities/fast-colors/babel.config.js b/packages/utilities/fast-colors/babel.config.js
@@ -1,11 +1,6 @@
 module.exports = {
     presets: [
-        [
-            "@babel/preset-env", {
-                "targets": {
-                    "node": "current"
-                }
-            }
-        ]
-    ]
-}
+        ["@babel/preset-env", { targets: { node: "current" } }],
+        "@babel/preset-typescript",
+    ],
+};
diff --git a/packages/utilities/fast-colors/package.json b/packages/utilities/fast-colors/package.json
@@ -57,9 +57,6 @@
         "lines": 70
       }
     },
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "moduleFileExtensions": [
       "ts",
@@ -69,15 +66,14 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
+    "@babel/preset-typescript": "^7.12.13",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
     "@microsoft/eslint-config-fast-dna": "^1.2.0",
     "@types/jest": "^25.2.1",
-    "babel-core": "^7.0.0-bridge.0",
     "eslint-config-prettier": "^6.10.1",
     "jest": "^25.4.0",
     "prettier": "2.0.2",
-    "ts-jest": "^25.4.0",
     "typescript": "^3.9.0"
   }
 }
diff --git a/packages/utilities/fast-web-utilities/package.json b/packages/utilities/fast-web-utilities/package.json
@@ -70,16 +70,16 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
     "@microsoft/eslint-config-fast-dna": "^1.2.0",
     "@types/jest": "^25.2.1",
-    "@types/lodash-es": "^4.17.0",
+    "@types/lodash-es": "^4.17.4",
     "babel-core": "^7.0.0-bridge.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-loader": "^4.0.0",
     "jest": "^25.4.0",
-    "lodash-es": "^4.17.10",
+    "lodash-es": "4.17.15",
     "prettier": "2.0.2",
     "ts-jest": "^25.4.0",
     "ts-loader": "^4.0.1",

diff --git a/packages/web-components/fast-components/package.json b/packages/web-components/fast-components/package.json
@@ -52,12 +52,11 @@
     "test-firefox:verbose": "karma start karma.conf.js --browsers=FirefoxHeadless --single-run --coverage --reporter=mocha"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.7.13",
+    "@microsoft/api-extractor": "7.8.1",
     "@microsoft/fast-tooling": "^0.15.0",
-    "@storybook/addons": "^5.1.3",
-    "@storybook/cli": "^6.0.0",
-    "@storybook/html": "^6.0.0",
-    "@storybook/theming": "^6.0.0",
+    "@storybook/addons": "^6.1.16",
+    "@storybook/html": "^6.1.16",
+    "@storybook/theming": "^6.1.16",
     "@types/chai": "^4.2.11",
     "@types/chai-spies": "^1.0.1",
     "@types/karma": "^5.0.0",
@@ -83,6 +82,7 @@
     "karma-source-map-support": "^1.4.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
+    "lodash-es": "4.17.15",
     "mocha": "^7.1.2",
     "prettier": "2.0.2",
     "rollup": "^2.7.6",

diff --git a/packages/web-components/fast-element/package.json b/packages/web-components/fast-element/package.json
@@ -47,7 +47,7 @@
     "test-firefox:verbose": "karma start karma.conf.js --browsers=FirefoxHeadless --single-run --coverage --reporter=mocha"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.7.13",
+    "@microsoft/api-extractor": "7.8.1",
     "@types/chai": "^4.2.11",
     "@types/karma": "^5.0.0",
     "@types/mocha": "^7.0.2",

diff --git a/packages/web-components/fast-foundation/package.json b/packages/web-components/fast-foundation/package.json
@@ -49,7 +49,7 @@
     "test-firefox:watch": "karma start karma.conf.js --browsers=FirefoxHeadless   --coverage --watch-extensions js"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.7.13",
+    "@microsoft/api-extractor": "7.8.1",
     "@types/chai": "^4.2.11",
     "@types/karma": "^5.0.0",
     "@types/mocha": "^7.0.2",
@@ -72,7 +72,7 @@
     "karma-source-map-support": "^1.4.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
-    "lodash-es": "^4.17.15",
+    "lodash-es": "4.17.15",
     "mocha": "^7.1.2",
     "prettier": "2.0.2",
     "rollup": "^2.7.6",

diff --git a/sites/fast-color-explorer/package.json b/sites/fast-color-explorer/package.json
@@ -26,9 +26,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.2.0",
-    "@babel/preset-env": "^7.2.0",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-react": "^7.12.13",
     "@microsoft/eslint-config-fast-dna": "^1.2.0",
     "@microsoft/site-utilities": "^0.7.0",
     "@types/lodash": "^4.14.120",
@@ -47,7 +47,7 @@
     "html-webpack-plugin": "^3.2.0",
     "jss": "^9.8.7",
     "jss-preset-default": "^4.5.0",
-    "lodash-es": "^4.17.11",
+    "lodash-es": "4.17.15",
     "mini-css-extract-plugin": "^0.10.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "prettier": "2.0.2",

diff --git a/sites/fast-component-explorer/package.json b/sites/fast-component-explorer/package.json
@@ -29,21 +29,20 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.12.13",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-react": "^7.12.13",
     "@microsoft/eslint-config-fast-dna": "^1.2.0",
     "@microsoft/fast-components-class-name-contracts-base": "^4.8.0",
     "@microsoft/fast-components-class-name-contracts-msft": "^4.9.0",
     "@microsoft/fast-components-foundation-react": "^3.2.0",
     "@microsoft/fast-jss-utilities": "^4.8.0",
     "@microsoft/site-utilities": "^0.7.0",
-    "@types/lodash-es": "^4.17.0",
+    "@types/lodash-es": "^4.17.4",
     "@types/node": "^10.12.12",
     "@types/react": "^16.7.17",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.2",
     "chroma-js": "^1.3.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^6.0.3",
@@ -59,7 +58,7 @@
     "jsdom": "^16.4.0",
     "jss": "^9.8.7",
     "jss-preset-default": "^4.5.0",
-    "lodash-es": "^4.17.11",
+    "lodash-es": "4.17.15",
     "mini-css-extract-plugin": "^0.9.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "prettier": "2.0.2",