From ea7f6a404bfbf0e3360cc5e0881fdfb757579776 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 16 Jan 2018 09:41:59 -0500 Subject: [PATCH] safari assets folder and gulp task --- gulpfile.js | 19 +++++++++++++++--- src/images/icon64_gray.png | Bin 1152 -> 0 bytes src/safari/Icon-128.png | Bin 0 -> 2443 bytes src/safari/Icon-32.png | Bin 0 -> 749 bytes src/safari/Icon-48.png | Bin 0 -> 1059 bytes src/{images/icon64.png => safari/Icon-64.png} | Bin src/safari/Icon-96.png | Bin 0 -> 1954 bytes src/{ => safari}/Info.plist | 0 webpack.common.js | 2 +- 9 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 src/images/icon64_gray.png create mode 100644 src/safari/Icon-128.png create mode 100644 src/safari/Icon-32.png create mode 100644 src/safari/Icon-48.png rename src/{images/icon64.png => safari/Icon-64.png} (100%) create mode 100644 src/safari/Icon-96.png rename src/{ => safari}/Info.plist (100%) diff --git a/gulpfile.js b/gulpfile.js index f93804438c..3cc52c47ac 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -27,7 +27,7 @@ const filters = { 'build/popup/fonts/fontawesome*.woff' ], safari: [ - '!build/Info.plist', + '!build/safari/**/*', '!build/downloader/**/*' ], webExt: [ @@ -162,9 +162,12 @@ gulp.task('ci:coverage', (cb) => { gulp.task('safari:build', (cb) => { const buildPath = './build.safariextension/'; + const safariAssetsBuildPath = buildPath + 'safari/'; return del([buildPath + '**/*']) - .then(() => safariMoveBuild(paths.build + '**/*', buildPath)) + .then(() => safariCopyBuild(paths.build + '**/*', buildPath)) + .then(() => copy(safariAssetsBuildPath + '**/*', buildPath)) + .then(() => del([safariAssetsBuildPath])) .then(() => { return cb; }, () => { @@ -172,11 +175,21 @@ gulp.task('safari:build', (cb) => { }); }); -function safariMoveBuild(source, dest) { +function safariCopyBuild(source, dest) { return new Promise((resolve, reject) => { gulp.src(source) .on('error', reject) .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.webExt))) + .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'safari'))) + .pipe(gulp.dest(dest)) + .on('end', resolve); + }); +} + +function copy(source, dest) { + return new Promise((resolve, reject) => { + gulp.src(source) + .on('error', reject) .pipe(gulp.dest(dest)) .on('end', resolve); }); diff --git a/src/images/icon64_gray.png b/src/images/icon64_gray.png deleted file mode 100644 index f94d33c3b3415c0374928278c8bbe60d05102914..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 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 literal 0 HcmV?d00001 diff --git a/src/images/icon64.png b/src/safari/Icon-64.png similarity index 100% rename from src/images/icon64.png rename to src/safari/Icon-64.png diff --git a/src/safari/Icon-96.png b/src/safari/Icon-96.png new file mode 100644 index 0000000000000000000000000000000000000000..be9917680d7caa612bf855fd4e12d843ab866ddc GIT binary patch literal 1954 zcmV;T2VMAyP)bnc{d(;x?o!0SstIr2`r2iEvcn`UwFx zv)j?k9c}I?04cMYxzP-(ZJx#^KpaOqnny=*HUa2|mCT9eAkKYBfJNOU3JldioG+qM z#4IIR8_>@H@6H?n;RAi3rPbn|H3z*8D(jlyoAY^4@St9aCTEcV<9geQkHHgmEFKRL zA^qLH+l~zO!%pT4>kg;E-TS>3VH~-j;k|8TNmS@lLH_^QYJYEt9Wz*oriPOMy)Lo^ z`FTBc4&2Y%Q;BB$_3g8=o}$%FeSUYaD09mOJqIJs1q;9eumB7v!qb&6-qg|x2U827 z!DI%VPN6oj7z_*ak#(Q{vjmK_O=1i1C-#sFw=0Dw-`mpz*1a?uriTxdb$k(qo(KLdR6g@oxQg(TnKyANzzI1c8F8YKIi zV;RM8E?1oZL$&z;+QsD3o%=$OAL!!+TNXsZG?{LPK-*LPfKRkqP)z_cCS{)|=2+8q zQ9{kHmqo**Ap>Ne^T=d|?WeQg!6TFF2|%c*ZG^2SGga}Oj$rZlQ226bwCrey&}y;3 zwo^ACTjdgq>Qj<8%WGl%;dE$dHao@TY>FKV@6Q=!9e5o9k)M>WerB)9oG|sG&Brqo z%^>Yz!t(*J=ktQ$ zk}5zN=YB(R5YBB}~xX`SltY>zb6m5uFZR961Q~t(Xe0pwD*{R9@bC zA`^~hlxXTEHQzIis)?(9xdxvtiIP=)v^P+iEv+yj$Pd^j8ErvNH5ZU zQb{*sXQESz__X8tM++li^3cE@w?PAYW=SugQ@V<$=CoqU`G2|K!q}+q^xfRx^W=byx==Pv>OP?m>Ku)=ED>qCe0KNM* zNTjPOt7(L|Bk2$`Is{fu4|h1BvVn?e`!K0Gj6I(QeF0HT0_2G%0D+dcoRVhO=p8k0 zOd0~-4h+&q(u-jK)dH)S0wa$E$UvJW>J`$)+<$db5zq7*@c!pmqz=14UdC5{_9 z69A;7EY|jTFcd|x#BE;tUv^fEOF^56mdu4$*4sIG16nxRchFX}W5`3b#96q+VV9j)&V&pp_cq#lXfbH>p{;gAm9Z%1+KMzZ on#8z-b{Z`K+RFTP@t*(#0DAF2GH_{q-~a#s07*qoM6N<$g55-!zW@LL literal 0 HcmV?d00001 diff --git a/src/Info.plist b/src/safari/Info.plist similarity index 100% rename from src/Info.plist rename to src/safari/Info.plist diff --git a/webpack.common.js b/webpack.common.js index 4841981e6c..bcc6b4699f 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -102,9 +102,9 @@ module.exports = { }), new CopyWebpackPlugin([ './src/manifest.json', - './src/Info.plist', { from: './src/_locales', to: '_locales' }, { from: './src/edge', to: 'edge' }, + { from: './src/safari', to: 'safari' }, { from: './src/images', to: 'images' }, { from: './src/content/autofill.css', to: 'content' } ])