Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit d38b0ab

Browse files
authored
chore: windows compat (#3405)
`rm -rf` isn't a thing on windows - use the cross-platform `rimraf` module instead.
1 parent 530767d commit d38b0ab

File tree

25 files changed

+56
-35
lines changed

25 files changed

+56
-35
lines changed

examples/browser-browserify/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"bundle": "browserify src/index.js > public/bundle.js",
99
"serve": "http-server public -a 127.0.0.1 -p 8888",
1010
"start": "npm run bundle && npm run serve",
11-
"clean": "rm -rf public/bundle.js",
11+
"clean": "rimraf public/bundle.js",
1212
"test": "test-ipfs-example"
1313
},
1414
"keywords": [],
@@ -19,6 +19,7 @@
1919
"execa": "^4.0.3",
2020
"http-server": "^0.12.3",
2121
"ipfs": "^0.52.1",
22+
"rimraf": "^3.0.2",
2223
"test-ipfs-example": "^2.0.3"
2324
},
2425
"browser": {

examples/browser-create-react-app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
"tachyons": "^4.11.1"
1313
},
1414
"devDependencies": {
15+
"rimraf": "^3.0.2",
1516
"test-ipfs-example": "^2.0.3"
1617
},
1718
"scripts": {
1819
"start": "react-scripts start",
1920
"build": "react-scripts build",
2021
"eject": "react-scripts eject",
2122
"test": "test-ipfs-example",
22-
"clean": "rm -rf ./build"
23+
"clean": "rimraf ./build"
2324
},
2425
"eslintConfig": {
2526
"extends": "react-app"

examples/browser-exchange-files/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"scripts": {
6-
"clean": "rm -rf public/bundle.js",
6+
"clean": "rimraf public/bundle.js",
77
"bundle": "browserify public/app.js > public/bundle.js",
88
"start": "http-server -c-1 -p 12345 public",
99
"dev": "npm run bundle && npm run start",
@@ -20,6 +20,7 @@
2020
"dependencies": {
2121
"ipfs": "^0.52.1",
2222
"it-all": "^1.0.4",
23+
"rimraf": "^3.0.2",
2324
"test-ipfs-example": "^2.0.3"
2425
},
2526
"browser": {

examples/browser-http-client-upload-file/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Upload file to IPFS via browser using js-ipfs-http-client with Webpack",
55
"private": true,
66
"scripts": {
7-
"clean": "rm -rf ./dist",
7+
"clean": "rimraf ./dist",
88
"build": "parcel build index.html --public-url '.'",
99
"start": "parcel index.html",
1010
"test": "test-ipfs-example"
@@ -22,6 +22,7 @@
2222
"parcel-bundler": "^1.12.4",
2323
"react": "^16.8.6",
2424
"react-dom": "^16.8.6",
25+
"rimraf": "^3.0.2",
2526
"test-ipfs-example": "^2.0.3"
2627
},
2728
"browserslist": [

examples/browser-mfs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"private": true,
77
"scripts": {
8-
"clean": "rm -rf ./dist",
8+
"clean": "rimraf ./dist",
99
"build": "webpack",
1010
"start": "npm run build && http-server dist -a 127.0.0.1 -p 8888",
1111
"test": "test-ipfs-example"
@@ -15,6 +15,7 @@
1515
"devDependencies": {
1616
"html-webpack-plugin": "^3.2.0",
1717
"http-server": "^0.12.3",
18+
"rimraf": "^3.0.2",
1819
"terser-webpack-plugin": "^1.2.1",
1920
"test-ipfs-example": "^2.0.3",
2021
"webpack": "^4.43.0",

examples/browser-parceljs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"last 2 Chrome versions"
99
],
1010
"scripts": {
11-
"clean": "rm -rf ./dist",
11+
"clean": "rimraf ./dist",
1212
"lint": "standard public/**/*.js",
1313
"start": "parcel public/index.html",
1414
"build": "parcel build public/index.html --public-url ./",
@@ -28,6 +28,7 @@
2828
"babel-plugin-transform-regenerator": "^6.26.0",
2929
"babel-polyfill": "^6.26.0",
3030
"parcel-bundler": "^1.12.4",
31+
"rimraf": "^3.0.2",
3132
"standard": "^13.1.0",
3233
"test-ipfs-example": "^2.0.3"
3334
}

examples/browser-readablestream/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "2.0.1",
66
"private": true,
77
"scripts": {
8-
"clean": "rm -rf ./dist",
8+
"clean": "rimraf ./dist",
99
"build": "webpack",
1010
"start": "npm run build && http-server dist -a 127.0.0.1 -p 8888",
1111
"test": "test-ipfs-example"
@@ -15,6 +15,7 @@
1515
"devDependencies": {
1616
"html-webpack-plugin": "^3.2.0",
1717
"http-server": "^0.12.3",
18+
"rimraf": "^3.0.2",
1819
"terser-webpack-plugin": "^1.2.1",
1920
"test-ipfs-example": "^2.0.3",
2021
"webpack": "^4.43.0"

examples/browser-sharing-node-across-tabs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.0.0",
55
"private": true,
66
"scripts": {
7-
"clean": "rm -rf ./dist",
7+
"clean": "rimraf ./dist",
88
"build": "webpack",
99
"start": "node server.js",
1010
"test": "test-ipfs-example"
@@ -16,6 +16,7 @@
1616
"@babel/preset-env": "^7.3.1",
1717
"babel-loader": "^8.0.5",
1818
"copy-webpack-plugin": "^5.0.4",
19+
"rimraf": "^3.0.2",
1920
"test-ipfs-example": "^2.0.3",
2021
"webpack": "^4.43.0",
2122
"webpack-cli": "^3.3.11",

examples/browser-vue/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"scripts": {
6-
"clean": "rm -rf ./dist",
6+
"clean": "rimraf ./dist",
77
"serve": "vue-cli-service serve",
88
"build": "vue-cli-service build",
99
"lint": "vue-cli-service lint",
@@ -21,6 +21,7 @@
2121
"babel-eslint": "^10.1.0",
2222
"eslint": "^6.8.0",
2323
"eslint-plugin-vue": "^6.2.1",
24+
"rimraf": "^3.0.2",
2425
"test-ipfs-example": "^2.0.3",
2526
"vue-template-compiler": "^2.6.11"
2627
},

examples/browser-webpack/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.1.1",
55
"private": true,
66
"scripts": {
7-
"clean": "rm -rf ./dist",
7+
"clean": "rimraf ./dist",
88
"build": "webpack",
99
"start": "node server.js",
1010
"test": "test-ipfs-example"
@@ -20,6 +20,7 @@
2020
"react": "^16.8.6",
2121
"react-dom": "^16.8.6",
2222
"react-hot-loader": "^4.12.21",
23+
"rimraf": "^3.0.2",
2324
"test-ipfs-example": "^2.0.3",
2425
"webpack": "^4.43.0",
2526
"webpack-cli": "^3.3.11",

examples/circuit-relaying/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"private": true,
77
"scripts": {
8-
"clean": "rm -rf ./dist",
8+
"clean": "rimraf ./dist",
99
"build": "parcel build index.html --public-url '.'",
1010
"start": "parcel index.html",
1111
"deploy": "ipfs add -r --quieter dist",
@@ -24,6 +24,7 @@
2424
"ipfs-css": "^0.13.1",
2525
"ipfs-http-client": "^48.1.1",
2626
"parcel-bundler": "^1.12.4",
27+
"rimraf": "^3.0.2",
2728
"tachyons": "^4.11.1",
2829
"test-ipfs-example": "^2.0.3"
2930
},

examples/http-client-bundle-webpack/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Bundle js-ipfs-http-client with Webpack",
55
"private": true,
66
"scripts": {
7-
"clean": "rm -rf ./dist",
7+
"clean": "rimraf ./dist",
88
"build": "webpack",
99
"start": "node server.js",
1010
"test": "test-ipfs-example"
@@ -27,6 +27,7 @@
2727
"ipfs": "^0.52.1",
2828
"ipfsd-ctl": "^7.0.2",
2929
"react-hot-loader": "^4.12.21",
30+
"rimraf": "^3.0.2",
3031
"test-ipfs-example": "^2.0.3",
3132
"webpack": "^4.43.0",
3233
"webpack-dev-server": "^3.11.0"

examples/http-client-name-api/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"private": true,
77
"scripts": {
8-
"clean": "rm -rf ./dist",
8+
"clean": "rimraf ./dist",
99
"build": "parcel build index.html --public-url '.'",
1010
"start": "parcel index.html -p 8888",
1111
"test": "test-ipfs-example"
@@ -20,6 +20,7 @@
2020
"go-ipfs": "^0.7.0",
2121
"ipfsd-ctl": "^7.0.2",
2222
"parcel-bundler": "^1.12.4",
23+
"rimraf": "^3.0.2",
2324
"test-ipfs-example": "^2.0.3"
2425
},
2526
"browserslist": [

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"postinstall": "lerna bootstrap",
77
"link": "lerna link",
8-
"reset": "lerna run clean && rm -rf packages/*/node_modules node_modules",
8+
"reset": "lerna run clean && rimraf packages/*/node_modules node_modules",
99
"test": "lerna run test",
1010
"test:node": "lerna run test:node",
1111
"test:browser": "lerna run test:browser",
@@ -34,7 +34,7 @@
3434
"release:pre:build": "NODE_ENV=production npm run build -- --scope={ipfs-core,ipfs,ipfs-http-client,ipfs-message-port-*}",
3535
"release:pre:add-examples": "json -I -f ./lerna.json -e \"this.packages.push('examples/*'); this.packages = [...new Set(this.packages)]\"",
3636
"release:pre:add-hoisted-modules": "json -I -f ./lerna.json -e \"this.command.bootstrap.nohoist = ['ipfs-css', 'tachyons']; this.command.bootstrap.nohoist = [...new Set(this.command.bootstrap.nohoist)]\"",
37-
"release:pre:reinstall": "rm -rf node_modules */*/node_modules package-lock.json */*/package-lock.json && npm i && rm -rf package-lock.json */*/package-lock.json",
37+
"release:pre:reinstall": "rimraf node_modules */*/node_modules package-lock.json */*/package-lock.json && npm i && rimraf package-lock.json */*/package-lock.json",
3838
"release:publish": "lerna publish",
3939
"docker:release": "run-s docker:release:*",
4040
"docker:release:build": "docker build . --no-cache --tag js-ipfs:latest --file ./Dockerfile.latest",
@@ -57,7 +57,8 @@
5757
"devDependencies": {
5858
"json": "^10.0.0",
5959
"lerna": "^3.22.0",
60-
"npm-run-all": "^4.1.5"
60+
"npm-run-all": "^4.1.5",
61+
"rimraf": "^3.0.2"
6162
},
6263
"repository": {
6364
"type": "git",

packages/interface-ipfs-core/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
},
1515
"scripts": {
1616
"lint": "aegir lint",
17-
"clean": "rm -rf ./dist",
1817
"test": "echo 'No tests here'",
1918
"dep-check": "aegir dep-check"
2019
},

packages/ipfs-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"test": "npm run test:node",
2626
"test:node": "aegir test -t node",
2727
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
28-
"clean": "rm -rf ./dist",
28+
"clean": "rimraf ./dist",
2929
"dep-check": "aegir dep-check -i @types/yargs -i typescript -i cid-tool"
3030
},
3131
"dependencies": {

packages/ipfs-core-utils/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"build": "npm run build:js && npm run build:types",
3434
"build:js": "aegir build",
3535
"build:types": "tsc --build",
36-
"clean": "rm -rf ./dist",
37-
"dep-check": "aegir dep-check -i typescript"
36+
"clean": "rimraf ./dist",
37+
"dep-check": "aegir dep-check -i typescript -i rimraf"
3838
},
3939
"license": "MIT",
4040
"dependencies": {
@@ -52,6 +52,7 @@
5252
},
5353
"devDependencies": {
5454
"aegir": "^28.2.0",
55+
"rimraf": "^3.0.2",
5556
"typescript": "^4.0.3"
5657
}
5758
}

packages/ipfs-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"test:electron-renderer": "aegir test -t electron-renderer",
5151
"test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
5252
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
53-
"clean": "rm -rf ./dist",
53+
"clean": "rimraf ./dist",
5454
"dep-check": "aegir dep-check -i typescript -i interface-ipfs-core"
5555
},
5656
"dependencies": {

packages/ipfs-http-client/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"build:js": "aegir build",
4747
"build:types": "tsc --build",
4848
"coverage": "npx nyc -r html npm run test:node -- --bail",
49-
"clean": "rm -rf ./dist",
50-
"dep-check": "aegir dep-check -i typescript -i ipfs-core"
49+
"clean": "rimraf ./dist",
50+
"dep-check": "aegir dep-check -i typescript -i ipfs-core -i rimraf"
5151
},
5252
"dependencies": {
5353
"any-signal": "^2.0.0",
@@ -84,6 +84,7 @@
8484
"it-all": "^1.0.4",
8585
"it-concat": "^1.0.1",
8686
"nock": "^13.0.2",
87+
"rimraf": "^3.0.2",
8788
"typescript": "^4.0.3"
8889
},
8990
"engines": {

packages/ipfs-http-gateway/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"test": "npm run test:node",
2626
"test:node": "aegir test -t node",
2727
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
28-
"clean": "rm -rf ./dist",
29-
"dep-check": "aegir dep-check -i typescript"
28+
"clean": "rimraf ./dist",
29+
"dep-check": "aegir dep-check -i typescript -i rimraf"
3030
},
3131
"dependencies": {
3232
"@hapi/ammo": "^5.0.1",
@@ -48,6 +48,7 @@
4848
"devDependencies": {
4949
"aegir": "^28.2.0",
5050
"file-type": "^16.0.0",
51+
"rimraf": "^3.0.2",
5152
"sinon": "^9.0.3",
5253
"typescript": "^4.0.3"
5354
}

packages/ipfs-http-server/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"test": "npm run test:node",
2626
"test:node": "aegir test -t node",
2727
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
28-
"clean": "rm -rf ./dist",
29-
"dep-check": "aegir dep-check -i typescript -i ipfs-http-client"
28+
"clean": "rimraf ./dist",
29+
"dep-check": "aegir dep-check -i typescript -i ipfs-http-client -i rimraf"
3030
},
3131
"dependencies": {
3232
"@hapi/boom": "^9.1.0",
@@ -71,6 +71,7 @@
7171
"iso-random-stream": "^1.1.1",
7272
"it-to-buffer": "^1.0.2",
7373
"qs": "^6.9.4",
74+
"rimraf": "^3.0.2",
7475
"sinon": "^9.0.3",
7576
"stream-to-promise": "^3.0.0",
7677
"typescript": "^4.0.3"

packages/ipfs-message-port-client/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"build:bundle": "aegir build",
3939
"build:types": "tsc --build",
4040
"coverage": "npx nyc -r html npm run test:node -- --bail",
41-
"clean": "rm -rf ./dist",
42-
"dep-check": "aegir dep-check -i typescript -i ipfs-core"
41+
"clean": "rimraf ./dist",
42+
"dep-check": "aegir dep-check -i typescript -i ipfs-core -i rimraf"
4343
},
4444
"dependencies": {
4545
"browser-readablestream-to-it": "^1.0.1",
@@ -51,6 +51,7 @@
5151
"ipfs": "^0.52.1",
5252
"ipfs-core": "^0.2.1",
5353
"ipfs-message-port-server": "^0.4.1",
54+
"rimraf": "^3.0.2",
5455
"typescript": "^4.0.3"
5556
},
5657
"engines": {

packages/ipfs-message-port-protocol/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838
"build:bundle": "aegir build",
3939
"build:types": "tsc --build",
4040
"coverage": "npx nyc -r html npm run test:node -- --bail",
41-
"clean": "rm -rf ./dist",
42-
"dep-check": "aegir dep-check -i typescript"
41+
"clean": "rimraf ./dist",
42+
"dep-check": "aegir dep-check -i typescript -i rimraf"
4343
},
4444
"dependencies": {
4545
"cids": "^1.0.0",
4646
"ipld-block": "^0.11.0"
4747
},
4848
"devDependencies": {
4949
"aegir": "^28.2.0",
50+
"rimraf": "^3.0.2",
5051
"typescript": "^4.0.3",
5152
"uint8arrays": "^1.1.0"
5253
},

0 commit comments

Comments
 (0)