Skip to content

Setup #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 8, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor out path to build
  • Loading branch information
ShMcK committed Jun 4, 2019
commit aa1a8b8f0abf1ccf0299341eaf0567a3b90aa4ec
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ node_modules
*.vsix

# output directory
out
build
web-app/build
web-app/node_modules

2 changes: 1 addition & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.vscode/**
.vscode-test/**
out/test/**
build/test/**
src/**
.gitignore
vsc-extension-quickstart.md
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"activationEvents": [
"onCommand:coderoad.start"
],
"main": "./out/extension.js",
"main": "./build/extension.js",
"contributes": {
"commands": [
{
Expand All @@ -27,7 +27,7 @@
"vscode:prepublish": "npm run build",
"machine": "node ./out/state/index.js",
"build": "npm run compile && npm run build:web",
"build:web": "tsc -p web-app/tsconfig.json && cp -R web-app/build/ out/",
"build:web": "tsc -p web-app/tsconfig.json && cp -R web-app/build/ build/",
"compile": "tsc -p ./",
"watch": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"outDir": "out",
"outDir": "build",
"lib": [
"es6",
"dom"
Expand All @@ -28,7 +28,7 @@
"exclude": [
"node_modules",
".vscode-test",
"out",
"build",
"resources",
"web-app"
]
Expand Down
2 changes: 1 addition & 1 deletion web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build && cp -R ./build/ ../out/",
"build": "react-scripts build && cp -R ./build/ ../build/",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
Expand Down