Always build TypeScript in `lib/`

diff --git a/.gitignore b/.gitignore
index 2cda856f0c9cb90c4f61c341fb651800bbcc836c..0825b43af34f201b5231c8be16c7f7bc6e1ca3ba 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 node_modules/
 *.swp
 .lock-wscript
-out/
 lib/
 Makefile.gyp
 *.Makefile

diff --git a/bin/build b/bin/build
index 2def2c2b7d785a19fbbc6f7c3c0a5eea64b8ad90..c76dd7c3ce056bf258394dc5363780856c9916c7 100755 (executable)
--- a/bin/build
+++ b/bin/build
@@ -9,14 +9,14 @@ BUILD_DIR=${BUILD_DIR:=build}
 mkdir -p $BUILD_DIR
 
 
-# Clean out/* to prevent confusion if files were deleted in src/
-rm -rf out/*
+# Clean lib/* to prevent confusion if files were deleted in src/
+rm -rf lib/*
 
-# Build all TypeScript files (including tests) to out/
+# Build all TypeScript files (including tests) to lib/
 tsc
 
 # Concat all xterm.js files into a single file and output as a UMD to $BUILD_DIR/xterm.js
-browserify ./out/xterm.js --standalone Terminal --debug --outfile ./$BUILD_DIR/xterm.js
+browserify ./lib/xterm.js --standalone Terminal --debug --outfile ./$BUILD_DIR/xterm.js
 cat ./$BUILD_DIR/xterm.js | exorcist ./$BUILD_DIR/xterm.js.map -b ./$BUILD_DIR > ./$BUILD_DIR/xterm.temp.js
 rm ./$BUILD_DIR/xterm.js
 mv ./$BUILD_DIR/xterm.temp.js ./$BUILD_DIR/xterm.js
@@ -29,7 +29,7 @@ cd src
 find . -name '*.css' | cpio -pdm ../$BUILD_DIR
 cd ..
 
-# Copy addons from out/ to $BUILD_DIR/
-cd out/addons
+# Copy addons from lib/ to $BUILD_DIR/
+cd lib/addons
 find . -name '*.js' | cpio -pdm ../../$BUILD_DIR/addons
 cd ../..

diff --git a/package.json b/package.json
index 6e7bdd32238643d8267dd5a7d444a4300fd75bc5..cd83738398e1fa648c48c283553671131193b218 100644 (file)
--- a/package.json
+++ b/package.json
@@ -36,6 +36,6 @@
     "test": "mocha --recursive ./lib",
     "build:docs": "jsdoc -c jsdoc.json",
     "build": "./bin/build",
-    "prepublish": "tsc --outDir lib"
+    "prepublish": "tsc"
   }
 }

diff --git a/tsconfig.json b/tsconfig.json
index 01e72bc14d43f77d9d8cdcdd5c60420e16126241..f4a5a1b2a202eeb01629541b09d0b7700dede4af 100644 (file)
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
     "target": "es5",
     "rootDir": "src",
     "allowJs": true,
-    "outDir": "out",
+    "outDir": "lib",
     "sourceMap": true
   },
   "exclude": [