chore: revert back pull request #396

Signed-off-by: vitaliy-guliy <vgulyy@redhat.com>
che-incubator · Oct 16, 2024 · 764f650 · 764f650
1 parent 174b960
commit 764f650
Show file tree

Hide file tree

Showing 15 changed files with 2,506 additions and 428 deletions.
diff --git a/code/extensions/che-api/extension.webpack.config.js b/code/extensions/che-api/extension.webpack.config.js
@@ -16,7 +16,6 @@
 
 const withDefaults = require('../shared.webpack.config');
 const webpack = require('webpack');
-const { merge } = require('webpack-merge');
 
 const config = withDefaults({
     context: __dirname,
@@ -34,16 +33,3 @@ const config = withDefaults({
         new webpack.ContextReplacementPlugin(/keyv/), // needs to exclude the package to ignore warnings https://github.com/jaredwray/keyv/issues/45
     ],
 });
-
-module.exports = merge(config, {
-    module: {
-        rules: [
-            {
-                test: /\.m?js$/,
-                resolve: {
-                    fullySpecified: false, // This avoids the issue with the devfile/api extension requirement
-                },
-            }
-        ]
-    }
-})
diff --git a/code/extensions/che-api/package.json b/code/extensions/che-api/package.json
@@ -29,7 +29,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@devfile/api": "^2.3.0-1723034342",
+    "@devfile/api": "^2.2.0-alpha-1641413790",
     "axios": "^1.7.4",
     "@kubernetes/client-node": "^0.22.0",
     "fs-extra": "^11.2.0",

diff --git a/code/extensions/che-api/yarn.lock b/code/extensions/che-api/yarn.lock
diff --git a/code/extensions/che-commands/package.json b/code/extensions/che-commands/package.json
@@ -34,7 +34,7 @@
     "fs-extra": "^11.2.0",
     "vscode-nls": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "@devfile/api": "^2.3.0-1723034342"
+    "@devfile/api": "^2.2.0-alpha-1641413790"
   },
   "devDependencies": {
     "jest": "27.3.1",

diff --git a/code/extensions/che-commands/yarn.lock b/code/extensions/che-commands/yarn.lock
diff --git a/code/extensions/che-github-authentication/extension.webpack.config.js b/code/extensions/che-github-authentication/extension.webpack.config.js
@@ -16,7 +16,6 @@
 
 const withDefaults = require('../shared.webpack.config');
 const webpack = require('webpack');
-const { merge } = require('webpack-merge');
 
 const config = withDefaults({
     context: __dirname,
@@ -34,16 +33,3 @@ const config = withDefaults({
         new webpack.ContextReplacementPlugin(/keyv/), // needs to exclude the package to ignore warnings https://github.com/jaredwray/keyv/issues/45
     ],
 });
-
-module.exports = merge(config, {
-    module: {
-        rules: [
-            {
-                test: /\.m?js$/,
-                resolve: {
-                    fullySpecified: false, // This avoids the issue with the devfile/api extension requirement
-                },
-            }
-        ]
-    }
-})
diff --git a/code/extensions/che-github-authentication/package.json b/code/extensions/che-github-authentication/package.json
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "inversify": "^6.0.2",
-    "@devfile/api": "^2.3.0-1723034342",
+    "@devfile/api": "^2.2.0-alpha-1641413790",
     "@kubernetes/client-node": "^0.22.0",
     "uuid": "8.1.0",
     "@vscode/extension-telemetry": "0.7.5",