Skip to content

Commit

Permalink
Ignore compiled JS files (#294)
Browse files Browse the repository at this point in the history
  • Loading branch information
HoldYourWaffle authored and domoritz committed May 31, 2019
1 parent 2c07667 commit fbaad9d
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 1,223 deletions.
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Please:
- [ ] Do not include the compiled `.js`, `.js.map`, or `.d.ts` in your pull request as it makes it harder to merge your changes.
- [ ] Make your pull request atomic, fixing one issue at a time unless there are many relevant issues that cannot be decoupled.
- [ ] Provide a test case & update the documentation in the `Readme.md`
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ yarn-error.log
.idea
*~
.#*
dist/
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "typescript-json-schema",
"version": "0.38.1",
"description": "typescript-json-schema generates JSON Schema files from your Typescript sources",
"main": "typescript-json-schema.js",
"typings": "typescript-json-schema.d.ts",
"main": "dist/typescript-json-schema.js",
"typings": "dist/typescript-json-schema.d.ts",
"bin": {
"typescript-json-schema": "./bin/typescript-json-schema"
},
Expand Down Expand Up @@ -65,7 +65,8 @@
"tslint": "^5.16.0"
},
"scripts": {
"test": "npm run build && mocha -t 5000 --require source-map-support/register test",
"prepublishOnly": "npm run build",
"test": "npm run build && mocha -t 5000 --require source-map-support/register dist/test",
"debug": "ts-node --inspect=19248 --debug-brk typescript-json-schema-cli.ts",
"run": "ts-node typescript-json-schema-cli.ts",
"build": "tsc -p .",
Expand Down
3 changes: 1 addition & 2 deletions test/error.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { assert } from "chai";
import { exec, getDefaultArgs } from "../typescript-json-schema";
import * as path from "path";

describe("error", () => {
it("error-check", () => {
assert.throws(() => {
// This needs a valid path. "dates" chosen basically at random
exec(path.resolve(__dirname, "./programs/dates/"), "MyObject", getDefaultArgs());
exec("test/programs/dates/", "MyObject", getDefaultArgs());
}, Error, "No output definition. Probably caused by errors prior to this?");
});
});
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"target": "es5",
"module": "commonjs",
"moduleResolution": "node",
"outDir": "dist",
"isolatedModules": false,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
Expand All @@ -28,7 +29,8 @@
"exclude": [
"node_modules",
"example",
"test/programs"
"test/programs",
"dist"
],
"compileOnSave": true,
"buildOnSave": false
Expand Down
1 change: 0 additions & 1 deletion typescript-json-schema-cli.d.ts

This file was deleted.

72 changes: 0 additions & 72 deletions typescript-json-schema-cli.js

This file was deleted.

1 change: 0 additions & 1 deletion typescript-json-schema-cli.js.map

This file was deleted.

112 changes: 0 additions & 112 deletions typescript-json-schema.d.ts

This file was deleted.

Loading

0 comments on commit fbaad9d

Please sign in to comment.