8000 Merge pull request #259 from coderoad/windows-run · ShaunSHamilton/coderoad-vscode@065df38 · GitHub
[go: up one dir, main page]
Skip to content {"props":{"docsUrl":"https://docs.github.com/get-started/accessibility/keyboard-shortcuts"}}

Commit 065df38

Browse files
ShMcKShMcK
authored
Merge pull request coderoad#259 from coderoad/windows-run
Windows run
2 parents a0cb71d + 9ec63c8 commit 065df38

File tree

12 files changed

+406
-78
lines changed

12 files changed

+406
-78
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
4141
## [0.2.2]
4242

4343
- Fixes issue where app fails on startup without a workspace, and instead returns an error page
44+
45+
## [0.2.3]
46+
47+
- Support Windows OS

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Install CodeRoad from [this link in the VSCode Marketplace](https://marketplace.
2929

3030
### Requirements
3131

32-
- OS: MacOS, Linux (Windows coming soon #227)
32+
- OS: MacOS, Windows, Linux
3333
- VSCode 1.40+
3434
- Node.js 10+
3535
- Git

‎package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "coderoad",
3-
"version": "0.2.2",
3+
"version": "0.2.3",
44
"description": "Play interactive coding tutorials in your editor",
55
"keywords": [
66
"tutorial",
@@ -58,7 +58,7 @@
5858
"vscode-test": "^1.3.0"
5959
},
6060
"engines": {
61-
"vscode": "^1.40.0"
61+
"vscode": "^1.44.0"
6262
},
6363
"activationEvents": [
6464
"onCommand:coderoad.start"

‎scripts/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ tsc -p ./
1414
cd web-app
1515
npm run build
1616
cd ..
17-
cp -R ./web-app/build/ ./build/
17+
# For Windows build: switch the next 2 lines
18+
# cp -R ./web-app/build/ ./
19+
cp -R ./web-app/build/ ./build
1820
node scripts/fixFontPaths.js
1921

2022
echo "Build complete!"

‎src/actions/utils/openFiles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const openFiles = async (files: string[]) => {
88
}
99
for (const filePath of files) {
1010
try {
11-
const workspaceFolders: vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
11+
const workspaceFolders: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
1212
if (!workspaceFolders || !workspaceFolders.length) {
1313
throw new Error('No workspace directory. Open a workspace directory and try again')
1414
}

‎src/services/dependencies/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { satisfies } from 'semver'
22
import { exec } from '../node'
33

4-
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
4+
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
55

66
export const version = async (name: string): Promise<string | null> => {
77
try {
88
const { stdout, stderr } = await exec(`${name} --version`)
99
if (!stderr) {
1010
const match = stdout.match(semverRegex)
1111
if (match) {
12-
return match[0]
12+
const parsedVersion = match[0].split('.').slice(0, 3).join('.')
13+
return parsedVersion
1314
}
1415
}
1516
return null

‎src/services/workspace/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as vscode from 'vscode'
22
import * as fs from 'fs'
33
import { promisify } from 'util'
4-
import { WORKSPACE_ROOT } from '../../environment'
4+
import * as env from '../../environment'
55

66
const readDir = promisify(fs.readdir)
77

@@ -13,7 +13,7 @@ export const openWorkspace = () => {
1313
export const checkWorkspaceEmpty = async () => {
1414
let files
1515
try {
16-
files = await readDir(WORKSPACE_ROOT)
16+
files = await readDir(env.WORKSPACE_ROOT, { encoding: 'utf8' })
1717
} catch (error) {
1818
throw new Error('Failed to check workspace')
1919
}
@@ -22,13 +22,14 @@ export const checkWorkspaceEmpty = async () => {
2222

2323
// capture the workspace root to use the users dirname in processes
2424
export const getWorkspaceRoot = (): string => {
25-
const workspaceRoots: vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
25+
const workspaceRoots: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders
2626
if (!workspaceRoots || !workspaceRoots.length) {
2727
// no workspace root
2828
return ''
2929
}
3030
// a user may have multiple workspace folders
3131
// for simplicity, assume the first is the active workspace
3232
const workspaceRoot: vscode.WorkspaceFolder = workspaceRoots[0]
33-
return workspaceRoot.uri.path
33+
34+
return workspaceRoot.uri.fsPath
3435
}

‎src/webview/render.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,18 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {
2020

2121
// set base href
2222
const base: HTMLBaseElement = document.createElement('base')
23-
base.href = `vscode-resource:${rootPath}/`
23+
base.href = `${vscode.Uri.file(path.join(rootPath, 'build')).with({ scheme: 'vscode-resource' })}`
2424

2525
document.head.appendChild(base)
2626

2727
// used for CSP
2828
const nonces: string[] = []
2929

3030
// generate vscode-resource build path uri
31-
const createUri = (filePath: string): any => {
32-
return (
33-
panel.webview
34-
// @ts-ignore
35-
.asWebviewUri(vscode.Uri.file(filePath))
36-
.toString()
37-
.replace(/^\/+/g, '') // remove leading '/'
38-
.replace('/vscode-resource%3A', rootPath)
39-
) // replace mangled resource path with root
31+
const createUri = (_filePath: string): any => {
32+
const filePath = (_filePath.startsWith('vscode') ? _filePath.substr(16) : _filePath).replace('///', '\\')
33+
34+
return panel.webview.asWebviewUri(vscode.Uri.file(path.join(rootPath, filePath)))
4035
}
4136

4237
// fix paths for scripts
@@ -55,7 +50,7 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {
5550
runTimeScript.nonce = getNonce()
5651
nonces.push(runTimeScript.nonce)
5752
const manifest = await import(path.join(rootPath, 'asset-manifest.json'))
58-
runTimeScript.src = createUri(path.join(rootPath, manifest.files['runtime-main.js']))
53+
runTimeScript.src = createUri(manifest.files['runtime-main.js'])
5954
document.body.appendChild(runTimeScript)
6055

6156
// fix paths for links

0 commit comments

Comments
 (0)
0