Merge pull request #259 from coderoad/windows-run

Windows run

Author: ShMcK

CHANGELOG.md

@@ -41,3 +41,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## [0.2.2]
 
 - Fixes issue where app fails on startup without a workspace, and instead returns an error page
+
+## [0.2.3]
+
+- Support Windows OS

README.md

@@ -29,7 +29,7 @@ Install CodeRoad from [this link in the VSCode Marketplace](https://marketplace.
 
 ### Requirements
 
-- OS: MacOS, Linux (Windows coming soon #227)
+- OS: MacOS, Windows, Linux
 - VSCode 1.40+
 - Node.js 10+
 - Git

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coderoad",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Play interactive coding tutorials in your editor",
   "keywords": [
     "tutorial",
@@ -58,7 +58,7 @@
     "vscode-test": "^1.3.0"
   },
   "engines": {
-    "vscode": "^1.40.0"
+    "vscode": "^1.44.0"
   },
   "activationEvents": [
     "onCommand:coderoad.start"

package.json

@@ -14,7 +14,9 @@ tsc -p ./
 cd web-app
 npm run build
 cd ..
-cp -R ./web-app/build/ ./build/
+# For Windows build: switch the next 2 lines
+# cp -R ./web-app/build/ ./
+cp -R ./web-app/build/ ./build
 node scripts/fixFontPaths.js
 
 echo "Build complete!"

scripts/build.sh

@@ -8,7 +8,7 @@ const openFiles = async (files: string[]) => {
   }
   for (const filePath of files) {
     try {
-      const workspaceFolders: vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
+      const workspaceFolders: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
       if (!workspaceFolders || !workspaceFolders.length) {
         throw new Error('No workspace directory. Open a workspace directory and try again')
       }

src/actions/utils/openFiles.ts

@@ -1,15 +1,16 @@
 import { satisfies } from 'semver'
 import { exec } from '../node'
 
-const semverRegex = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/gi
+const semverRegex = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(\.windows.[0-9]+)?(?=$|\s)/gi
 
 export const version = async (name: string): Promise<string | null> => {
   try {
     const { stdout, stderr } = await exec(`${name} --version`)
     if (!stderr) {
       const match = stdout.match(semverRegex)
       if (match) {
-        return match[0]
+        const parsedVersion = match[0].split('.').slice(0, 3).join('.')
+        return parsedVersion
       }
     }
     return null

src/services/dependencies/index.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import { promisify } from 'util'
-import { WORKSPACE_ROOT } from '../../environment'
+import * as env from '../../environment'
 
 const readDir = promisify(fs.readdir)
 
@@ -13,7 +13,7 @@ export const openWorkspace = () => {
 export const checkWorkspaceEmpty = async () => {
   let files
   try {
-    files = await readDir(WORKSPACE_ROOT)
+    files = await readDir(env.WORKSPACE_ROOT, { encoding: 'utf8' })
   } catch (error) {
     throw new Error('Failed to check workspace')
   }
@@ -22,13 +22,14 @@ export const checkWorkspaceEmpty = async () => {
 
 // capture the workspace root to use the users dirname in processes
 export const getWorkspaceRoot = (): string => {
-  const workspaceRoots: vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
+  const workspaceRoots: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
   if (!workspaceRoots || !workspaceRoots.length) {
     // no workspace root
     return ''
   }
   // a user may have multiple workspace folders
   // for simplicity, assume the first is the active workspace
   const workspaceRoot: vscode.WorkspaceFolder = workspaceRoots[0]
-  return workspaceRoot.uri.path
+
+  return workspaceRoot.uri.fsPath
 }

src/services/workspace/index.ts

@@ -20,23 +20,18 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {
 
     // set base href
     const base: HTMLBaseElement = document.createElement('base')
-    base.href = `vscode-resource:${rootPath}/`
+    base.href = `${vscode.Uri.file(path.join(rootPath, 'build')).with({ scheme: 'vscode-resource' })}`
 
     document.head.appendChild(base)
 
     // used for CSP
     const nonces: string[] = []
 
     // generate vscode-resource build path uri
-    const createUri = (filePath: string): any => {
-      return (
-        panel.webview
-          // @ts-ignore
-          .asWebviewUri(vscode.Uri.file(filePath))
-          .toString()
-          .replace(/^\/+/g, '') // remove leading '/'
-          .replace('/vscode-resource%3A', rootPath)
-      ) // replace mangled resource path with root
+    const createUri = (_filePath: string): any => {
+      const filePath = (_filePath.startsWith('vscode') ? _filePath.substr(16) : _filePath).replace('///', '\\')
+
+      return panel.webview.asWebviewUri(vscode.Uri.file(path.join(rootPath, filePath)))
     }
 
     // fix paths for scripts
@@ -55,7 +50,7 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {
     runTimeScript.nonce = getNonce()
     nonces.push(runTimeScript.nonce)
     const manifest = await import(path.join(rootPath, 'asset-manifest.json'))
-    runTimeScript.src = createUri(path.join(rootPath, manifest.files['runtime-main.js']))
+    runTimeScript.src = createUri(manifest.files['runtime-main.js'])
     document.body.appendChild(runTimeScript)
 
     // fix paths for links