Merge pull request #185 from uqbar-project/project-cleanup

Project cleanup
uqbar-project · Sep 27, 2024 · 970e6a7 · 970e6a7
2 parents 737a6f8 + 8f44751
commit 970e6a7
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 58 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -4,65 +4,73 @@
 name: Node.js CI
 
 on:
-  push: 
+  push:
     branches:
       - master
   pull_request:
 
-
 jobs:
   test:
     runs-on: ${{ matrix.os }}
 
     strategy:
-        matrix:
-            os: [windows-latest, ubuntu-latest, macos-latest]
-            node-version: [lts/hydrogen]
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        node-version: [lts/hydrogen]
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn compile-tests
-    - name: Run e2e test
-      if: matrix.os != 'ubuntu-latest'
-      uses: coactions/setup-xvfb@v1
-      with:
-        run: yarn test-with-coverage:e2e
-    - name: Run unit tests
-      run: yarn test-with-coverage:unit
-    - name: Update server coverage badge
-      uses: codecov/codecov-action@v4
-      if: matrix.os == 'ubuntu-latest'
-      with:
-        files: ./server/coverage/coverage-final.json
-        verbose: true
-        flags: lsp-ide-server
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Update client coverage badge
-      uses: codecov/codecov-action@v3
-      if: matrix.os == 'windows-latest'
-      with:
-        files: ./client/coverage/coverage-final.json
-        verbose: true
-        flags: lsp-ide-client
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}  
-    - name: Generate VSIX file
-      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
-      run: |
-        yarn package
-    - name: Add VSIX to the latest release
-      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "draft"
-        prerelease: true
-        title: "Draft"
-        files: |
-          ./*.vsix
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn
+      - run: yarn compile-tests
+      - name: Run e2e test
+        if: matrix.os != 'ubuntu-latest'
+        uses: coactions/setup-xvfb@v1
+        with:
+          run: yarn test-with-coverage:e2e
+      - name: Run unit tests
+        run: yarn test-with-coverage:unit
+      - name: Update server coverage badge
+        uses: codecov/codecov-action@v4
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          files: ./packages/server/coverage/coverage-final.json
+          verbose: true
+          flags: lsp-ide-server
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Update client coverage badge
+        uses: codecov/codecov-action@v3
+        if: matrix.os == 'windows-latest'
+        with:
+          files: ./packages/client/coverage/coverage-final.json
+          verbose: true
+          flags: lsp-ide-client
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Update debugger coverage badge
+        uses: codecov/codecov-action@v4
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          files: ./packages/debug-adapter/coverage/coverage-final.json
+          verbose: true
+          flags: debug-adapter
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Generate VSIX file
+        if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
+        run: |
+          yarn package
+      - name: Add VSIX to the latest release
+        if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
+        uses: 'marvinpinto/action-automatic-releases@latest'
+        with:
+          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          automatic_release_tag: 'draft'
+          prerelease: true
+          title: 'Draft'
+          files: |
+            ./*.vsix
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 # Wollok IDE
 
-![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/uqbar.wollok-lsp-ide?label=Visual%20Studio%20Code%20marketplace&color=blue) [![Node.js CI](https://github.com/uqbar-project/wollok-lsp-ide/actions/workflows/node.js.yml/badge.svg)](https://github.com/uqbar-project/wollok-lsp-ide/actions/workflows/node.js.yml)&nbsp;&nbsp;![server label](https://img.shields.io/badge/server-red) [![server coverage](https://codecov.io/gh/uqbar-project/wollok-lsp-ide/branch/master/graph/badge.svg?token=OT11UZ38OM&flag=lsp-ide-server)](https://codecov.io/gh/uqbar-project/wollok-lsp-ide)&nbsp;&nbsp;![server label](https://img.shields.io/badge/client-blue) [![client coverage](https://codecov.io/gh/uqbar-project/wollok-lsp-ide/branch/master/graph/badge.svg?token=OT11UZ38OM&flag=lsp-ide-client)](https://codecov.io/gh/uqbar-project/wollok-lsp-ide) ![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/uqbar.wollok-lsp-ide) ![GitHub License](https://img.shields.io/github/license/uqbar-project/wollok-lsp-ide)
+![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/uqbar.wollok-lsp-ide?label=Visual%20Studio%20Code%20marketplace&color=blue) [![Node.js CI](https://github.com/uqbar-project/wollok-lsp-ide/actions/workflows/node.js.yml/badge.svg)](https://github.com/uqbar-project/wollok-lsp-ide/actions/workflows/node.js.yml)&nbsp;&nbsp;![server label](https://img.shields.io/badge/server-red) [![server coverage](https://codecov.io/gh/uqbar-project/wollok-lsp-ide/branch/master/graph/badge.svg?token=OT11UZ38OM&flag=lsp-ide-server)](https://codecov.io/gh/uqbar-project/wollok-lsp-ide)&nbsp;&nbsp;![debugger label](https://img.shields.io/badge/debugger-cyan) [![debugger coverage](https://codecov.io/gh/uqbar-project/wollok-lsp-ide/branch/master/graph/badge.svg?token=OT11UZ38OM&flag=debug-adapter)](https://codecov.io/gh/uqbar-project/wollok-lsp-ide)&nbsp;&nbsp;![client label](https://img.shields.io/badge/client-blue) [![client coverage](https://codecov.io/gh/uqbar-project/wollok-lsp-ide/branch/master/graph/badge.svg?token=OT11UZ38OM&flag=lsp-ide-client)](https://codecov.io/gh/uqbar-project/wollok-lsp-ide) ![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/uqbar.wollok-lsp-ide) ![GitHub License](https://img.shields.io/github/license/uqbar-project/wollok-lsp-ide)
 
 
 Starting from [LSP sample code](https://code.visualstudio.com/api/language-extensions/language-server-extension-guide) for Visual Studio Code, we developed a couple of tools for Wollok using Language Server Protocol (for Visual Studio Code, IntelliJ, Eclipse, Atom, etc.)

diff --git a/package.json b/package.json
@@ -319,6 +319,9 @@
     "prepare": "husky install",
     "lint-staged": "lint-staged"
   },
+  "dependencies": {
+    "wollok-ts": "4.1.6"
+  },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.53.0",
     "@typescript-eslint/parser": "^5.53.0",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -9,8 +9,7 @@
     "url": "https://github.com/uqbar-project/wollok-lsp-ide"
   },
   "dependencies": {
-    "wollok-debug-adapter": "workspace:^",
-    "wollok-ts": "4.1.6"
+    "wollok-debug-adapter": "workspace:^"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.1",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -14,8 +14,7 @@
     "rxjs": "^7.8.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11",
-    "winston": "^3.11.0",
-    "wollok-ts": "4.1.6"
+    "winston": "^3.11.0"
   },
   "scripts": {
     "test": "yarn ts-mocha -p ../../tsconfig.json --config ./.mocharc.js",

diff --git a/yarn.lock b/yarn.lock
@@ -8604,7 +8604,6 @@ __metadata:
     sinon: "npm:^15.0.3"
     vscode-languageclient: "npm:^9.0.1"
     wollok-debug-adapter: "workspace:^"
-    wollok-ts: "npm:4.1.6"
   languageName: unknown
   linkType: soft
 
@@ -8626,7 +8625,6 @@ __metadata:
     vscode-languageserver: "npm:^9.0.1"
     vscode-languageserver-textdocument: "npm:^1.0.11"
     winston: "npm:^3.11.0"
-    wollok-ts: "npm:4.1.6"
   languageName: unknown
   linkType: soft
 
@@ -8644,6 +8642,7 @@ __metadata:
     rimraf: "npm:^6.0.1"
     ts-node: "npm:^10.9.1"
     typescript: "npm:^4.9.5"
+    wollok-ts: "npm:4.1.6"
     yarn-run-all: "npm:^3.1.1"
   languageName: unknown
   linkType: soft