From 66396dfaa292827fb6a2148a7a6801ddb13f67df Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 22 Aug 2019 08:51:08 -0400 Subject: [PATCH] move re-organize app path. cleanup old safari --- gulpfile.js | 54 +--------- src/safari/Icon-128.png | Bin 2443 -> 0 bytes src/safari/Icon-32.png | Bin 749 -> 0 bytes src/safari/Icon-48.png | Bin 1059 -> 0 bytes src/safari/Icon-64.png | Bin 1251 -> 0 bytes src/safari/Icon-96.png | Bin 1954 -> 0 bytes src/safari/Info.plist | 96 ------------------ .../desktop.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../UserInterfaceState.xcuserstate | Bin .../xcschemes/xcschememanagement.plist | 0 .../desktop => }/desktop/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../desktop/Assets.xcassets/Contents.json | 0 .../desktop/Base.lproj/Main.storyboard | 0 .../{app/desktop => }/desktop/Info.plist | 0 .../desktop => }/desktop/ViewController.swift | 0 .../desktop => }/desktop/desktop.entitlements | 0 .../SafariExtensionViewController.xib | 0 .../{app/desktop => }/safari/Info.plist | 0 .../safari/SafariExtensionHandler.swift | 0 .../SafariExtensionViewController.swift | 0 .../desktop => }/safari/ToolbarItemIcon.pdf | Bin .../desktop => }/safari/app/popup/index.html | 0 .../desktop => }/safari/safari.entitlements | 0 src/safari/{app/desktop => }/safari/script.js | 0 27 files changed, 5 insertions(+), 145 deletions(-) delete mode 100644 src/safari/Icon-128.png delete mode 100644 src/safari/Icon-32.png delete mode 100644 src/safari/Icon-48.png delete mode 100644 src/safari/Icon-64.png delete mode 100644 src/safari/Icon-96.png delete mode 100644 src/safari/Info.plist rename src/safari/{app/desktop => }/desktop.xcodeproj/project.pbxproj (100%) rename src/safari/{app/desktop => }/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename src/safari/{app/desktop => }/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename src/safari/{app/desktop => }/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate (100%) rename src/safari/{app/desktop => }/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename src/safari/{app/desktop => }/desktop/AppDelegate.swift (100%) rename src/safari/{app/desktop => }/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename src/safari/{app/desktop => }/desktop/Assets.xcassets/Contents.json (100%) rename src/safari/{app/desktop => }/desktop/Base.lproj/Main.storyboard (100%) rename src/safari/{app/desktop => }/desktop/Info.plist (100%) rename src/safari/{app/desktop => }/desktop/ViewController.swift (100%) rename src/safari/{app/desktop => }/desktop/desktop.entitlements (100%) rename src/safari/{app/desktop => }/safari/Base.lproj/SafariExtensionViewController.xib (100%) rename src/safari/{app/desktop => }/safari/Info.plist (100%) rename src/safari/{app/desktop => }/safari/SafariExtensionHandler.swift (100%) rename src/safari/{app/desktop => }/safari/SafariExtensionViewController.swift (100%) rename src/safari/{app/desktop => }/safari/ToolbarItemIcon.pdf (100%) rename src/safari/{app/desktop => }/safari/app/popup/index.html (100%) rename src/safari/{app/desktop => }/safari/safari.entitlements (100%) rename src/safari/{app/desktop => }/safari/script.js (100%) diff --git a/gulpfile.js b/gulpfile.js index 9f130d30532..1a188304b9b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,7 +17,8 @@ const paths = { coverage: './coverage/', node_modules: './node_modules/', popupDir: './src/popup/', - cssDir: './src/popup/css/' + cssDir: './src/popup/css/', + safari: './src/safari/' }; const filters = { @@ -28,10 +29,6 @@ const filters = { 'build/popup/fonts/fontawesome*.woff' ], safari: [ - '!build/safari/**/*', - '!build/downloader/**/*' - ], - safariDir: [ '!build/safari/**/*' ], webExt: [ @@ -163,14 +160,10 @@ function edgeCopyAssets(source, dest) { function distSafari(cb) { const buildPath = paths.dist + 'Safari/'; - const extBuildPath = buildPath + 'bitwarden.safariextension/'; - const extAssetsBuildPath = extBuildPath + 'safari/'; return del([buildPath + '**/*']) - .then(() => safariCopyBuild(paths.build + '**/*', extBuildPath)) - .then(() => copy(extAssetsBuildPath + '**/*', extBuildPath)) - .then(() => del([extAssetsBuildPath])) - .then(() => safariZip(buildPath)) + .then(() => copy(paths.safari + '**/*', buildPath)) + .then(() => safariCopyBuild(paths.build + '**/*', buildPath + 'safari/app')) .then(() => { return cb; }, () => { @@ -182,43 +175,7 @@ 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__', 'browser_safari'))) - .pipe(gulp.dest(dest)) - .on('end', resolve); - }); -} - -function safariZip(buildPath) { - return new Promise((resolve, reject) => { - gulp.src(buildPath + '**/*') - .on('error', reject) - .pipe(zip(distFileName('safari', 'zip'))) - .pipe(gulp.dest(paths.dist)) - .on('end', resolve); - }); -} - -function distSafariApp(cb) { - const buildPath = paths.dist + 'Safari/'; - const extBuildPath = buildPath + 'app_extension/'; - const appPath = './src/safari/app/desktop/' - - return del([buildPath + '**/*']) - .then(() => copy(appPath + '**/*', extBuildPath)) - .then(() => safariAppCopyBuild(paths.build + '**/*', extBuildPath + 'safari/app')) - .then(() => { - return cb; - }, () => { - return cb; - }); -} - -function safariAppCopyBuild(source, dest) { - return new Promise((resolve, reject) => { - gulp.src(source) - .on('error', reject) - .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.safariDir) + .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts) .concat(filters.webExt).concat(filters.nonSafariApp))) .pipe(gulp.dest(dest)) .on('end', resolve); @@ -262,7 +219,6 @@ exports['dist:chrome'] = distChrome; exports['dist:opera'] = distOpera; exports['dist:edge'] = distEdge; exports['dist:safari'] = distSafari; -exports['dist:safariApp'] = distSafariApp; exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge, distSafari); exports['ci:coverage'] = ciCoverage; exports.ci = ciCoverage; diff --git a/src/safari/Icon-128.png b/src/safari/Icon-128.png deleted file mode 100644 index 7e819bcb88c467c221a0a4cc3f6cc7cfbf862508..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2443 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 diff --git a/src/safari/Icon-64.png b/src/safari/Icon-64.png deleted file mode 100644 index 538d20b76b5e07ff0ce564a67f5ab3991e4f894d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1251 zcmV<91RVQ`P)pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMGBAcGSpxt71Yk)-K~#8N?VDRq6G0e;_h+cr>R&Li1>!kgnCOMacxgB{vt_Kb3*H5^=qe?M zc030GFW?EhF`KwjGM}b8+@3+KlVkwAfk$RnEjZwG$pNe|sQ{0ePnI#;Q%cFISV#{J zL^MuP94@&JJTv=}L|-h?Hkt>NOqqAdOPy{xj5J7csAuY(22gn#Z!iy_-X(fI)Sw3u zQYhD7ekMKs0O=V?FzB2LYdg_->jB;+dVd_k4q_a*-9!>y>E%u6+%dqrR5?3%sZ0;D~9qs_=L5ySz01yFSFX|xzusMLgp)lE7+DLZasOMr=Nj+)p|HXPy zYit^4UMwl ztjlZw^G>y~R^m4vcABN=sfQ(1)OtRa(z_ADKly`+kGXvO0-}Q!We1$htFvg*~Zz9Gwi){e_uuA(mHo>N9EHDFW zcX;?Rmhk+639{!_13I=@Yz+X|Mpug6Iv-WFf)7?;Di(FoJI)ppD?KA@4*-CVt9Gpx zL2_$9SxfuG#(S0R&ZLu#W0s1 zTS41kwQ<4+0i4pj78zIL+yQhY9Q2AmRGW|VzH^KsLZ%X339 z4_bb{a#1pGnA8H>=D;(vKP9L8S(>t`5GhD1u#J<`n%X)$JGaIELDa3Y(^7VkX2}Kd zULegTiWln1aP#y`rDj(yab(FSVQU%1k9C~Lz?_x2QxD*U+0sao{sD3-z_2pGiwgh% N002ovPDHLkV1k1gBr*U1 diff --git a/src/safari/Icon-96.png b/src/safari/Icon-96.png deleted file mode 100644 index be9917680d7caa612bf855fd4e12d843ab866ddc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/src/safari/Info.plist b/src/safari/Info.plist deleted file mode 100644 index 021b39859f1..00000000000 --- a/src/safari/Info.plist +++ /dev/null @@ -1,96 +0,0 @@ - - - - - Author - 8bit Solutions LLC - Builder Version - 13604.4.7.1.3 - CFBundleDisplayName - Bitwarden - CFBundleIdentifier - com.bitwarden.safari - CFBundleInfoDictionaryVersion - 6.0 - CFBundleShortVersionString - 1.41.0 - CFBundleVersion - 1.41.0 - Chrome - - Database Quota - 104857600 - Global Page - background.html - Popovers - - - Filename - popup/index.html - Height - 600 - Identifier - bitwarden-popover - Width - 375 - - - Toolbar Items - - - Identifier - bitwarden-toolbar - Image - images/icon18_safari.png - Include By Default - - Label - Bitwarden - Palette Label - Bitwarden - Popover - bitwarden-popover - Tool Tip - Bitwarden - - - - Content - - Scripts - - Start - - content/autofill.js - content/autofiller.js - content/notificationBar.js - content/shortcuts.js - - - Stylesheets - - content/autofill.css - - - Description - A secure and free password manager for all of your devices. - DeveloperIdentifier - LTZ2PFU5D6 - ExtensionInfoDictionaryVersion - 1.0 - Permissions - - Website Access - - Include Secure Pages - - Level - All - - - Update Manifest URL - https://bitwarden.com/misc/safari-extension.xml - Website - https://bitwarden.com - - diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj b/src/safari/desktop.xcodeproj/project.pbxproj similarity index 100% rename from src/safari/app/desktop/desktop.xcodeproj/project.pbxproj rename to src/safari/desktop.xcodeproj/project.pbxproj diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/safari/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to src/safari/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate b/src/safari/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate rename to src/safari/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/src/safari/app/desktop/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist b/src/safari/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from src/safari/app/desktop/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist rename to src/safari/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/src/safari/app/desktop/desktop/AppDelegate.swift b/src/safari/desktop/AppDelegate.swift similarity index 100% rename from src/safari/app/desktop/desktop/AppDelegate.swift rename to src/safari/desktop/AppDelegate.swift diff --git a/src/safari/app/desktop/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from src/safari/app/desktop/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json rename to src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/src/safari/app/desktop/desktop/Assets.xcassets/Contents.json b/src/safari/desktop/Assets.xcassets/Contents.json similarity index 100% rename from src/safari/app/desktop/desktop/Assets.xcassets/Contents.json rename to src/safari/desktop/Assets.xcassets/Contents.json diff --git a/src/safari/app/desktop/desktop/Base.lproj/Main.storyboard b/src/safari/desktop/Base.lproj/Main.storyboard similarity index 100% rename from src/safari/app/desktop/desktop/Base.lproj/Main.storyboard rename to src/safari/desktop/Base.lproj/Main.storyboard diff --git a/src/safari/app/desktop/desktop/Info.plist b/src/safari/desktop/Info.plist similarity index 100% rename from src/safari/app/desktop/desktop/Info.plist rename to src/safari/desktop/Info.plist diff --git a/src/safari/app/desktop/desktop/ViewController.swift b/src/safari/desktop/ViewController.swift similarity index 100% rename from src/safari/app/desktop/desktop/ViewController.swift rename to src/safari/desktop/ViewController.swift diff --git a/src/safari/app/desktop/desktop/desktop.entitlements b/src/safari/desktop/desktop.entitlements similarity index 100% rename from src/safari/app/desktop/desktop/desktop.entitlements rename to src/safari/desktop/desktop.entitlements diff --git a/src/safari/app/desktop/safari/Base.lproj/SafariExtensionViewController.xib b/src/safari/safari/Base.lproj/SafariExtensionViewController.xib similarity index 100% rename from src/safari/app/desktop/safari/Base.lproj/SafariExtensionViewController.xib rename to src/safari/safari/Base.lproj/SafariExtensionViewController.xib diff --git a/src/safari/app/desktop/safari/Info.plist b/src/safari/safari/Info.plist similarity index 100% rename from src/safari/app/desktop/safari/Info.plist rename to src/safari/safari/Info.plist diff --git a/src/safari/app/desktop/safari/SafariExtensionHandler.swift b/src/safari/safari/SafariExtensionHandler.swift similarity index 100% rename from src/safari/app/desktop/safari/SafariExtensionHandler.swift rename to src/safari/safari/SafariExtensionHandler.swift diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/safari/SafariExtensionViewController.swift similarity index 100% rename from src/safari/app/desktop/safari/SafariExtensionViewController.swift rename to src/safari/safari/SafariExtensionViewController.swift diff --git a/src/safari/app/desktop/safari/ToolbarItemIcon.pdf b/src/safari/safari/ToolbarItemIcon.pdf similarity index 100% rename from src/safari/app/desktop/safari/ToolbarItemIcon.pdf rename to src/safari/safari/ToolbarItemIcon.pdf diff --git a/src/safari/app/desktop/safari/app/popup/index.html b/src/safari/safari/app/popup/index.html similarity index 100% rename from src/safari/app/desktop/safari/app/popup/index.html rename to src/safari/safari/app/popup/index.html diff --git a/src/safari/app/desktop/safari/safari.entitlements b/src/safari/safari/safari.entitlements similarity index 100% rename from src/safari/app/desktop/safari/safari.entitlements rename to src/safari/safari/safari.entitlements diff --git a/src/safari/app/desktop/safari/script.js b/src/safari/safari/script.js similarity index 100% rename from src/safari/app/desktop/safari/script.js rename to src/safari/safari/script.js