Skip to content

Commit f5c7988

Browse files
authored
Merge pull request #693 from ipfs-shipyard/chore/new-release-prep
Prep before new Beta: - dependency bump - speed up Terser build - removed unused npm scripts related to bundling webui
2 parents 6e46e87 + ca436a9 commit f5c7988

File tree

4 files changed

+1004
-1494
lines changed

4 files changed

+1004
-1494
lines changed

package.json

+19-25
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
"build:copy:ui-kit:ipfs-css:fonts": "shx mkdir -p add-on/ui-kit/fonts && shx cp node_modules/ipfs-css/fonts/* add-on/ui-kit/fonts",
2424
"build:copy:ui-kit:ipfs-css:icons": "shx mkdir -p add-on/ui-kit/icons && shx cp node_modules/ipfs-css/icons/* add-on/ui-kit/icons",
2525
"build:copy:ui-kit:tachyons": "shx mkdir -p add-on/ui-kit && shx cp node_modules/tachyons/css/tachyons.css add-on/ui-kit",
26-
"DISABLED:issue679:build:webui": "cross-env CID=QmXc9raDM1M5G5fpBnVyQ71vR4gbnskwnB9iMEzBuLgvoZ npm run build:webui:with-cid",
27-
"DISABLED:issue679:build:webui:with-cid": "cross-env-shell \"shx test -d add-on/webui/ || (npm run build:webui:dir && (npm run build:webui:fetch-ipfs || npm run build:webui:fetch-http) && npm run build:webui:minimize)\"",
28-
"DISABLED:issue679:build:webui:dir": "shx mkdir -p add-on/webui",
29-
"DISABLED:issue679:build:webui:fetch-ipfs": "cross-env-shell \"ipfs get $CID -o add-on/webui/\"",
30-
"DISABLED:issue679:build:webui:fetch-http": "cross-env-shell \"node scripts/fetch-webui-from-gateway.js $CID add-on/webui/\"",
31-
"DISABLED:issue679:build:webui:minimize": "shx rm -rf add-on/webui/static/js/*.map && shx rm -rf add-on/webui/static/css/*.map && shx rm -rf add-on/webui/manifest.json",
3226
"build:js": "run-s build:js:*",
3327
"build:js:webpack": "webpack -p",
3428
"build:minimize-dist": "shx rm -rf add-on/dist/lib add-on/dist/contentScripts/ add-on/dist/bundles/ipfsProxyContentScriptPayload.bundle.js",
@@ -72,8 +66,8 @@
7266
"multiaddr": "6.0.3"
7367
},
7468
"devDependencies": {
75-
"@babel/core": "7.2.2",
76-
"@babel/preset-env": "7.3.1",
69+
"@babel/core": "7.3.4",
70+
"@babel/preset-env": "7.3.4",
7771
"babel-loader": "8.0.5",
7872
"babel-plugin-syntax-async-generators": "6.13.0",
7973
"chai": "4.2.0",
@@ -86,9 +80,9 @@
8680
"ignore-styles": "5.0.1",
8781
"json": "9.0.6",
8882
"mem-storage-area": "1.0.3",
89-
"mocha": "5.2.0",
83+
"mocha": "6.0.2",
9084
"npm-run-all": "4.1.5",
91-
"nyc": "13.1.0",
85+
"nyc": "13.3.0",
9286
"raw-loader": "1.0.0",
9387
"request-progress": "3.0.0",
9488
"shx": "0.3.2",
@@ -97,40 +91,40 @@
9791
"sinon-chrome": "2.3.2",
9892
"standard": "12.0.1",
9993
"tar": "4.4.8",
100-
"terser": "3.14.1",
101-
"terser-webpack-plugin": "1.2.1",
94+
"terser": "3.16.1",
95+
"terser-webpack-plugin": "1.2.3",
10296
"transform-loader": "0.2.4",
103-
"web-ext": "2.9.3",
104-
"webpack": "4.29.0",
105-
"webpack-bundle-analyzer": "3.0.3",
106-
"webpack-cli": "3.2.1",
97+
"web-ext": "3.0.0",
98+
"webpack": "4.29.6",
99+
"webpack-bundle-analyzer": "3.1.0",
100+
"webpack-cli": "3.2.3",
107101
"webpack-merge": "4.2.1"
108102
},
109103
"dependencies": {
110-
"@material/switch": "0.44.1",
104+
"@material/switch": "1.0.0",
111105
"choo": "6.13.1",
112106
"doc-sniff": "1.0.1",
113107
"drag-and-drop-files": "0.0.1",
114-
"file-type": "10.7.1",
115-
"filesize": "4.0.0",
108+
"file-type": "10.9.0",
109+
"filesize": "4.1.2",
116110
"ipfs": "0.34.4",
117111
"ipfs-css": "0.12.0",
118-
"ipfs-http-client": "29.1.0",
112+
"ipfs-http-client": "29.1.1",
119113
"ipfs-http-response": "0.2.2",
120114
"ipfs-postmsg-proxy": "3.1.1",
121115
"ipfsx": "0.17.0",
122116
"is-fqdn": "1.0.1",
123-
"is-ipfs": "0.4.8",
124-
"is-svg": "3.0.0",
117+
"is-ipfs": "0.6.0",
118+
"is-svg": "4.0.0",
125119
"lru-cache": "5.1.1",
126-
"mime-types": "2.1.21",
127-
"p-queue": "3.0.0",
120+
"mime-types": "2.1.22",
121+
"p-queue": "3.2.0",
128122
"path-browserify": "1.0.0",
129123
"piggybacker": "2.0.0",
130124
"postmsg-rpc": "2.4.0",
131125
"pull-file-reader": "1.0.2",
132126
"tachyons": "4.11.1",
133127
"uri-to-multiaddr": "3.0.1",
134-
"webextension-polyfill": "0.3.1"
128+
"webextension-polyfill": "0.4.0"
135129
}
136130
}

scripts/fetch-webui-from-gateway.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* This is a fallback script used when ipfs cli fails or is not available
22
* More details: https://github.com/ipfs-shipyard/ipfs-webui/issues/843
3-
* See also why this is not used: https://github.com/ipfs-shipyard/ipfs-companion/issues/679
3+
* See also why this is not used anymore: https://github.com/ipfs-shipyard/ipfs-companion/issues/679
44
*/
55
const tar = require('tar')
66
const request = require('request')

webpack.config.js

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ const commonConfig = {
1919
minimizer: [
2020
new TerserPlugin({
2121
terserOptions: {
22+
// Speed Up
23+
cache: true,
24+
parallel: true,
2225
// Default minify settings break js-ipfs:
2326
// https://github.com/ipfs-shipyard/ipfs-companion/issues/521
2427
compress: { unused: false },

0 commit comments

Comments
 (0)