Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: revert back pull request #396 #425

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: revert back pull request #396 #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions code/extensions/che-api/extension.webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

const withDefaults = require('../shared.webpack.config');
const webpack = require('webpack');
const { merge } = require('webpack-merge');

const config = withDefaults({
context: __dirname,
Expand All @@ -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
},
}
]
}
})
2 changes: 1 addition & 1 deletion code/extensions/che-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion code/extensions/che-commands/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 0 additions & 14 deletions code/extensions/che-github-authentication/extension.webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

const withDefaults = require('../shared.webpack.config');
const webpack = require('webpack');
const { merge } = require('webpack-merge');

const config = withDefaults({
context: __dirname,
Expand All @@ -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
},
}
]
}
})
2 changes: 1 addition & 1 deletion code/extensions/che-github-authentication/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion code/extensions/che-port/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"reflect-metadata": "^0.2.2",
"fs-extra": "^11.2.0",
"vscode-nls": "^5.0.0",
"@devfile/api": "^2.3.0-1723034342"
"@devfile/api": "^2.2.0-alpha-1641413790"
},
"devDependencies": {
"jest": "27.3.1",
Expand Down
8 changes: 3 additions & 5 deletions code/extensions/che-port/src/devfile-handler-devworkspace-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { EndpointCategory } from './endpoint-category';
import { EndpointExposure } from './endpoint-exposure';
import {
V1alpha2DevWorkspaceSpecTemplate,
V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpointsExposureEnum
V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpoints
} from '@devfile/api';
import * as vscode from 'vscode';

Expand Down Expand Up @@ -56,13 +56,11 @@ export class DevWorkspaceDevfileHandlerImpl implements DevfileHandler {
)
.reduce((acc, val) => acc.concat(val), []);

const publicExposureEndpoint: V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpointsExposureEnum = 'public';
const internalExposureEndpoint: V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpointsExposureEnum = 'internal';
const endpoints = devfileEndpoints.map(exposedEndpoint => {
let exposure: EndpointExposure;
if (exposedEndpoint.exposure === publicExposureEndpoint) {
if (exposedEndpoint.exposure === V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpoints.ExposureEnum.Public) {
exposure = EndpointExposure.FROM_DEVFILE_PUBLIC;
} else if (exposedEndpoint.exposure === internalExposureEndpoint) {
} else if (exposedEndpoint.exposure === V1alpha2DevWorkspaceSpecTemplateComponentsItemsContainerEndpoints.ExposureEnum.Internal) {
exposure = EndpointExposure.FROM_DEVFILE_PRIVATE;
} else {
exposure = EndpointExposure.FROM_DEVFILE_NONE;
Expand Down
2 changes: 1 addition & 1 deletion code/extensions/che-remote/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"vscode-nls": "^5.0.0",
"axios": "^1.7.4",
"@eclipse-che/che-devworkspace-generator": "7.90.0-1a2253f",
"@eclipse-che/che-devworkspace-generator": "7.88.0-next-a2e5c63",
"https": "^1.0.0",
"js-yaml": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/extensions/che-resource-monitor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"lint:fix": "eslint --fix --cache=true --no-error-on-unmatched-pattern=true \"{src,tests}/**/*.{ts,tsx}\""
},
"dependencies": {
"@devfile/api": "^2.3.0-1723034342",
"@devfile/api": "^2.2.0-alpha-1641413790",
"@kubernetes/client-node": "^0.22.0",
"got": "11.8.0",
"inversify": "^6.0.2",
Expand Down
Loading