chore(core): Fix broken unit tests in core

dxatscale · Jun 9, 2022 · 3961072 · 3961072
1 parent d597a11
commit 3961072
Show file tree

Hide file tree

Showing 11 changed files with 32,037 additions and 41,983 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/babel.config.js b/packages/core/babel.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+    '@babel/plugin-proposal-nullish-coalescing-operator'
+  ],
+};
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
@@ -1,7 +1,14 @@
 module.exports = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
+    preset: 'ts-jest/presets/js-with-babel',
+    testEnvironment: 'jsdom',
     restoreMocks: true,
     clearMocks: true,
     resetMocks: true,
+    globals: {
+        'ts-jest': {
+            tsconfig: 'tsconfig.json',
+            babelConfig: true,
+        },
+    },
+    transformIgnorePatterns: ['/node_modules/(?!@salesforce/source-deploy-retrieve)(.*)'],
 };
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dxatscale/sfpowerscripts.core",
-    "version": "23.0.5",
+    "version": "23.0.6",
     "description": "Core Module used by sfpowerscripts",
     "main": "lib/index",
     "types": "lib/index",
@@ -12,8 +12,12 @@
         "build": "npm run clean && npm run compile",
         "clean": "rimraf ./lib && rimraf tsconfig.tsbuildinfo",
         "compile": "tsc -b tsconfig.json",
+        "clearCache": "jest --clearCache",
         "test": "FORCE_COLOR=true jest  --verbose --coverage --detectOpenHandles"
     },
+    "engines": {
+        "node": ">=14.0.0"
+    },
     "dependencies": {
         "@newrelic/telemetry-sdk": "^0.6.0",
         "@salesforce/apex-node": "0.11.0",
@@ -44,11 +48,15 @@
         "xml2js": "^0.4.23"
     },
     "devDependencies": {
+        "@babel/core": "7.18.2",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+        "@babel/plugin-proposal-optional-chaining": "7.17.12",
         "@types/async-retry": "^1.4.2",
         "@types/datadog-metrics": "^0.6.1",
         "@types/jest": "^27.5.0",
         "@types/jsforce": "^1.9.29",
         "@types/mocha": "9.1.0",
+        "babel-jest": "27.5.1",
         "jest": "27.5.1",
         "ts-jest": "^27.1.4",
         "ts-node": "10.7.0",

diff --git a/packages/sfp-cli/package-lock.json b/packages/sfp-cli/package-lock.json
diff --git a/packages/sfp-cli/package.json b/packages/sfp-cli/package.json
@@ -1,15 +1,15 @@
 {
     "name": "@dxatscale/sfp-cli",
     "description": "Developer CLI for Salesforce programs following the DX@Scale model",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "author": "dxatscale",
     "release": "June 22",
     "bin": {
         "sfp": "./bin/run"
     },
     "bugs": "https://github.com/dxatscale/sfp-cli/issues",
     "dependencies": {
-        "@dxatscale/sfpowerscripts.core": "^23.0.5",
+        "@dxatscale/sfpowerscripts.core": "23.0.6",
         "@oclif/command": "^1.8.0",
         "@oclif/config": "1.18.3",
         "@oclif/parser": "^3.8.5",

diff --git a/packages/sfpowerscripts-cli/.babel.config.js b/packages/sfpowerscripts-cli/.babel.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+    '@babel/plugin-proposal-nullish-coalescing-operator'
+  ],
+};
diff --git a/packages/sfpowerscripts-cli/jest.config.js b/packages/sfpowerscripts-cli/jest.config.js
@@ -1,7 +1,13 @@
 module.exports = {
-    preset: 'ts-jest',
+    preset: 'ts-jest/presets/js-with-babel',
     testEnvironment: 'node',
     restoreMocks: true,
     clearMocks: true,
     resetMocks: true,
+    globals: {
+      'ts-jest': {
+        babelConfig: true,
+      }
+    },
+    transformIgnorePatterns: ['/node_modules/(?!@salesforce/source-deploy-retrieve)(.*)'],
 };