diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..330d9b6 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +*-profile/ +dist/ +vscode-icons/ diff --git a/Safari/Gitako/Gitako.xcodeproj/project.pbxproj b/Safari/Gitako/Gitako.xcodeproj/project.pbxproj index eb1f85a..fdaf760 100644 --- a/Safari/Gitako/Gitako.xcodeproj/project.pbxproj +++ b/Safari/Gitako/Gitako.xcodeproj/project.pbxproj @@ -481,6 +481,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -542,6 +543,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -565,10 +567,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = "Gitako Extension/Gitako_Extension.entitlements"; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3.6.1; + CODE_SIGN_IDENTITY = "Developer ID Application"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = KVT97368XL; + ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Gitako Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -576,9 +579,10 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.6.1; + MARKETING_VERSION = 3.7.4; PRODUCT_BUNDLE_IDENTIFIER = enixcoda.Gitako.Extension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; }; @@ -588,10 +592,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = "Gitako Extension/Gitako_Extension.entitlements"; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3.6.1; + CODE_SIGN_IDENTITY = "Developer ID Application"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = KVT97368XL; + ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Gitako Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -599,9 +604,10 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.6.1; + MARKETING_VERSION = 3.7.4; PRODUCT_BUNDLE_IDENTIFIER = enixcoda.Gitako.Extension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; }; @@ -614,8 +620,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Gitako/Gitako.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Developer ID Application"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = KVT97368XL; @@ -625,9 +631,10 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.6.1; + MARKETING_VERSION = 3.7.4; PRODUCT_BUNDLE_IDENTIFIER = enixcoda.Gitako; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Developer Sign for Distribution"; SWIFT_VERSION = 5.0; }; name = Debug; @@ -639,8 +646,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Gitako/Gitako.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Developer ID Application"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = KVT97368XL; @@ -650,9 +657,10 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.6.1; + MARKETING_VERSION = 3.7.4; PRODUCT_BUNDLE_IDENTIFIER = enixcoda.Gitako; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Developer Sign for Distribution"; SWIFT_VERSION = 5.0; }; name = Release; diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Contents.json b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Contents.json index 1fc4d50..5136086 100644 --- a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,16 +1,19 @@ { "images" : [ { + "filename" : "Gitako-16.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { + "filename" : "Gitako-32.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { + "filename" : "Gitako-33.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" @@ -28,6 +31,7 @@ "size" : "128x128" }, { + "filename" : "Gitako-257.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" @@ -39,16 +43,19 @@ "size" : "256x256" }, { + "filename" : "Gitako-513.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { + "filename" : "Gitako-512.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { + "filename" : "Gitako-1024.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-1024.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-1024.png new file mode 100644 index 0000000..cae095d Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-1024.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-16.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-16.png new file mode 100644 index 0000000..285379f Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-16.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-257.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-257.png new file mode 100644 index 0000000..6902e60 Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-257.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-32.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-32.png new file mode 100644 index 0000000..624ce80 Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-32.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-33.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-33.png new file mode 100644 index 0000000..624ce80 Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-33.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-512.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-512.png new file mode 100644 index 0000000..327de05 Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-512.png differ diff --git a/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-513.png b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-513.png new file mode 100644 index 0000000..327de05 Binary files /dev/null and b/Safari/Gitako/Gitako/Assets.xcassets/AppIcon.appiconset/Gitako-513.png differ diff --git a/Safari/Gitako/Gitako/Info.plist b/Safari/Gitako/Gitako/Info.plist index c748bf6..0d2a45b 100644 --- a/Safari/Gitako/Gitako/Info.plist +++ b/Safari/Gitako/Gitako/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - $(MARKETING_VERSION) + $(CURRENT_PROJECT_VERSION) LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/jest.config.js b/jest.config.js index 23ca7d6..313b653 100644 --- a/jest.config.js +++ b/jest.config.js @@ -64,10 +64,7 @@ module.exports = { maxWorkers: 8, // An array of directory names to be searched recursively up from the requiring module's location - moduleDirectories: [ - "src", - "node_modules" - ], + moduleDirectories: ['src', 'node_modules'], // An array of file extensions your modules use // moduleFileExtensions: [ diff --git a/package.json b/package.json index 978818b..a7aa07d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "roll": "make release", "test": "yarn run test:parallel && yarn run test:non-parallel", "test:parallel": "NODE_ENV=test jest --config __tests__/jest.parallel.config.js", - "test:non-parallel": "NODE_ENV=test jest --config __tests__/jest.non-parallel.config.js" + "test:non-parallel": "NODE_ENV=test jest --config __tests__/jest.non-parallel.config.js", + "format": "prettier --write '**/*.{js,jsx,ts,tsx}'" }, "dependencies": { "@primer/css": "^20.2.2", @@ -76,6 +77,7 @@ "jest-puppeteer": "^6.1.0", "json-loader": "^0.5.7", "mini-css-extract-plugin": "^0.9.0", + "prettier": "^2.7.1", "puppeteer": "^10.1.0", "raw-loader": "^4.0.0", "sass": "^1.26.2", diff --git a/yarn.lock b/yarn.lock index 0d1cfa0..ff243c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9504,6 +9504,11 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +prettier@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== + pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"