Merge pull request #396 from che-incubator/sv-bump-devfile-api

Upgrade devfile/api and eclipse-che/che-devworkspace-generator

code/extensions/che-api/extension.webpack.config.js

@@ -16,20 +16,34 @@
 
 const withDefaults = require('../shared.webpack.config');
 const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-module.exports = withDefaults({
-	context: __dirname,
-	resolve: {
-		mainFields: ['module', 'main']
-	},
-	entry: {
-		extension: './src/extension.ts',
-	},
-	externals: {
-		'bufferutil': 'commonjs bufferutil', // ignored
-		'utf-8-validate': 'commonjs utf-8-validate', // ignored
-	},
-	plugins: [
-		new webpack.ContextReplacementPlugin(/keyv/), // needs to exclude the package to ignore warnings https://github.com/jaredwray/keyv/issues/45
-	],
+const config = withDefaults({
+    context: __dirname,
+    resolve: {
+        mainFields: ['module', 'main'],
+    },
+    entry: {
+        extension: './src/extension.ts',
+    },
+    externals: {
+        'bufferutil': 'commonjs bufferutil', // ignored
+        'utf-8-validate': 'commonjs utf-8-validate', // ignored
+    },
+    plugins: [
+        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
+                },
+            }
+        ]
+    }
+})

code/extensions/che-api/package.json

@@ -29,7 +29,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@devfile/api": "^2.2.0-alpha-1641413790",
+    "@devfile/api": "^2.3.0-1723034342",
     "axios": "0.21.2",
     "@kubernetes/client-node": "^0.19.0",
     "fs-extra": "^10.0.0",