Skip to content
This repository has been archived by the owner on Mar 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'PeterDaveHello-patch-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
IonicaBizau committed Apr 26, 2015
2 parents 5aa8dbf + 7eda47f commit cb3ec53
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Adds a new library in the local cdnjs repository.
- **Object|String** `lib`: The git url as string or an object containing:
- `git` (String): The `git` url.
- `dir` (String): The directory containing the files which should be imported (default: `"/dist"` or `"/build"` or `"/src"` or `"/"`).
- `map` (Array): The file map used by cdnjs in autoupdate process (default: `[{ basePath: lib.dir , files: ["*"] }]`).
- `map` (Array): The file map used by cdnjs in autoupdate process (default: `[{ basePath: lib.dir , files: ["**/*"] }]`).
- **Function** `callback`: The callback function called with `error` and `data`.

#### Return
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function CdnJsImporter (options, callback) {
* @param {Object|String} lib The git url as string or an object containing:
* - `git` (String): The `git` url.
* - `dir` (String): The directory containing the files which should be imported (default: `"/dist"` or `"/build"` or `"/src"` or `"/"`).
* - `map` (Array): The file map used by cdnjs in autoupdate process (default: `[{ basePath: lib.dir , files: ["*"] }]`).
* - `map` (Array): The file map used by cdnjs in autoupdate process (default: `[{ basePath: lib.dir , files: ["**/*"] }]`).
* @param {Function} callback The callback function called with `error` and `data`.
* @return {CdnJsImporter} The `CdnJsImporter` instance.
*/
Expand Down Expand Up @@ -185,7 +185,7 @@ CdnJsImporter.prototype.add = function (lib, callback) {
package.npmFileMap = lib.map || [
{
basePath: lib.dir
, files: ["*"]
, files: ["**/*"]
}
];

Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cdnjs-importer",
"version": "1.2.0",
"version": "1.3.0",
"description": "Easy way to import a library into CDNJS.",
"main": "lib/index.js",
"bin": {
Expand All @@ -18,6 +18,9 @@
"library"
],
"author": "Ionică Bizău <bizauionica@gmail.com>",
"contributors": [
"Peter Dave Hello <hsu@peterdavehello.org>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/IonicaBizau/cdnjs-importer/issues"
Expand Down

0 comments on commit cb3ec53

Please sign in to comment.