Skip to content

Commit

Permalink
Merge branch '1.x-legacy' into merge-1.x-legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
chasenlehara committed Jul 4, 2018
2 parents a24294b + 7f8732a commit eb4edb4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ build.js
.jshintrc
.editorconfig
/.idea/
/test/
1 change: 1 addition & 0 deletions build.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"use strict";
var stealTools = require("steal-tools");

stealTools.export({
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "can-ajax",
"version": "2.0.0",
"description": "jQuery-inspired AJAX request library.",
"homepage": "",
"homepage": "https://canjs.com/doc/can-ajax.html",
"repository": {
"type": "git",
"url": "git://github.com/canjs/can-ajax.git"
Expand All @@ -16,15 +16,15 @@
"scripts": {
"preversion": "npm test && npm run build",
"version": "git commit -am \"Update version number\" && git checkout -b release && git add -f dist/",
"postpublish": "git push --tags && git checkout master && git branch -D release && git push",
"postpublish": "git push --tags && git checkout - && git branch -D release && git push",
"testee": "testee test.html --browsers firefox",
"test": "npm run detect-cycle && npm run jshint && npm run testee",
"jshint": "jshint ./*.js --config",
"release:patch": "npm version patch && npm publish",
"release:minor": "npm version minor && npm publish",
"release:major": "npm version major && npm publish",
"build": "node build.js",
"detect-cycle": "detect-cyclic-packages --ignore done-serve"
"detect-cycle": "detect-cyclic-packages"
},
"main": "dist/cjs/can-ajax",
"keywords": [
Expand Down

0 comments on commit eb4edb4

Please sign in to comment.