Skip to content

Commit 9da67fa

Browse files
isaacsisaacs
committed
npm: Upgrade to 1.3.3
1 parent f88b8da commit 9da67fa

1,822 files changed

Lines changed: 32670 additions & 79222 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/npm/Makefile‎

Lines changed: 114 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,57 @@
1+
# vim: set softtabstop=2 shiftwidth=2:
12
SHELL = bash
23

34
markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
45

6+
html_docdeps = html/dochead.html \
7+
html/docfoot.html \
8+
html/docfoot-script.html \
9+
scripts/doc-build.sh \
10+
package.json
11+
512
cli_mandocs = $(shell find doc/cli -name '*.md' \
613
|sed 's|.md|.1|g' \
714
|sed 's|doc/cli/|man/man1/|g' ) \
8-
man/man1/README.1 \
9-
man/man1/index.1
15+
man/man1/npm-README.1
1016

1117
api_mandocs = $(shell find doc/api -name '*.md' \
1218
|sed 's|.md|.3|g' \
1319
|sed 's|doc/api/|man/man3/|g' )
1420

21+
files_mandocs = $(shell find doc/files -name '*.md' \
22+
|sed 's|.md|.5|g' \
23+
|sed 's|doc/files/|man/man5/|g' ) \
24+
man/man5/npm-json.5 \
25+
man/man5/npm-global.5
26+
27+
misc_mandocs = $(shell find doc/misc -name '*.md' \
28+
|sed 's|.md|.7|g' \
29+
|sed 's|doc/misc/|man/man7/|g' ) \
30+
man/man7/index.7
31+
1532
cli_htmldocs = $(shell find doc/cli -name '*.md' \
16-
|grep -v 'index.md' \
1733
|sed 's|.md|.html|g' \
18-
|sed 's|doc/cli/|html/doc/|g' ) \
19-
html/doc/README.html \
20-
html/doc/index.html
34+
|sed 's|doc/cli/|html/doc/cli/|g' ) \
35+
html/doc/README.html
2136

2237
api_htmldocs = $(shell find doc/api -name '*.md' \
2338
|sed 's|.md|.html|g' \
24-
|sed 's|doc/api/|html/api/|g' )
39+
|sed 's|doc/api/|html/doc/api/|g' )
40+
41+
files_htmldocs = $(shell find doc/files -name '*.md' \
42+
|sed 's|.md|.html|g' \
43+
|sed 's|doc/files/|html/doc/files/|g' ) \
44+
html/doc/files/npm-json.html \
45+
html/doc/files/npm-global.html
2546

26-
mandocs = $(api_mandocs) $(cli_mandocs)
47+
misc_htmldocs = $(shell find doc/misc -name '*.md' \
48+
|sed 's|.md|.html|g' \
49+
|sed 's|doc/misc/|html/doc/misc/|g' ) \
50+
html/doc/index.html
2751

28-
htmldocs = $(api_htmldocs) $(cli_htmldocs)
52+
mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
53+
54+
htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
2955

3056
all: doc
3157

@@ -58,17 +84,14 @@ doc-clean:
5884
rm -rf \
5985
node_modules/ronn \
6086
node_modules/.bin/ronn \
61-
.building_ronn \
62-
doc/cli/index.md \
63-
doc/api/index.md \
64-
$(api_mandocs) \
65-
$(cli_mandocs) \
66-
$(api_htmldocs) \
67-
$(cli_htmldocs) \
68-
&>/dev/null || true
87+
.building_ronn \
88+
html/doc \
89+
html/api \
90+
man/man*
6991

7092
# use `npm install ronn` for this to work.
71-
man/man1/README.1: README.md scripts/doc-build.sh package.json
93+
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
94+
@[ -d man/man1 ] || mkdir -p man/man1
7295
scripts/doc-build.sh $< $@
7396

7497
man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
@@ -79,17 +102,54 @@ man/man3/%.3: doc/api/%.md scripts/doc-build.sh package.json
79102
@[ -d man/man3 ] || mkdir -p man/man3
80103
scripts/doc-build.sh $< $@
81104

82-
html/doc/README.html: README.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
105+
man/man5/npm-json.5: man/man5/package.json.5
106+
cp $< $@
107+
108+
man/man5/npm-global.5: man/man5/npm-folders.5
109+
cp $< $@
110+
111+
man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json
112+
@[ -d man/man5 ] || mkdir -p man/man5
83113
scripts/doc-build.sh $< $@
84114

85-
html/doc/%.html: doc/cli/%.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
115+
doc/misc/npm-index.md: scripts/index-build.js package.json
116+
node scripts/index-build.js > $@
117+
118+
html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
119+
@[ -d html/doc ] || mkdir -p html/doc
86120
scripts/doc-build.sh $< $@
87121

88-
html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
122+
man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
123+
@[ -d man/man7 ] || mkdir -p man/man7
89124
scripts/doc-build.sh $< $@
90125

91-
doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json
92-
node scripts/index-build.js > $@
126+
html/doc/README.html: README.md $(html_docdeps)
127+
@[ -d html/doc ] || mkdir -p html/doc
128+
scripts/doc-build.sh $< $@
129+
130+
html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
131+
@[ -d html/doc/cli ] || mkdir -p html/doc/cli
132+
scripts/doc-build.sh $< $@
133+
134+
html/doc/api/%.html: doc/api/%.md $(html_docdeps)
135+
@[ -d html/doc/api ] || mkdir -p html/doc/api
136+
scripts/doc-build.sh $< $@
137+
138+
html/doc/files/npm-json.html: html/doc/files/package.json.html
139+
cp $< $@
140+
html/doc/files/npm-global.html: html/doc/files/npm-folders.html
141+
cp $< $@
142+
143+
html/doc/files/%.html: doc/files/%.md $(html_docdeps)
144+
@[ -d html/doc/files ] || mkdir -p html/doc/files
145+
scripts/doc-build.sh $< $@
146+
147+
html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
148+
@[ -d html/doc/misc ] || mkdir -p html/doc/misc
149+
scripts/doc-build.sh $< $@
150+
151+
152+
93153

94154
node_modules/.bin/ronn:
95155
node cli.js install ronn
@@ -102,9 +162,10 @@ test:
102162
node cli.js test
103163

104164
publish: link doc
105-
@git push origin :v$(shell npm -v) || true
106-
@npm unpublish npm@$(shell npm -v) || true
107-
git clean -fd
165+
@git push origin :v$(shell npm -v) 2>&1 || true
166+
@npm unpublish npm@$(shell npm -v) 2>&1 || true
167+
git clean -fd &&\
168+
git push origin &&\
108169
git push origin --tags &&\
109170
npm publish &&\
110171
npm tag npm@$(shell npm -v) $(shell npm -v | awk -F. '{print $$1 "." $$2}') &&\
@@ -113,18 +174,36 @@ publish: link doc
113174

114175
docpublish: doc-publish
115176
doc-publish: doc
177+
# legacy urls
178+
for f in $$(find html/doc/{cli,files,misc}/ -name '*.html'); do \
179+
j=$$(basename $$f | sed 's|^npm-||g'); \
180+
if ! [ -f html/doc/$$j ] && [ $$j != README.html ] && [ $$j != index.html ]; then \
181+
perl -pi -e 's/ href="\.\.\// href="/g' <$$f >html/doc/$$j; \
182+
fi; \
183+
done
184+
mkdir -p html/api
185+
for f in $$(find html/doc/api/ -name '*.html'); do \
186+
j=$$(basename $$f | sed 's|^npm-||g'); \
187+
perl -pi -e 's/ href="\.\.\// href="/g' <$$f >html/api/$$j; \
188+
done
116189
rsync -vazu --stats --no-implied-dirs --delete \
117-
html/doc/ \
118-
node@npmjs.org:/home/node/npm-www/doc
119-
rsync -vazu --stats --no-implied-dirs --delete \
120-
html/api/ \
121-
node@npmjs.org:/home/node/npm-www/api
190+
html/doc/* \
191+
node@npmjs.org:/home/node/npm-www/doc
122192
rsync -vazu --stats --no-implied-dirs --delete \
123-
html/static/webfonts/ \
124-
node@npmjs.org:/home/node/npm-www/static/webfonts
193+
html/static/webfonts/ \
194+
node@npmjs.org:/home/node/npm-www/static/webfonts
125195
rsync -vazu --stats --no-implied-dirs --delete \
126-
html/static/style.css \
127-
node@npmjs.org:/home/node/npm-www/static/
196+
html/static/style.css \
197+
node@npmjs.org:/home/node/npm-www/static/
198+
#cleanup
199+
rm -rf html/api
200+
for f in html/doc/*.html; do \
201+
case $$f in \
202+
html/doc/README.html) continue ;; \
203+
html/doc/index.html) continue ;; \
204+
*) rm $$f ;; \
205+
esac; \
206+
done
128207

129208
zip-publish: release
130209
scp release/* node@nodejs.org:dist/npm/

‎deps/npm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Much more info available via `npm help` once it's installed.
99

1010
## IMPORTANT
1111

12-
**You need node v0.6 or higher to run this program.**
12+
**You need node v0.8 or higher to run this program.**
1313

1414
To install an old **and unsupported** version of npm that works on node 0.3
1515
and prior, clone the git repo and dig through the old tags and branches.

‎deps/npm/doc/api/commands.md‎

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

‎deps/npm/doc/api/deprecate.md‎

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

‎deps/npm/doc/api/init.md‎

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

deps/npm/doc/api/bin.md renamed to deps/npm/doc/api/npm-bin.md

File renamed without changes.

deps/npm/doc/api/bugs.md renamed to deps/npm/doc/api/npm-bugs.md

File renamed without changes.

‎deps/npm/doc/api/npm-commands.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
npm-commands(3) -- npm commands
2+
===============================
3+
4+
## SYNOPSIS
5+
6+
npm.commands[<command>](args, callback)
7+
8+
## DESCRIPTION
9+
10+
npm comes with a full set of commands, and each of the commands takes a
11+
similar set of arguments.
12+
13+
In general, all commands on the command object take an **array** of positional
14+
argument **strings**. The last argument to any function is a callback. Some
15+
commands are special and take other optional arguments.
16+
17+
All commands have their own man page. See `man npm-<command>` for command-line
18+
usage, or `man 3 npm-<command>` for programmatic usage.
19+
20+
## SEE ALSO
21+
22+
* npm-index(7)

deps/npm/doc/api/config.md renamed to deps/npm/doc/api/npm-config.md

File renamed without changes.

‎deps/npm/doc/api/npm-deprecate.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
npm-deprecate(3) -- Deprecate a version of a package
2+
====================================================
3+
4+
## SYNOPSIS
5+
6+
npm.commands.deprecate(args, callback)
7+
8+
## DESCRIPTION
9+
10+
This command will update the npm registry entry for a package, providing
11+
a deprecation warning to all who attempt to install it.
12+
13+
The 'args' parameter must have exactly two elements:
14+
15+
* `package[@version]`
16+
17+
The `version` portion is optional, and may be either a range, or a
18+
specific version, or a tag.
19+
20+
* `message`
21+
22+
The warning message that will be printed whenever a user attempts to
23+
install the package.
24+
25+
Note that you must be the package owner to deprecate something. See the
26+
`owner` and `adduser` help topics.
27+
28+
To un-deprecate a package, specify an empty string (`""`) for the `message` argument.
29+
30+
## SEE ALSO
31+
32+
* npm-publish(3)
33+
* npm-unpublish(3)
34+
* npm-registry(7)

0 commit comments

Comments
 (0)