Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make server component separate and this module just install npm deps #70

Merged
merged 35 commits into from
Oct 25, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2af14ba
feat: add registry cloner
achingbrain Oct 7, 2018
ca17768
chore: split into separate modules
achingbrain Oct 8, 2018
ddd5999
fix: dial all available addresses
achingbrain Oct 12, 2018
2bf789a
feat: copy and paste like an animal
achingbrain Oct 12, 2018
318e68e
feat: show root cid on registry mirrors
achingbrain Oct 12, 2018
05c578a
fix: change module path
achingbrain Oct 12, 2018
085e875
fix: update config
achingbrain Oct 12, 2018
c7eae4b
fix: correct deploy script
achingbrain Oct 12, 2018
b72aaf0
fix: make env prod
achingbrain Oct 12, 2018
05d0b06
fix: configure external ip
achingbrain Oct 12, 2018
cc64500
fix: correct url
achingbrain Oct 12, 2018
8a75368
test: adds lots of tests
achingbrain Oct 13, 2018
8e644b8
test: test all the things
achingbrain Oct 13, 2018
bb10fb9
chore: fix linting issues
achingbrain Oct 13, 2018
b37393a
test: run tests in parallel
achingbrain Oct 14, 2018
38efffe
chore: update readme
achingbrain Oct 14, 2018
1cd21ad
Merge remote-tracking branch 'origin/master' into split-into-modules
achingbrain Oct 14, 2018
da29363
chore: update image
achingbrain Oct 14, 2018
6c75058
chore: move services out of project
achingbrain Oct 14, 2018
8cb5bfa
fix: update paths and only delete local reg when we have dialled master
achingbrain Oct 14, 2018
3684624
fix: use cached index if master cannot be dialled
achingbrain Oct 14, 2018
45acd2d
chore: change description and remove old binary
achingbrain Oct 17, 2018
8472d70
chore: restore files
achingbrain Oct 17, 2018
606d3b9
chore: addres PR comments
achingbrain Oct 23, 2018
afe7a3d
chore: fix whitespace
achingbrain Oct 23, 2018
ebe84dd
chore: update readme
achingbrain Oct 23, 2018
3861272
feat: pass extra commands to package manager
achingbrain Oct 23, 2018
5bbe609
fix: use correct arg
achingbrain Oct 23, 2018
a0c41f6
chore: centre images
achingbrain Oct 23, 2018
8cd5d72
chore: centre images
achingbrain Oct 23, 2018
e27a54a
chore: fix up images
achingbrain Oct 23, 2018
f59f851
chore: move headings around
achingbrain Oct 23, 2018
877053d
fix: add flush and fix tests
achingbrain Oct 24, 2018
ce56654
fix: dial mirror instead of replication master
achingbrain Oct 25, 2018
1fe471e
feat: rewrite lockfiles with repo url
achingbrain Oct 25, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@ Run the `ipfs-npm` command in the directory with your `package.json` and it will

```bash
$ ipfs-npm
👿 Spawning a go-IPFS node
🗑️ Removing old registry if it exists
☎️ Dialing replication master /ip4/127.0.0.1/tcp/40020/ipfs/QmeXyYCLSivUn5Ju31jjPBYNKdncbzzEf6zdN2DyrdLAbe
📠 Copying registry index /ipfs/QmQmVsNFw3stJky7agrETeB9kZqkcvLSLRnFFMrhiR8zG1 to /commons-registry
👩‍🚀 Starting local webserver
👿 Spawning an in-process IPFS node
🗑️ Replacing old registry index if it exist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exists*

☎️ Dialing replication master /ip4/127.0.0.1/tcp/40020/ipfs/QmeXyYCLSivUn5Ju31jjPBYNKdncbzzEf6zdN2DyrdLAbe
📠 Copying registry index /ipfs/QmQmVsNFw3stJky7agrETeB9kZqkcvLSLRnFFMrhiR8zG1 to /npm-registry
👩‍🚀 Starting local proxy
🚀 Server running on port 57314
🎁 Installing dependencies with /Users/alex/.nvm/versions/node/v10.8.0/bin/npm
🆕 New version of express detected undefined vs 3864-53d75cca2a8eae32408fce2fd43f4c87
📄 GET /express 200 993ms
🐨 npm http fetch GET 200 http://localhost:57314/express 1029ms
...
```

Expand Down
2 changes: 1 addition & 1 deletion img/npm-on-ipfs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/cli/bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ yargs.command('$0', 'Installs your js dependencies using IPFS', (yargs) => { //

.option('ipfs-mfs-prefix', {
describe: 'Which mfs prefix to use',
default: '/commons-registry'
default: '/npm-registry'
})
.option('ipfs-node', {
describe: '"proc" to start an in-process IPFS node, "go" or "js" to spawn an IPFS node as a separate process or a multiaddr that resolves to a running node',
Expand Down
4 changes: 2 additions & 2 deletions src/core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module.exports = async (options) => {
)

if (connected) {
console.info('🗑️ Removing old registry if it exists') // eslint-disable-line no-console
console.info('🗑️ Replacing old registry index if it exists') // eslint-disable-line no-console

try {
await ipfs.api.files.rm(options.ipfs.prefix, {
Expand All @@ -70,7 +70,7 @@ module.exports = async (options) => {
console.info('⚰️ Could not dial master, running without latest registry index') // eslint-disable-line no-console
}

console.info('👩‍🚀 Starting local webserver') // eslint-disable-line no-console
console.info('👩‍🚀 Starting local proxy') // eslint-disable-line no-console

const server = await startServer(options, ipfs.api)

Expand Down