Skip to content

Commit

Permalink
Merge f91db14 into 536ccf1
Browse files Browse the repository at this point in the history
  • Loading branch information
from-the-river-to-the-sea committed Dec 7, 2018
2 parents 536ccf1 + f91db14 commit 6bd0147
Show file tree
Hide file tree
Showing 26 changed files with 8,482 additions and 2,559 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
bower_components
coverage
node_modules
dist
/packages/nodecg-widget-obs/test/mock-nodecg.js
7,214 changes: 6,045 additions & 1,169 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"private": true,
"devDependencies": {
"@supportclass/tsconfig-nodecg-client": "^1.0.2",
"@supportclass/tsconfig-nodecg-server": "^1.0.2",
"@types/clone": "^0.1.30",
"copyfiles": "^1.2.0",
"coveralls": "^2.13.1",
"del": "^3.0.0",
Expand All @@ -11,8 +14,11 @@
"fs-extra": "^4.0.1",
"lerna": "^2.0.0",
"make-dir": "^1.0.0",
"nodecg": "^1.3.0",
"nyc": "^11.0.3",
"sinon": "^3.0.0",
"tslib": "^1.9.3",
"typescript": "^3.2.1",
"weallbehave": "^1.2.0",
"weallcontribute": "^1.0.8"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/nodecg-obs-scene/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"polymer": "Polymer/polymer#^2.0.0"
},
"devDependencies": {
"test-fixture": "PolymerElements/test-fixture#3.0.0-rc.1",
"web-component-tester": "Lange/web-component-tester#patch-1",
"test-fixture": "PolymerElements/test-fixture#3.0.0",
"web-component-tester": "Lange/web-component-tester#19a719f1d845bbc61d0af99a43f4147bd8da00e5",
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
"mock-nodecg": "nodecg/mock-nodecg#^1.6.0"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/nodecg-utility-obs/dist/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export {};
//# sourceMappingURL=index.d.ts.map
1 change: 1 addition & 0 deletions packages/nodecg-utility-obs/dist/index.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6bd0147

Please sign in to comment.