Skip to content

Commit

Permalink
output to app folder (replaces dist folder)
Browse files Browse the repository at this point in the history
  • Loading branch information
eanders-ms committed Nov 14, 2016
1 parent 66ea762 commit d825956
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -2,6 +2,6 @@ npm-debug.log
Thumbs.db
.DS_Store
node_modules/
dist/
app/
.vscode/settings.json
install/
install/
6 changes: 3 additions & 3 deletions .vscode/launch.json
Expand Up @@ -5,13 +5,13 @@
"request": "launch",
"name": "Launch main.js",
"type": "node",
"program": "${workspaceRoot}/dist/server/main.js",
"program": "${workspaceRoot}/app/server/main.js",
"stopOnEntry": false,
"args": [
"--debug=5858"
],
"port": 5858,
"cwd": "${workspaceRoot}/dist/client",
"cwd": "${workspaceRoot}/app/client",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
// mac/linux
// "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
Expand All @@ -22,7 +22,7 @@
"ELECTRON_ENABLE_LOGGING": "true"
},
"sourceMaps": true,
"outDir": "${workspaceRoot}/dist"
"outDir": "${workspaceRoot}/app"
}
]
}
8 changes: 4 additions & 4 deletions gulpfile.js
Expand Up @@ -3,7 +3,7 @@ var clean = require('gulp-clean');
var tsc = require('gulp-tsc');

gulp.task('clean', function () {
return gulp.src('./dist/', { read: false })
return gulp.src('./app/', { read: false })
.pipe(clean());
});

Expand All @@ -17,17 +17,17 @@ gulp.task('build-app', ['clean'], function () {
noImplicitAny: false,
noImplicitThis: true,
noEmitOnError: true,
outDir: 'dist',
outDir: 'app',
additionalTscParameters: ['--jsx', 'react']
}))
.pipe(gulp.dest('dist/'));
.pipe(gulp.dest('app/'));
});

gulp.task('copy-site', ['build-app'], function () {
return gulp.src([
'./src/**/*.html',
'./src/**/*.css'])
.pipe(gulp.dest('dist/'));
.pipe(gulp.dest('app/'));
});

gulp.task('default', ['copy-site']);
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -2,7 +2,7 @@
"name": "botframework-emulator",
"version": "0.0.1",
"description": "Emulator for the Microsoft Bot Framework. Allows developers to test and debug their bots on localhost.",
"main": "./dist/server/main.js",
"main": "./app/server/main.js",
"scripts": {
"build": "gulp",
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Expand Up @@ -9,7 +9,7 @@
"noImplicitAny": false,
"noImplicitThis": true,
"noEmitOnError": true,
"outDir": "dist",
"outDir": "app",
"watch": true,
"removeComments": true,
"types": [
Expand All @@ -18,6 +18,6 @@
},
"exclude": [
"node_modules",
"dist"
"app"
]
}

0 comments on commit d825956

Please sign in to comment.