Merge branch 'main' into southworks/fix/shelljs-vulnerability

libraries/adaptive-expressions-ie11/package.json

@@ -20,9 +20,9 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "adaptive-expressions": "4.1.6",
-    "clean-webpack-plugin": "^3.0.0",
+    "clean-webpack-plugin": "^4.0.0",
     "core-js": "^3.3.2",
-    "terser-webpack-plugin": "^4.2.3"
+    "terser-webpack-plugin": "^5.3.10"
   },
   "devDependencies": {
     "@babel/core": "^7.23.2",
@@ -35,8 +35,8 @@
     "babel-loader": "^8.0.6",
     "ts-loader": "^7.0.5",
     "typescript": "3.5.3",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.12"
+    "webpack": "^5.92.0",
+    "webpack-cli": "^5.1.4"
   },
   "scripts": {
     "build": "webpack",

libraries/adaptive-expressions-ie11/webpack.config.js

@@ -23,9 +23,11 @@ module.exports = () => {
             minimize: true,
             minimizer: [new TerserPlugin()],
         },
-        devtool: 'none',
         resolve: {
             extensions: ['.ts', '.js'],
+            fallback: {
+                'adaptive-expressions': require.resolve('adaptive-expressions'),
+            },
         },
         module: {
             rules: [
@@ -37,7 +39,7 @@ module.exports = () => {
                 {
                     test: /\.js$/,
                     loader: 'babel-loader',
-                    query: { compact: false },
+                    options: { compact: false },
                     include: [
                         resolvePackageRoot('adaptive-expressions'),
                         resolvePackageRoot('@microsoft/recognizers-text-data-types-timex-expression'),

package.json

@@ -64,7 +64,11 @@
     "axios": "^1.7.2",
     "tar": "6.1.9",
     "glob-parent": "5.1.2",
-    "shelljs": "^0.8.5"
+    "babel-traverse": "npm:@babel/traverse@^7.24.7",
+    "lodash.pick": "npm:lodash@^4.17.21"
+  },
+  "resolutionComments": {
+    "lodash.pick": "Because we can't update nightwatch due to jsdom requires node >= 18. https://github.com/lodash/lodash/issues/5809#issuecomment-1910560681"
   },
   "devDependencies": {
     "@azure/logger": "^1.0.2",

tools/package.json

@@ -46,7 +46,7 @@
     "glob": "^7.1.3",
     "gulp": "^5.0.0",
     "gulp-exec": "^5.0.0",
-    "jshint": "^2.9.6",
+    "jshint": "^2.13.6",
     "minami": "github:devigned/minami#master",
     "mocha": "^10.4.0",
     "nock": "^11.9.1",
@@ -56,8 +56,7 @@
     "random-js": "1.0.4",
     "should": "^8.3.1",
     "sinon": "^2.1.0",
-    "xmlbuilder": "0.4.3",
-    "yargs": "3.29.0"
+    "xmlbuilder": "0.4.3"
   },
   "homepage": "http://github.com/azure/azure-sdk-for-node",
   "repository": {