[MediaWiki-commits] [Gerrit] marvin[master]: New: Add initial favicon
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391878 )
Change subject: New: Add initial favicon
..
New: Add initial favicon
Add initial version of the favicon. In the future this should change
depending on the language/project that is active for the user.
Supporting changes:
* Copy assets in src/public verbatim to /dist/public when building the
client assets
* Add CopyWebpackPlugin for such. In development these assets are
served by webpack-dev-server from memory, and in production they
are copied to the file system
* Improved /src/server/assets/manifest.ts#asset to be able to construct
a path for assets that are not in the manifest, by just linking to the
fs output path, for files that are copied from src/public
Bug: T179305
Change-Id: Ie06753b14bfd3898e47ee682c1a8bc2d0f9d
---
M package-lock.json
M package.json
M src/client/webpack.config.ts
A src/public/favicon/wikipedia.ico
M src/server/assets/manifest.ts
M src/server/components/html-page.tsx
6 files changed, 1,038 insertions(+), 5 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package-lock.json b/package-lock.json
index 84ec6ee..23e0923 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,16 @@
"@types/express": "4.0.39"
}
},
+"@types/copy-webpack-plugin": {
+ "version": "4.0.1",
+ "resolved":
"https://registry.npmjs.org/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz;,
+ "integrity":
"sha512-+R4A5pYLCUhchrZdmTt9FRhtHAACxkgtENPTrciuSlk9+bloMqKAri97+41rbNlboAuV9OQLjz90aTvbzR/S+A==",
+ "dev": true,
+ "requires": {
+"@types/minimatch": "3.0.1",
+"@types/webpack": "3.0.9"
+ }
+},
"@types/express": {
"version": "4.0.39",
"resolved":
"https://registry.npmjs.org/@types/express/-/express-4.0.39.tgz;,
@@ -80,6 +90,12 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.1.tgz;,
"integrity":
"sha512-rek8twk9C58gHYqIrUlJsx8NQMhlxqHzln9Z9ODqiNgv3/s+ZwIrfr+djqzsnVM12xe9hL98iJ20lj2RvCBv6A==",
+ "dev": true
+},
+"@types/minimatch": {
+ "version": "3.0.1",
+ "resolved":
"https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz;,
+ "integrity":
"sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
"dev": true
},
"@types/mocha": {
@@ -954,6 +970,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
+"fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -1286,6 +1303,51 @@
"mkdirp": "0.5.1",
"rimraf": "2.6.2",
"run-queue": "1.0.3"
+ }
+},
+"copy-webpack-plugin": {
+ "version": "4.2.0",
+ "resolved":
"https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz;,
+ "integrity":
"sha512-eZERim02YjJcepLjrToQMapOoRLfiXewJi9zJON6xXNNJSUhkGzL1L/yFjOufS0KxsnWUzc2szg9t8ZaZKJXAg==",
+ "dev": true,
+ "requires": {
+"bluebird": "3.5.1",
+"fs-extra": "4.0.2",
+"glob": "7.1.2",
+"is-glob": "4.0.0",
+"loader-utils": "0.2.17",
+"lodash": "4.17.4",
+"minimatch": "3.0.4",
+"node-dir": "0.1.17"
+ },
+ "dependencies": {
+"is-extglob": {
+ "version": "2.1.1",
+ "resolved":
"https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz;,
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "dev": true
+},
+"is-glob": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz;,
+ "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+ "dev": true,
+ "requires": {
+"is-extglob": "2.1.1"
+ }
+},
+"loader-utils": {
+ "version": "0.2.17",
+ "resolved":
"https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz;,
+ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+ "dev": true,
+ "requires": {
+"big.js": "3.1.3",
+"emojis-list": "2.1.0",
+"json5": "0.5.1",
+"object-assign": "4.1.1"
+ }
+}
}
},
"core-js": {
@@ -2646,6 +2708,17 @@
"readable-stream": "2.3.3"
}
},
+"fs-extra": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz;,
+ "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+ "dev": true,
+ "requires": {
+"graceful-fs": "4.1.11",
+"jsonfile": "4.0.0",
+"universalify": "0.1.1"
+ }
+},
"fs-write-stream-atomic": {
[MediaWiki-commits] [Gerrit] marvin[master]: New: Add initial favicon
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391878 )
Change subject: New: Add initial favicon
..
New: Add initial favicon
Add initial version of the favicon. In the future this should change
depending on the language/project that is active for the user.
Supporting changes:
* Copy assets in src/public verbatim to /dist/public when building the
client assets
* Add CopyWebpackPlugin for such. In development these assets are
served by webpack-dev-server from memory, and in production they
are copied to the file system
* Improved /src/server/assets/manifest.ts#asset to be able to construct
a path for assets that are not in the manifest, by just linking to the
fs output path, for files that are copied from src/public
Bug: T179305
Change-Id: Ie06753b14bfd3898e47ee682c1a8bc2d0f9d
---
M package-lock.json
M package.json
M src/client/webpack.config.ts
A src/public/favicon/wikipedia.ico
M src/server/assets/manifest.ts
M src/server/components/html-page.tsx
6 files changed, 1,038 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/78/391878/1
diff --git a/package-lock.json b/package-lock.json
index 84ec6ee..23e0923 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,16 @@
"@types/express": "4.0.39"
}
},
+"@types/copy-webpack-plugin": {
+ "version": "4.0.1",
+ "resolved":
"https://registry.npmjs.org/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz;,
+ "integrity":
"sha512-+R4A5pYLCUhchrZdmTt9FRhtHAACxkgtENPTrciuSlk9+bloMqKAri97+41rbNlboAuV9OQLjz90aTvbzR/S+A==",
+ "dev": true,
+ "requires": {
+"@types/minimatch": "3.0.1",
+"@types/webpack": "3.0.9"
+ }
+},
"@types/express": {
"version": "4.0.39",
"resolved":
"https://registry.npmjs.org/@types/express/-/express-4.0.39.tgz;,
@@ -80,6 +90,12 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.1.tgz;,
"integrity":
"sha512-rek8twk9C58gHYqIrUlJsx8NQMhlxqHzln9Z9ODqiNgv3/s+ZwIrfr+djqzsnVM12xe9hL98iJ20lj2RvCBv6A==",
+ "dev": true
+},
+"@types/minimatch": {
+ "version": "3.0.1",
+ "resolved":
"https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz;,
+ "integrity":
"sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
"dev": true
},
"@types/mocha": {
@@ -954,6 +970,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
+"fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -1286,6 +1303,51 @@
"mkdirp": "0.5.1",
"rimraf": "2.6.2",
"run-queue": "1.0.3"
+ }
+},
+"copy-webpack-plugin": {
+ "version": "4.2.0",
+ "resolved":
"https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz;,
+ "integrity":
"sha512-eZERim02YjJcepLjrToQMapOoRLfiXewJi9zJON6xXNNJSUhkGzL1L/yFjOufS0KxsnWUzc2szg9t8ZaZKJXAg==",
+ "dev": true,
+ "requires": {
+"bluebird": "3.5.1",
+"fs-extra": "4.0.2",
+"glob": "7.1.2",
+"is-glob": "4.0.0",
+"loader-utils": "0.2.17",
+"lodash": "4.17.4",
+"minimatch": "3.0.4",
+"node-dir": "0.1.17"
+ },
+ "dependencies": {
+"is-extglob": {
+ "version": "2.1.1",
+ "resolved":
"https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz;,
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "dev": true
+},
+"is-glob": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz;,
+ "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+ "dev": true,
+ "requires": {
+"is-extglob": "2.1.1"
+ }
+},
+"loader-utils": {
+ "version": "0.2.17",
+ "resolved":
"https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz;,
+ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+ "dev": true,
+ "requires": {
+"big.js": "3.1.3",
+"emojis-list": "2.1.0",
+"json5": "0.5.1",
+"object-assign": "4.1.1"
+ }
+}
}
},
"core-js": {
@@ -2646,6 +2708,17 @@
"readable-stream": "2.3.3"
}
},
+"fs-extra": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz;,
+ "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+ "dev": true,
+ "requires": {
+"graceful-fs": "4.1.11",
+"jsonfile": "4.0.0",
+"universalify": "0.1.1"
+ }
+},
"fs-write-stream-atomic": {
"version":
