Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpaul committed Jan 27, 2022
2 parents e9f5421 + 3d3facc commit ed1aafe
Show file tree
Hide file tree
Showing 40 changed files with 27,250 additions and 12,324 deletions.
3 changes: 2 additions & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
.eslintrc
.gitignore
.phpcs.xml
.wp-env.json
CHANGELOG.md
CODE_OF_CONDUCT.md
composer.json
composer.lock
CONTRIBUTING.md
CREDITS.md
LICENSE.md
package.json
package-lock.json
package.json
README.md
30 changes: 30 additions & 0 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: No Response

# **What it does**: Closes issues where the original author doesn't respond to a request for information.
# **Why we have it**: To remove the need for maintainers to remember to check back on issues periodically to see if contributors have responded.
# **Who does it impact**: Everyone that works on docs or docs-internal.

on:
issue_comment:
types: [created]
schedule:
# Schedule for five minutes after the hour, every hour
- cron: '5 * * * *'

jobs:
noResponse:
runs-on: ubuntu-latest
steps:
- uses: lee-dohm/no-response@v0.5.0
with:
token: ${{ github.token }}
daysUntilClose: 14 # Number of days of inactivity before an Issue is closed for lack of response
responseRequiredLabel: "needs:feedback" # Label indicating that a response from the original author is required
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further. See [this blog post on bug reports and the
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
for more information about the kind of information that may be helpful.
15 changes: 6 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
phpcs:
name: phpcs
name: WPCS
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: composer install
run: composer install
- name: PHPCS check
uses: chekalsky/phpcs-action@v1
with:
phpcs_bin_path: './vendor/bin/phpcs'
- uses: actions/checkout@v2
- name: WPCS check
uses: 10up/wpcs-action@stable
with:
use_local_config: true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16
3 changes: 3 additions & 0 deletions .wp-env.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": [ "." ]
}
30 changes: 28 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,33 @@
All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/), and will adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - TBD

## [1.0.2] - 2022-01-28
### Added
- Resize Handle to modify the height of the Map inline
- `wp env` for local development (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul) via [#77](https://github.com/10up/maps-block-apple/pull/77)).
- Issue management automation via GitHub Actions (props [@jeffpaul](https://github.com/jeffpaul) via [#96](https://github.com/10up/maps-block-apple/pull/96)).

### Changed
- Bump WordPress version "tested up to" 5.9 (props [@jeffpaul](https://github.com/jeffpaul), [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@barneyjeffries](https://github.com/barneyjeffries) via [#80](https://github.com/10up/maps-block-apple/pull/80), [#99](https://github.com/10up/maps-block-apple/pull/99)).
- Turn off `autoComplete` for the search input field (props [@dinhtungdu](https://github.com/dinhtungdu) via [#111](https://github.com/10up/maps-block-apple/pull/111)).

### Fixed
- `block.json` syntax error (props [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul), [@ryanwelcher](https://github.com/ryanwelcher) via [#76](https://github.com/10up/maps-block-apple/pull/76)).
- Enqueue map assets only when being used and clean up unused assets (props [@joshuaabenazer](https://github.com/joshuaabenazer), [@fabiankaegy](https://github.com/fabiankaegy) via [#97](https://github.com/10up/maps-block-apple/pull/97)).
- Remove orign restriction in local environments to allow for proxied domains (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu) via [#98](https://github.com/10up/maps-block-apple/pull/98)).
- Block not working in Site Editor due to iframed editor (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu) via [#99](https://github.com/10up/maps-block-apple/pull/99)).
- Search popover sizing (props [@fabiankaegy](https://github.com/fabiankaegy), [@dinhtungdu](https://github.com/dinhtungdu), [@ankitguptaindia](https://github.com/ankitguptaindia) via [#110](https://github.com/10up/maps-block-apple/pull/110)).

### Security
- Bump `ini` from 1.3.5 to 1.3.8 (props [@dependabot](https://github.com/apps/dependabot) via [#79](https://github.com/10up/maps-block-apple/pull/79)).
- Bump `elliptic` from 6.5.3 to 6.5.4 (props [@dependabot](https://github.com/apps/dependabot) via [#81](https://github.com/10up/maps-block-apple/pull/81)).
- Bump `y18n` from 4.0.0 to 4.0.1 (props [@dependabot](https://github.com/apps/dependabot) via [#84](https://github.com/10up/maps-block-apple/pull/84)).
- Bump `ssri` from 6.0.1 to 6.0.2 (props [@dependabot](https://github.com/apps/dependabot) via [#86](https://github.com/10up/maps-block-apple/pull/86)).
- Bump `lodash` from 4.17.19 to 4.17.21 (props [@dependabot](https://github.com/apps/dependabot) via [#89](https://github.com/10up/maps-block-apple/pull/89)).
- Bump `hosted-git-info` from 2.8.8 to 2.8.9 (props [@dependabot](https://github.com/apps/dependabot) via [#90](https://github.com/10up/maps-block-apple/pull/90)).
- Bump `normalize-url` from 4.5.0 to 4.5.1 (props [@dependabot](https://github.com/apps/dependabot) via [#91](https://github.com/10up/maps-block-apple/pull/91)).
- Bump `path-parse` from 1.0.6 to 1.0.7 (props [@dependabot](https://github.com/apps/dependabot) via [#94](https://github.com/10up/maps-block-apple/pull/94)).

## [1.0.1] - 2020-08-11
### Added
- Internationalization support via loading translations for the block (props [@dinhtungdu](https://github.com/dinhtungdu), [@helen](https://github.com/helen) via [#69](https://github.com/10up/maps-block-apple/pull/69))
Expand Down Expand Up @@ -33,7 +58,7 @@ All notable changes to this project will be documented in this file, per [the Ke

### Changed
- Refactored codebase, build system to use `@wordpress/scripts` (props [@fabiankaegy](https://github.com/fabiankaegy), [@ryanwelcher](https://github.com/ryanwelcher) via [#20](https://github.com/10up/maps-block-apple/pull/20))
- Revamped settings screen to go with refactored codebase (props [@ryanwelcher] and(https://github.com/ryanwelcher) and [@dinhtungdu](https://github.com/dinhtungdu) via [#31](https://github.com/10up/maps-block-apple/pull/31))
- Revamped settings screen to go with refactored codebase (props [@ryanwelcher](https://github.com/ryanwelcher) and [@dinhtungdu](https://github.com/dinhtungdu) via [#31](https://github.com/10up/maps-block-apple/pull/31))
- Permissions to change the MapKit JS authentication keys to users with the capability to `manage_options` (props [@fabiankaegy](https://github.com/fabiankaegy), [@ryanwelcher](https://github.com/ryanwelcher) via [#29](https://github.com/10up/maps-block-apple/pull/29))
- Authorizations by passing a callback function to `authorizationCallback` (props [@fabiankaegy](https://github.com/fabiankaegy) via [#52](https://github.com/10up/maps-block-apple/pull/52))
- Re-licensed to GPLv2 (props [@jeffpaul](https://github.com/jeffpaul) via [#21](https://github.com/10up/maps-block-apple/pull/21))
Expand All @@ -45,6 +70,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial private release of Block for Apple Maps plugin.

[Unreleased]: https://github.com/10up/maps-block-apple/compare/trunk...develop
[1.0.2]: https://github.com/10up/maps-block-apple/compare/1.0.1...1.0.2
[1.0.1]: https://github.com/10up/maps-block-apple/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/10up/maps-block-apple/releases/tag/1.0.0
[0.1.0]: https://github.com/10up/maps-block-apple/tree/a2fe565d64e2c59070f2dc3611700718d7383d37
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,9 @@ The `develop` branch is the development branch which means it contains the next
12. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/maps-block-apple/. This may take a few minutes.
13. Close the milestone: Edit the [X.Y.Z milestone](/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
14. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X+1.0.0`, `X.Y+1.0`, `X.Y.Z+1`, or `Future Release`

## Local Development
This plugin can be installed with any local development instalation. To make it easier however it also comes with a bundled wp-env installation. So you can run `npm ci` to install the dependencies and then `npm run wp-env start` to start the local development server. For further documentation regarding the `@wordpress/env` package prese reffer to their docs here: [https://www.npmjs.com/package/@wordpress/env](https://www.npmjs.com/package/@wordpress/env)

### Asset compilation
Since this plugins uses JSX and ESNext there is a build step involved. To compile the assets you need to run `npm run build` locally. If you want to watch for changes and automatically rebuild during development you can run `npm start`
4 changes: 2 additions & 2 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ The following acknowledges the Maintainers for this repository, those who have C

The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.

[Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Jeffrey Paul](https://github.com/jeffpaul)
[Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Jeffrey Paul](https://github.com/jeffpaul)

## Contributors

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Helen Hou-Sandi (@helen)](https://github.com/helen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu).
[Helen Hou-Sandi (@helen)](https://github.com/helen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Fabian Kägy (@fabiankaegy)](https://github.com/fabiankaegy), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia).

## Libraries

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> An Apple Maps block for the WordPress block editor (Gutenberg).
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.5%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/blob/develop/LICENSE.md)
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/maps-block-apple?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/blob/develop/LICENSE.md)

## Overview

Expand Down Expand Up @@ -83,4 +83,4 @@ Please read [CODE_OF_CONDUCT.md](https://github.com/10up/maps-block-apple/blob/d

## Like what you see?

<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
<a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
162 changes: 90 additions & 72 deletions block.json
Original file line number Diff line number Diff line change
@@ -1,74 +1,92 @@
{
"name": "tenup/maps-block-apple",
"title": "Apple Maps",
"category": "embed",
"icon": <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 40 52"><path fill="#333" fillRule="evenodd" d="M37.15 9.802c0 4.936-3.698 9.05-8.46 9.709v11.854l-1.304 3.92-1.303-3.92V19.521c-4.8-.626-8.536-4.757-8.536-9.72 0-5.39 4.41-9.801 9.802-9.801 5.39 0 9.801 4.41 9.801 9.802zm-15.224-2.38c.74.633 2.088.274 3.01-.802.922-1.077 1.068-2.464.327-3.098-.74-.634-2.088-.275-3.01.802-.921 1.076-1.068 2.463-.327 3.097z" clipRule="evenodd"></path><path fill="#333" d="M12.85 25l11.277 3.776v2.589l3.26 8.821 3.258-8.821v-2.483L40 25v21.736l-12.124 4.93-15.026-4.93L0 51.666V30.032L12.85 25z"></path></svg>,
"description": "An Apple Maps block.",
"keywords": [ "apple", __( 'map' ), "apple map" ],
"attributes": {
"address": {
"type": "string",
"default": "",
},
"height": {
"type": "string",
"default": "450",
},
"latitude": {
"type": "number",
"default": 51.48762585296625,
},
"longitude": {
"type": "number",
"default": -0.1326724377053381,
},
"rotation": {
"type": "number",
"default": 0,
},
"zoom": {
"type": "number",
"default": 15,
},
"mapType": {
"type": "string",
"default": "Map.MapTypes.Standard",
},
"showsMapTypeControl": {
"type": "boolean",
"default": true,
},
"isRotationEnabled": {
"type": "boolean",
"default": true,
},
"showsCompass": {
"type": "string",
"default": "FeatureVisibility.Adaptive",
},
"isZoomEnabled": {
"type": "boolean",
"default": true,
},
"showsZoomControl": {
"type": "boolean",
"default": true,
},
"isScrollEnabled": {
"type": "boolean",
"default": true,
},
"showsScale": {
"type": "string",
"default": "FeatureVisibility.Adaptive",
},
"markers": {
"type": "array",
"default": [],
},
},
"editorScript": "file:build/index.js",
"editorStyle": "file:editor.css",
"script": "file:build/frontend.js",
"style": "file:style.css"
"name":"tenup/maps-block-apple",
"title":"Apple Maps",
"category":"embed",
"description":"Add an Apple Map to your site.",
"apiVersion": 2,
"keywords":[
"apple",
"map",
"apple map"
],
"attributes":{
"address":{
"type":"string",
"default":""
},
"height":{
"type":"string",
"default":"450"
},
"latitude":{
"type":"number",
"default":51.48762585296625
},
"longitude":{
"type":"number",
"default":-0.1326724377053381
},
"rotation":{
"type":"number",
"default":0
},
"zoom":{
"type":"number",
"default":15
},
"mapType":{
"type":"string",
"default":"standard"
},
"showsMapTypeControl":{
"type":"boolean",
"default":true
},
"isRotationEnabled":{
"type":"boolean",
"default":true
},
"showsCompass":{
"type":"string",
"default":"adaptive"
},
"isZoomEnabled":{
"type":"boolean",
"default":true
},
"showsZoomControl":{
"type":"boolean",
"default":true
},
"isScrollEnabled":{
"type":"boolean",
"default":true
},
"showsScale":{
"type":"string",
"default":"adaptive"
},
"markers":{
"type":"array",
"default":[

]
}
},
"example":{
"attributes":{
"latitude":51.48762585296625,
"longitude":-0.1326724377053381
}
},
"supports":{
"align":[
"wide",
"full"
],
"html":false
},
"editorScript":"maps-block-apple-block",
"viewScript":"maps-block-apple-frontend",
"script": "apple-mapkit-js"
}
3 changes: 0 additions & 3 deletions editor.css

This file was deleted.

Loading

0 comments on commit ed1aafe

Please sign in to comment.