Skip to content

Commit

Permalink
Merge branch 'mas'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.babelrc
#	.browserslistrc
#	.editorconfig
#	.github/ISSUE_TEMPLATE/bug_report.md
#	.github/ISSUE_TEMPLATE/feature_request.md
#	.gitignore
#	Polyglot.safariextension/Info.plist
#	Polyglot.safariextension/api.js
#	Polyglot.safariextension/global.html
#	Polyglot.safariextension/global.js
#	Polyglot.safariextension/injected.js
#	Polyglot.safariextension/keymap.js
#	README.md
#	docs/manifest.plist
#	package.json
#	webpack.config.js
#	yarn.lock
  • Loading branch information
uetchy committed Jul 11, 2019
2 parents 7e4907c + 2d63c4d commit 2857054
Show file tree
Hide file tree
Showing 63 changed files with 5,536 additions and 2,301 deletions.
15 changes: 12 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
[
"@babel/env",
{
"useBuiltIns": "usage"
"useBuiltIns": "usage",
"corejs": 3
}
]
]
],
"@babel/typescript"
],
"env": {
"production": {
"plugins": [
["transform-remove-console", { "exclude": ["error", "warn"] }]
]
}
}
}
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
safari 11
safari 12
safari 12
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*.swift]
indent_style = space
indent_size = 2
charset = utf-8
insert_final_newline = true

1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @uetchy
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,7 +24,8 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Version (please complete the following information):**
- Version [e.g. 22]

- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
4 changes: 4 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
template: |
## What’s Changed
$CHANGES
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
115 changes: 108 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
*.safariextz
*.entry.js
*.log
/.vscode/
/Artifacts
*.bundle.js

# Created by https://www.gitignore.io/api/node
# Edit at https://www.gitignore.io/?templates=node
# Created by https://www.gitignore.io/api/visualstudiocode,node,xcode,swift
# Edit at https://www.gitignore.io/?templates=visualstudiocode,node,xcode,swift

### Node ###
# Logs
Expand Down Expand Up @@ -88,4 +86,107 @@ typings/
# DynamoDB Local files
.dynamodb/

# End of https://www.gitignore.io/api/node
### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

# CocoaPods
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# Pods/
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts

Carthage/Build

# fastlane
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

### VisualStudioCode Patch ###
# Ignore all local history of files
.history

### Xcode ###
# Xcode
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.gitignore.io/api/visualstudiocode,node,xcode,swift
2 changes: 2 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--indent 2
--exclude Carthage
13 changes: 13 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
language: swift
osx_image: xcode10.2
before_install:
- HOMEBREW_NO_INSTALL_CLEANUP=1 brew install yarn
install:
- carthage update --platform macos --cache-builds
- yarn install
script:
- yarn build:script
- set -o pipefail && xcodebuild clean build -scheme Polyglot CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty
cache:
directories:
- Carthage
44 changes: 0 additions & 44 deletions CHANGELOG.md

This file was deleted.

26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Contribution Guide

## Setup development environment

Install dependencies and run `yarn start` to watch TypeScript files.

```bash
yarn install # => Install deps
yarn start # => Start webpack to watch .ts files
```

then open up `Preference > Extentions` in Safari and make sure `Polyglot` is enabled in the extention panel.

## Build

```bash
yarn build # => just build ts / swift
yarn ship # => build ts / swift and generate .app
```

## Before commit

```bash
yarn build # => build codebase to ensure there are no errors
yarn format # => format code with SwiftFormat
```
3 changes: 3 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github "Alamofire/Alamofire" ~> 4.7
github "Clipy/KeyHolder"
github "Clipy/Magnet"
3 changes: 3 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github "Alamofire/Alamofire" "4.8.2"
github "Clipy/KeyHolder" "v3.0.1"
github "Clipy/Magnet" "v2.3.1"
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bootstrap:
carthage update --platform macos
yarn install
Binary file removed Polyglot.safariextension/Icon.png
Binary file not shown.
Loading

0 comments on commit 2857054

Please sign in to comment.