Skip to content

Commit

Permalink
Fix bundling of monitor extension
Browse files Browse the repository at this point in the history
Remove `node/monitor` from the workspaces setup, because `vsce` is incompatible with it.
Still build the extension together with other packages.
Provide quick command to update the extension in the demo.
Update extension in demo.
Remove duplicate settings.
Fix linting setup and lint packages that were not linted.
Fix minor linting issues.
Make tsconfigs more clear.

Contributed on behalf of STMicroelectronics
  • Loading branch information
sgraband committed Jan 25, 2024
1 parent 39f7b7b commit f97c95a
Show file tree
Hide file tree
Showing 23 changed files with 4,814 additions and 1,927 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [0.10.0] - estimated 2024-04

- [.github/workflows] Improve version detection in workflows (do not build release commits, auto-detect version for demo publishing) [#280](https://github.com/eclipsesource/theia-cloud/pull/280) - contributed on behalf of STMicroelectronics
- [node] Separate `monitor` package from other workspaces to fix bundling the extension [#280](https://github.com/eclipsesource/theia-cloud/pull/280) - contributed on behalf of STMicroelectronics

## [0.9.0] - 2024-01-23

Expand Down
Binary file not shown.
Binary file not shown.
6 changes: 5 additions & 1 deletion node/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ module.exports = {
'./configs/warnings.eslintrc.json',
'./configs/errors.eslintrc.json',
],
ignorePatterns: ['**/{node_modules,lib}', 'plugins'],
parserOptions: {
tsconfigRootDir: __dirname,
project: 'tsconfig.json',
},
settings: {
"react": {
"version": "detect"
}
}
};
2 changes: 1 addition & 1 deletion node/common/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../configs/base.tsconfig.json",
"extends": "../tsconfig.json",
"include": [
"src"
],
Expand Down
8 changes: 7 additions & 1 deletion node/configs/errors.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@
"import/export": "off", // we have multiple exports due to namespaces, enums and classes that share the same name
"import/no-deprecated": "error",
// eslint-plugin-no-null
"no-null/no-null": "error"
"no-null/no-null": "error",
"import/no-unresolved": [
"error",
{
"ignore": ["vscode"]
}
]
}
}
9 changes: 2 additions & 7 deletions node/landing-page/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,8 @@ module.exports = {
env: {
node: true
},
extends: [
'plugin:vue/vue3-essential',
'eslint:recommended',
'@vue/typescript/recommended',
'@vue/prettier',
],
parser: "vue-eslint-parser",
extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/typescript/recommended', '@vue/prettier'],
parser: 'vue-eslint-parser',
parserOptions: {
ecmaVersion: 2020,
parser: '@typescript-eslint/parser'
Expand Down
4 changes: 2 additions & 2 deletions node/landing-page/vue.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
publicPath: "./"
}
publicPath: './'
};
1 change: 1 addition & 0 deletions node/monitor-theia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"clean": "rimraf lib",
"build": "tsc",
"watch": "tsc -w",
"lint": "eslint -c ../.eslintrc.js --ext .ts ./src",
"prepublishOnly": "npm run build",
"publish:next": "npm pkg set version=`npm pkg get version | head -1 | tr -d '\"'`.`git rev-parse --short HEAD` && npm publish --tag next",
"publish:latest": "npm publish --tag latest"
Expand Down
2 changes: 1 addition & 1 deletion node/monitor-theia/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../configs/base.tsconfig.json",
"extends": "../tsconfig.json",
"include": ["src"],
"compilerOptions": {
"outDir": "lib"
Expand Down
5 changes: 0 additions & 5 deletions node/monitor/.vscode/extensions.json

This file was deleted.

13 changes: 0 additions & 13 deletions node/monitor/.vscode/settings.json

This file was deleted.

14 changes: 4 additions & 10 deletions node/monitor/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
.vscode/**
.vscode-test/**
out/**
node_modules/**
.vscode
node_modules
src/**
.gitignore
package-lock.json
tsconfig.json
webpack.config.js
vsc-extension-quickstart.md
**/tsconfig.json
**/.eslintrc.json
**/*.map
**/*.ts
3 changes: 2 additions & 1 deletion node/monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ Open this folder in vscode. A `Run Extension` debug config will be available. Th

## Bundle the extension

Run `npm run bundle` to create a `vsix` file that can be installed in VSCode/Theia.
Run `npm run build:vsix` to create a `vsix` file that can be installed in VSCode/Theia.
Run `npm run update:demo:monitor` to update the `vsix` file in the `demo-theia-monitor-vscode` component.
Loading

0 comments on commit f97c95a

Please sign in to comment.