Fixed review comments, added version reporting to all build steps in GHA

TypeFox · Jun 4, 2024 · 69f1d52 · 69f1d52
1 parent e1f8ac8
commit 69f1d52
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -35,16 +35,19 @@ jobs:
     - name: Lint
       shell: bash
       run: |
+        npm run report:versions
         npm run lint
 
     - name: Build
       shell: bash
       run: |
+        npm run report:versions
         npm run build
 
     - name: Test
       shell: bash
       run: |
+        npm run report:versions
         npm run test:run
 
     - name: Build production

diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "vite:preview": "vite preview",
     "dev": "vite",
     "dev:debug": "vite --debug --force",
-    "report:versions": "echo Reporting versions: && echo tsc: && tsc --version && echo npm: && npm --version && echo node: && node --version",
-    "build": "npm run report:versions && npm run build --workspaces",
+    "report:versions": "echo Reporting versions: && echo tsc: && tsc --version && echo npm: && npm --version && echo node: && node --version && echo eslint: && eslint --version && echo vite: && vite --version  && echo vitest: && vitest --version",
+    "build": "npm run build --workspaces",
     "build:client": "npm run build --workspace packages/client",
     "build:vscode-ws-jsonrpc": "npm run build --workspace packages/vscode-ws-jsonrpc",
     "build:examples": "npm run build --workspace packages/examples",

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -20,7 +20,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
     protected readonly connectionProvider: IConnectionProvider;
 
     constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClientOptions) {
-        super((id ?? 'unknown-id') || name.toLowerCase(), name, clientOptions);
+        super(id ?? name.toLowerCase(), name, clientOptions);
         this.connectionProvider = connectionProvider;
     }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -38,8 +38,7 @@
     "**/test/**/*.tsx",
     "**/packages/*/*.ts",
     "**/packages/*/*.js",
-    "**/resources/**/*.mts",
-    "**/resources/**/*.mjs",
+    "**/build/**/*.mts",
     "*.js",
     "*.ts",
   ],