From bae7e40bb779c3fad386f4ff6bd2dfa769ccf2be Mon Sep 17 00:00:00 2001 From: Ben Clinkinbeard Date: Mon, 12 Jan 2015 16:00:34 -0500 Subject: [PATCH 1/3] chore(npm): Make require()-able as part of publish script --- scripts/bower/publish.sh | 12 ++++++++++++ scripts/utils.inc | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/scripts/bower/publish.sh b/scripts/bower/publish.sh index 0170f6183174..cde3c200fe35 100755 --- a/scripts/bower/publish.sh +++ b/scripts/bower/publish.sh @@ -75,6 +75,18 @@ function prepare { replaceJsonProp "bower.json" "angular.*" ".*" "$NEW_VERSION" replaceJsonProp "package.json" "version" ".*" "$NEW_VERSION" replaceJsonProp "package.json" "angular.*" ".*" "$NEW_VERSION" + deleteJsonProp "package.json" "main" + + echo "-- Adding CommonJS index file" + if [ -f "index.js" ] + then + rm index.js + fi + + touch index.js + echo "require('./$repo');" >> index.js + echo "" >> index.js + echo "module.exports = $repo;" >> index.js git add -A diff --git a/scripts/utils.inc b/scripts/utils.inc index 919f7df9799e..2351ad1cf74c 100644 --- a/scripts/utils.inc +++ b/scripts/utils.inc @@ -207,6 +207,12 @@ function replaceJsonProp { replaceInFile $1 '"('$2')"[ ]*:[ ]*"'$3'"' '"\1": "'$4'"' } +# deleteJsonProp(jsonFile, property) +# - restriction: property needs to be on a single line! +function deleteJsonProp { + sed -i -e /\"$2\"\:/d $1 +} + # replaceInFile(file, findPattern, replacePattern) function replaceInFile { sed -i .tmp -E "s/$2/$3/" $1 From e35278c3cabefda993f0252d3bfb5c8cbaa9e9ae Mon Sep 17 00:00:00 2001 From: Ben Clinkinbeard Date: Mon, 12 Jan 2015 16:31:52 -0500 Subject: [PATCH 2/3] chore(npm): Combine sed flags --- scripts/utils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils.inc b/scripts/utils.inc index 2351ad1cf74c..800546346282 100644 --- a/scripts/utils.inc +++ b/scripts/utils.inc @@ -210,7 +210,7 @@ function replaceJsonProp { # deleteJsonProp(jsonFile, property) # - restriction: property needs to be on a single line! function deleteJsonProp { - sed -i -e /\"$2\"\:/d $1 + sed -ie /\"$2\"\:/d $1 } # replaceInFile(file, findPattern, replacePattern) From b90e5b41efb659359f59ab27c44231760b2872ca Mon Sep 17 00:00:00 2001 From: Ben Clinkinbeard Date: Mon, 12 Jan 2015 18:55:01 -0500 Subject: [PATCH 3/3] chore(npm): Correct sed flags --- scripts/utils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils.inc b/scripts/utils.inc index 800546346282..9feea7a5959d 100644 --- a/scripts/utils.inc +++ b/scripts/utils.inc @@ -210,7 +210,7 @@ function replaceJsonProp { # deleteJsonProp(jsonFile, property) # - restriction: property needs to be on a single line! function deleteJsonProp { - sed -ie /\"$2\"\:/d $1 + sed -i '' -e /\"$2\"\:/d $1 } # replaceInFile(file, findPattern, replacePattern)