fix: Added Open VSX build (#914) (#963)

Co-authored-by: Chris Johnston <chris@johnstoncode.com>

Author: edgardmessias

.github/workflows/main.yml

@@ -68,6 +68,21 @@ jobs:
           GIT_AUTHOR_NAME: ${{ secrets.gitName }}
           GIT_COMMITTER_NAME: ${{ secrets.gitName }}
 
+      - name: Release Open VSX
+        if: startsWith(matrix.os, 'ubuntu') && matrix.version == 'stable' && github.ref == 'refs/heads/master' && github.repository == 'JohnstonCode/svn-scm'
+        run: |
+          yarn add iconv-lite jschardet
+          npx vsce package -o svn-scm-ovsx.vsix
+          npx ovsx publish svn-scm-ovsx.vsix -p ${{ secrets.ovsxToken }}
+
+      - name: Upload Open VSX to release
+        if: startsWith(matrix.os, 'ubuntu') && matrix.version == 'stable' && github.ref == 'refs/heads/master' && github.repository == 'JohnstonCode/svn-scm'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.githubToken }}
+          file: svn-scm-ovsx.vsix
+          tag: ${{ github.ref }}
+
   eslint:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
@@ -113,3 +128,14 @@ jobs:
         with:
           name: "svn-scm-${{ github.sha }}.vsix"
           path: "svn-scm.vsix"
+
+      - name: Package open-vsx extension
+        run: |
+          yarn add iconv-lite jschardet
+          npx vsce package -o svn-scm-ovsx.vsix
+
+      - name: Upload open-vsx artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: "svn-scm-ovsx-${{ github.sha }}.vsix"
+          path: "svn-scm-ovsx.vsix"

.vscodeignore

@@ -23,7 +23,6 @@ vsc-extension-quickstart.md
 .dependabot/**
 images/docs/**
 bin
-node_modules
 webpack.config.js
 
 out/**

package.json

@@ -49,15 +49,7 @@
         "vscode:prepublish": "yarn run lint && yarn run build",
         "watch:css": "yarn run build:css -w"
     },
-    "dependencies": {
-        "chardet": "^1.2.1",
-        "dayjs": "^1.8.32",
-        "minimatch": "^3.0.4",
-        "original-fs": "^1.0.0",
-        "semver": "^7.2.1",
-        "tmp": "0.2.1",
-        "xml2js": "^0.4.19"
-    },
+    "dependencies": {},
     "devDependencies": {
         "@semantic-release/changelog": "^5.0.1",
         "@semantic-release/git": "^9.0.0",
@@ -70,24 +62,32 @@
         "@types/xml2js": "^0.4.4",
         "@typescript-eslint/eslint-plugin": "^3.8.0",
         "@typescript-eslint/parser": "^3.8.0",
+        "chardet": "^1.2.1",
+        "dayjs": "^1.8.32",
         "decache": "^4.6.0",
         "eslint": "^7.6.0",
         "eslint-config-prettier": "^6.11.0",
         "eslint-plugin-prettier": "^3.1.4",
         "glob": "^7.1.4",
         "iconv-lite-umd": "0.6.8",
         "milligram": "^1.4.1",
+        "minimatch": "^3.0.4",
         "mocha": "^8.1.1",
         "node-sass": "^4.14.1",
+        "original-fs": "^1.0.0",
+        "ovsx": "^0.1.0-next.dacd2fd",
         "prettier": "^2.0.5",
         "prettylint": "^1.0.0",
         "semantic-release": "^17.1.1",
         "semantic-release-vsce": "^3.0.1",
+        "semver": "^7.2.1",
+        "tmp": "0.2.1",
         "ts-loader": "^8.0.2",
         "typescript": "^3.9.7",
         "vscode-test": "^1.4.0",
         "webpack": "^4.44.1",
-        "webpack-cli": "^3.3.12"
+        "webpack-cli": "^3.3.12",
+        "xml2js": "^0.4.19"
     },
     "config": {
         "commitizen": {

src/vscodeModules.ts

@@ -11,22 +11,29 @@ function getNodeModule<T>(moduleName: string, showError = true): T | undefined {
     typeof __webpack_require__ === "function"
       ? __non_webpack_require__
       : require;
-  try {
-    return r(`${env.appRoot}/node_modules.asar/${moduleName}`);
-  } catch (err) {
-    // Not in ASAR.
-  }
-  try {
-    return r(`${env.appRoot}/node_modules/${moduleName}`);
-  } catch (err) {
-    if (showError) {
-      window.showErrorMessage(`Missing dependency: ${moduleName}`);
+
+  const paths = [
+    `${env.appRoot}/node_modules.asar/${moduleName}`,
+    `${env.appRoot}/node_modules/${moduleName}`,
+    moduleName
+  ];
+
+  for (const p of paths) {
+    try {
+      return r(p);
+    } catch (err) {
+      // Not in path.
     }
   }
+
+  if (showError) {
+    window.showErrorMessage(`Missing dependency: ${moduleName}`);
+  }
+
   return undefined;
 }
 
-export const keytar = getNodeModule("keytar") as typeof import("keytar");
+export const keytar = getNodeModule("keytar", false) as typeof import("keytar");
 
 let iconv_lite = getNodeModule(
   "iconv-lite-umd",