Skip to content

Commit ad648fb

Browse files
committed
chore(depends) Updated some npm dependencies; updated contrib doc.
1 parent ee9ba51 commit ad648fb

File tree

8 files changed

+137
-68
lines changed

8 files changed

+137
-68
lines changed

contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ In order for us to help you please check that you've completed the following ste
1313

1414
## Style Guide
1515

16-
There is a picky .jshintrc file that will be used when you run grunt. The main points are that the project uses single-quotes,
16+
There is a picky .jshintrc file, but it is not part of the build process since the move to typsescript. The main points are that the project uses single-quotes,
1717
two space indentation, multiple var statements and whitespace around arguments. Use a single space after keywords like `function`.
1818

1919
## Pull Request Guidelines
@@ -22,7 +22,7 @@ two space indentation, multiple var statements and whitespace around arguments.
2222
* Non-trivial changes should be discussed in an issue or #forms-angular on IRC first
2323
* Develop in a topic branch, not master
2424
* Add relevant tests to cover the change
25-
* Lint the code and run unit tests by running `grunt`
25+
* Build and run unit tests by running `npm test` (which just runs gulp all).
2626
* Run the end to end tests in the [website repo](https://github.com/forms-angular/website) by doing the following:
2727
* Run the website with `NODE_ENV=test` using your up to date forms-angular (`npm link` and `bower link` are useful here)
2828
* Change the port number in the relavant protractor config file(s) in test/e2e/protractor*.conf.js

dist/forms-angular-with-bs2.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/forms-angular-with-bs3.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/forms-angular.js

Lines changed: 125 additions & 33 deletions
Large diffs are not rendered by default.

dist/forms-angular.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/forms-angular.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"npm": ">=1.x"
1010
},
1111
"dependencies": {
12-
"async": "~0.9",
12+
"async": "~1",
1313
"bluebird": "^2.9.27",
1414
"body-parser": ">=0.0.1",
1515
"bower": ">= 1.x",
@@ -21,7 +21,7 @@
2121
"underscore": "~1.8.2"
2222
},
2323
"scripts": {
24-
"test": "scripts/testrun.sh"
24+
"test": "gulp all"
2525
},
2626
"main": "server/data_form.js",
2727
"repository": {
@@ -43,33 +43,18 @@
4343
],
4444
"devDependencies": {
4545
"del": "^1.1.1",
46-
"grunt": "~0.4",
47-
"grunt-angular-templates": "^0.5",
48-
"grunt-bower-task": "^0.4",
49-
"grunt-bump": "0.0.15",
50-
"grunt-concurrent": "~1",
51-
"grunt-contrib-clean": "~0.6.0",
52-
"grunt-contrib-concat": "~0.5.0",
53-
"grunt-contrib-cssmin": "~0.12",
54-
"grunt-contrib-htmlmin": "~0.4",
55-
"grunt-contrib-jshint": "~0.11",
56-
"grunt-contrib-less": "~1",
57-
"grunt-contrib-uglify": "~0.8",
58-
"grunt-karma": "~0.10",
59-
"grunt-mocha-test": "~0.12",
60-
"grunt-newer": "^1",
6146
"gulp-angular-templatecache": "^1.6.0",
6247
"gulp-clean": "^0.3.1",
6348
"gulp-concat": "^2.5.2",
6449
"gulp-karma": "0.0.4",
6550
"gulp-less": "^3.0.2",
6651
"gulp-minify-css": "^1.0.0",
6752
"gulp-mocha": "^2.1.1",
68-
"gulp-ng-annotate": "^0.5.2",
53+
"gulp-ng-annotate": "^1",
6954
"gulp-rimraf": "^0.1.1",
7055
"gulp-shell": "^0.4.0",
71-
"gulp-tsc": "^0.9.3",
72-
"gulp-umd": "^0.1.3",
56+
"gulp-tsc": "^0.10",
57+
"gulp-umd": "^0.2",
7358
"jasmine-core": "^2.2.0",
7459
"karma": "~0.12",
7560
"karma-jasmine": "^0.3",

scripts/testrun.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)