Skip to content

Commit

Permalink
chore: upgrade from depracated tsd
Browse files Browse the repository at this point in the history
 - switch to typings
 - remove webpack settings that are no longer needed
 - update readme
  • Loading branch information
vanessayuenn committed Feb 19, 2016
1 parent 2d66558 commit 677f5ac
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 63 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ keys.md
ref
NOTES.md

typings/*
!typings/tsd.d.ts
example-apps/todo-mvc-example/jspm_packages/*
example-apps/todo-mvc-example/typings/*
typings

key.pem
*.crx
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ To develop this extension, the following environment is used:

* Node v4.2.1
* NPM 3.3.10
* TypeScript 1.6.2
* tsd 0.6.5

In addition, example applications all run with a globablly installed version of jspm 0.16.12.
* TypeScript 1.7.5
* typings 0.6.8

## Trying out the extension

Expand All @@ -57,9 +55,7 @@ To execute all unit tests, run `npm test`. It bundles up all files that match `*
- `build` Build the extension
- `webpack` Run webpack
- `clean` Clean `node_modules` and `typings`,
- `remove-tsd-loader-typings` Remove tsd loader typings
- `tsd-update` Update tsd
- `postinstall` Update tsd and install/link typings
- `postinstall` install typings
- `start` Clean build and run webpack in watch mode
- `test` Bundle all *.test.ts and run it through a headless browser
- `prepack` Run npm build before running npm pack
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
"build": "npm run webpack --colors --display-error-details --display-cached",
"webpack": "webpack",
"clean": "rimraf node_modules typings",
"remove-tsd-loader-typings": "rimraf node_modules/typescript-simple-loader/typescript-simple-loader.d.ts",
"tsd-update": "npm run remove-tsd-loader-typings && tsd reinstall --overwrite",
"postinstall": "npm run tsd-update && tsd install && tsd link",
"postinstall": "typings install",
"start": "rimraf build && webpack --watch",
"test": "webpack --config webpack.test.config.js && browserify build/test.js | tape-run | tap-spec",
"prepack": "npm run build",
Expand Down Expand Up @@ -60,9 +58,9 @@
"tape": "^4.2.2",
"tape-run": "^2.1.0",
"ts-loader": "^0.8.1",
"tsd": "^0.6.5",
"tslint-loader": "^1.0.2",
"typescript": "^1.7.5",
"typings": "^0.6.8",
"url-loader": "^0.5.6",
"webpack": "1.12.2",
"webpack-dev-server": "1.12.0"
Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"exclude": [
"node_modules",
"example-apps",
"build"
"build",
"typings/main.d.ts",
"typings/main"
]
}
30 changes: 0 additions & 30 deletions tsd.json

This file was deleted.

18 changes: 18 additions & 0 deletions typings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "batarangle",
"ambientDependencies": {
"MediaStream": "github:DefinitelyTyped/DefinitelyTyped/webrtc/MediaStream.d.ts#62eedc3121a5e28c50473d2e4a9cefbcb9c3957f",
"chrome": "github:DefinitelyTyped/DefinitelyTyped/chrome/chrome.d.ts#62eedc3121a5e28c50473d2e4a9cefbcb9c3957f",
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
"filesystem": "github:DefinitelyTyped/DefinitelyTyped/filesystem/filesystem.d.ts#62eedc3121a5e28c50473d2e4a9cefbcb9c3957f",
"filewriter": "github:DefinitelyTyped/DefinitelyTyped/filewriter/filewriter.d.ts#62eedc3121a5e28c50473d2e4a9cefbcb9c3957f",
"ng2": "github:gdi2290/typings-ng2/ng2.d.ts#32998ff5584c0eab0cd9dc7704abb1c5c450701c",
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#263705d313346e093d95cb62cef6fed848e46978",
"tape": "github:DefinitelyTyped/DefinitelyTyped/tape/tape.d.ts#c2c22c3b953fe9730d4802022d5e0d18d083909e",
"webpack": "github:DefinitelyTyped/DefinitelyTyped/webpack/webpack.d.ts#95c02169ba8fa58ac1092422efbd2e3174a206f4",
"zone.js": "github:DefinitelyTyped/DefinitelyTyped/zone.js/zone.js.d.ts#c393f8974d44840a6c9cc6d5b5c0188a8f05143d"
},
"dependencies": {
"es6-promise": "github:typed-typings/npm-es6-promise#fb04188767acfec1defd054fc8024fafa5cd4de7"
}
}
11 changes: 0 additions & 11 deletions typings/tsd.d.ts

This file was deleted.

7 changes: 1 addition & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ module.exports = {
test: /\.ts$/,
loader: 'ts',
query: {
'ignoreDiagnostics': [
2403, // 2403 -> Subsequent variable declarations
2300, // 2300 -> Duplicate identifier
2374, // 2374 -> Duplicate number index signature
2375 // 2375 -> Duplicate string index signature
]
'ignoreDiagnostics': []
},
exclude: [
/\.min\.js$/,
Expand Down

0 comments on commit 677f5ac

Please sign in to comment.