chore: swap babel-plugin-lodash with updated version that doesn't use deprecated APIs (#38797)

pieh · pieh · commit 9b0c15bbc2ee · 2024-01-10T08:27:06.000+01:00
(cherry picked from commit 3d4d6a6)
diff --git a/examples/using-remark/package.json b/examples/using-remark/package.json
@@ -5,7 +5,7 @@
   "version": "1.0.0",
   "author": "Florian Kissling <sechskilo@gmail.com>",
   "dependencies": {
-    "babel-plugin-lodash": "^3.3.4",
+    "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
     "es6-object-assign": "^1.1.0",
     "gatsby": "next",
     "gatsby-core-utils": "next",
@@ -50,4 +50,4 @@
     "start": "npm run develop",
     "serve": "gatsby serve"
   }
-}
+}
diff --git a/packages/babel-preset-gatsby-package/lib/__tests__/index.js b/packages/babel-preset-gatsby-package/lib/__tests__/index.js
@@ -38,7 +38,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
@@ -63,7 +63,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
@@ -111,7 +111,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
@@ -136,7 +136,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
@@ -163,7 +163,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
@@ -188,7 +188,7 @@ describe(`babel-preset-gatsby-package`, () => {
               },
             },
           ],
-          "babel-plugin-lodash",
+          "@sigmacomputing/babel-plugin-lodash",
         ]
       `)
     })
diff --git a/packages/babel-preset-gatsby-package/lib/index.js b/packages/babel-preset-gatsby-package/lib/index.js
@@ -86,7 +86,7 @@ function preset(context, options = {}) {
           availableFlags: availableCompilerFlags,
         },
       ],
-      r(`babel-plugin-lodash`),
+      r(`@sigmacomputing/babel-plugin-lodash`),
       Array.isArray(keepDynamicImports) && keepDynamicImports.length > 0 && [
         r(`./babel-transform-mark-to-keep-dynamic-import`),
         {
diff --git a/packages/babel-preset-gatsby-package/package.json b/packages/babel-preset-gatsby-package/package.json
@@ -19,7 +19,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/runtime": "^7.20.13",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-lodash": "^3.3.4",
+    "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
     "core-js": "^3.31.0"
   },
   "devDependencies": {
diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
@@ -61,7 +61,7 @@
     "@rollup/plugin-replace": "^2.4.2",
     "@types/hosted-git-info": "^3.0.5",
     "@types/yargs": "^15.0.19",
-    "babel-plugin-lodash": "^3.3.4",
+    "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
     "babel-preset-gatsby-package": "^3.13.0",
     "cross-env": "^7.0.3",
     "ink": "^3.2.0",
diff --git a/packages/gatsby-cli/rollup.config.js b/packages/gatsby-cli/rollup.config.js
@@ -59,7 +59,7 @@ export default {
         ],
         "@babel/preset-react"
       ],
-      plugins: ["@babel/plugin-transform-runtime", "babel-plugin-lodash"],
+      plugins: ["@babel/plugin-transform-runtime", "@sigmacomputing/babel-plugin-lodash"],
       overrides: [
         {
           "test": ["**/*.ts", "**/*.tsx"],
diff --git a/packages/gatsby-plugin-lodash/package.json b/packages/gatsby-plugin-lodash/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "babel-plugin-lodash": "^3.3.4",
+    "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
     "lodash-webpack-plugin": "^0.11.6"
   },
   "devDependencies": {
diff --git a/packages/gatsby-plugin-lodash/src/gatsby-node.js b/packages/gatsby-plugin-lodash/src/gatsby-node.js
@@ -38,6 +38,6 @@ exports.onCreateWebpackConfig = (
 // Add Lodash Babel plugin
 exports.onCreateBabelConfig = ({ actions }) => {
   actions.setBabelPlugin({
-    name: `babel-plugin-lodash`,
+    name: require.resolve(`@sigmacomputing/babel-plugin-lodash`),
   })
 }
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -47,7 +47,7 @@
     "babel-loader": "^8.3.0",
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-lodash": "^3.3.4",
+    "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
     "babel-plugin-remove-graphql-queries": "^5.13.0",
     "babel-preset-gatsby": "^3.13.0",
     "better-opn": "^2.1.1",
diff --git a/packages/gatsby/src/internal-plugins/bundle-optimisations/gatsby-node.js b/packages/gatsby/src/internal-plugins/bundle-optimisations/gatsby-node.js
@@ -3,7 +3,7 @@ const path = require(`path`)
 exports.onCreateBabelConfig = ({ actions }) => {
   // rewrites import { get }from 'lodash' into import get from 'lodash/get';
   actions.setBabelPlugin({
-    name: `babel-plugin-lodash`,
+    name: `@sigmacomputing/babel-plugin-lodash`,
   })
 }
 
diff --git a/yarn.lock b/yarn.lock
@@ -422,7 +422,7 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
@@ -1390,7 +1390,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.1", "@babel/types@^7.12.7", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.7", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
   integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
@@ -4247,6 +4247,17 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
+"@sigmacomputing/babel-plugin-lodash@^3.3.5":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@sigmacomputing/babel-plugin-lodash/-/babel-plugin-lodash-3.3.5.tgz#613d98b0cbb51c1836bbc12c8a12d75750ee3510"
+  integrity sha512-VFhaHjlNzWyBtBm3YdqOwP8GbQHK7sWzXKpSUBTLjl2Zz6/9PwCK4qXZXI5CHpDjmvbouHUDbjrZP2KU5h6VQg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    glob "^7.1.1"
+    lodash "^4.17.10"
+    require-package-name "^2.0.1"
+
 "@sinclair/typebox@^0.25.16":
   version "0.25.21"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
@@ -6627,17 +6638,6 @@ babel-plugin-jest-hoist@^29.5.0:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-lodash@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
-  integrity sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0-beta.49"
-    "@babel/types" "^7.0.0-beta.49"
-    glob "^7.1.1"
-    lodash "^4.17.10"
-    require-package-name "^2.0.1"
-
 babel-plugin-macros@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ function preset(context, options = {}) {`
`86`	`86`	`availableFlags: availableCompilerFlags,`
`87`	`87`	`},`
`88`	`88`	`],`
`89`		- r(`babel-plugin-lodash`),
	`89`	+ r(`@sigmacomputing/babel-plugin-lodash`),
`90`	`90`	`Array.isArray(keepDynamicImports) && keepDynamicImports.length > 0 && [`
`91`	`91`	r(`./babel-transform-mark-to-keep-dynamic-import`),
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export default {`
`59`	`59`	`],`
`60`	`60`	`"@babel/preset-react"`
`61`	`61`	`],`
`62`		`- plugins: ["@babel/plugin-transform-runtime", "babel-plugin-lodash"],`
	`62`	`+ plugins: ["@babel/plugin-transform-runtime", "@sigmacomputing/babel-plugin-lodash"],`
`63`	`63`	`overrides: [`
`64`	`64`	`{`
`65`	`65`	`"test": ["*/.ts", "*/.tsx"],`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ exports.onCreateWebpackConfig = (`
`38`	`38`	`// Add Lodash Babel plugin`
`39`	`39`	`exports.onCreateBabelConfig = ({ actions }) => {`
`40`	`40`	`actions.setBabelPlugin({`
`41`		- name: `babel-plugin-lodash`,
	`41`	+ name: require.resolve(`@sigmacomputing/babel-plugin-lodash`),
`42`	`42`	`})`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
@@ -3,7 +3,7 @@ const path = require(`path`)
`3`	`3`	`exports.onCreateBabelConfig = ({ actions }) => {`
`4`	`4`	`// rewrites import { get }from 'lodash' into import get from 'lodash/get';`
`5`	`5`	`actions.setBabelPlugin({`
`6`		- name: `babel-plugin-lodash`,
	`6`	+ name: `@sigmacomputing/babel-plugin-lodash`,
`7`	`7`	`})`
`8`	`8`	`}`
`9`	`9`