Skip to content

Commit ed1aafe

Browse files
committed
Merge branch 'develop' into trunk
2 parents e9f5421 + 3d3facc commit ed1aafe

40 files changed

Lines changed: 27250 additions & 12324 deletions

.distignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
.eslintrc
1313
.gitignore
1414
.phpcs.xml
15+
.wp-env.json
1516
CHANGELOG.md
1617
CODE_OF_CONDUCT.md
1718
composer.json
1819
composer.lock
1920
CONTRIBUTING.md
2021
CREDITS.md
2122
LICENSE.md
22-
package.json
2323
package-lock.json
24+
package.json
2425
README.md

.github/workflows/no-response.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: No Response
2+
3+
# **What it does**: Closes issues where the original author doesn't respond to a request for information.
4+
# **Why we have it**: To remove the need for maintainers to remember to check back on issues periodically to see if contributors have responded.
5+
# **Who does it impact**: Everyone that works on docs or docs-internal.
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
schedule:
11+
# Schedule for five minutes after the hour, every hour
12+
- cron: '5 * * * *'
13+
14+
jobs:
15+
noResponse:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: lee-dohm/no-response@v0.5.0
19+
with:
20+
token: ${{ github.token }}
21+
daysUntilClose: 14 # Number of days of inactivity before an Issue is closed for lack of response
22+
responseRequiredLabel: "needs:feedback" # Label indicating that a response from the original author is required
23+
closeComment: >
24+
This issue has been automatically closed because there has been no response
25+
to our request for more information. With only the
26+
information that is currently in the issue, we don't have enough information
27+
to take action. Please reach out if you have or find the answers we need so
28+
that we can investigate further. See [this blog post on bug reports and the
29+
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
30+
for more information about the kind of information that may be helpful.

.github/workflows/test.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,11 @@ jobs:
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2828
phpcs:
29-
name: phpcs
29+
name: WPCS
3030
runs-on: ubuntu-latest
3131
steps:
32-
- name: Checkout
33-
uses: actions/checkout@v2
34-
- name: composer install
35-
run: composer install
36-
- name: PHPCS check
37-
uses: chekalsky/phpcs-action@v1
38-
with:
39-
phpcs_bin_path: './vendor/bin/phpcs'
32+
- uses: actions/checkout@v2
33+
- name: WPCS check
34+
uses: 10up/wpcs-action@stable
35+
with:
36+
use_local_config: true

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16

.wp-env.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"plugins": [ "." ]
3+
}

CHANGELOG.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,33 @@
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).
44

55
## [Unreleased] - TBD
6+
7+
## [1.0.2] - 2022-01-28
68
### Added
7-
- Resize Handle to modify the height of the Map inline
9+
- `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)).
10+
- Issue management automation via GitHub Actions (props [@jeffpaul](https://github.com/jeffpaul) via [#96](https://github.com/10up/maps-block-apple/pull/96)).
11+
12+
### Changed
13+
- 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)).
14+
- 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)).
15+
16+
### Fixed
17+
- `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)).
18+
- 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)).
19+
- 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)).
20+
- 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)).
21+
- 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)).
22+
23+
### Security
24+
- 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)).
25+
- 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)).
26+
- 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)).
27+
- 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)).
28+
- 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)).
29+
- 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)).
30+
- 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)).
31+
- 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)).
32+
833
## [1.0.1] - 2020-08-11
934
### Added
1035
- 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))
@@ -33,7 +58,7 @@ All notable changes to this project will be documented in this file, per [the Ke
3358

3459
### Changed
3560
- 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))
36-
- 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))
61+
- 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))
3762
- 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))
3863
- 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))
3964
- Re-licensed to GPLv2 (props [@jeffpaul](https://github.com/jeffpaul) via [#21](https://github.com/10up/maps-block-apple/pull/21))
@@ -45,6 +70,7 @@ All notable changes to this project will be documented in this file, per [the Ke
4570
- Initial private release of Block for Apple Maps plugin.
4671

4772
[Unreleased]: https://github.com/10up/maps-block-apple/compare/trunk...develop
73+
[1.0.2]: https://github.com/10up/maps-block-apple/compare/1.0.1...1.0.2
4874
[1.0.1]: https://github.com/10up/maps-block-apple/compare/1.0.0...1.0.1
4975
[1.0.0]: https://github.com/10up/maps-block-apple/releases/tag/1.0.0
5076
[0.1.0]: https://github.com/10up/maps-block-apple/tree/a2fe565d64e2c59070f2dc3611700718d7383d37

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,9 @@ The `develop` branch is the development branch which means it contains the next
4242
12. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/maps-block-apple/. This may take a few minutes.
4343
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.
4444
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`
45+
46+
## Local Development
47+
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)
48+
49+
### Asset compilation
50+
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`

CREDITS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ The following acknowledges the Maintainers for this repository, those who have C
44

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

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

99
## Contributors
1010

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

13-
[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).
13+
[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).
1414

1515
## Libraries
1616

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
> An Apple Maps block for the WordPress block editor (Gutenberg).
44
5-
[![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)
5+
[![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)
66

77
## Overview
88

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

8484
## Like what you see?
8585

86-
<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>
86+
<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>

block.json

Lines changed: 90 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,92 @@
11
{
2-
"name": "tenup/maps-block-apple",
3-
"title": "Apple Maps",
4-
"category": "embed",
5-
"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>,
6-
"description": "An Apple Maps block.",
7-
"keywords": [ "apple", __( 'map' ), "apple map" ],
8-
"attributes": {
9-
"address": {
10-
"type": "string",
11-
"default": "",
12-
},
13-
"height": {
14-
"type": "string",
15-
"default": "450",
16-
},
17-
"latitude": {
18-
"type": "number",
19-
"default": 51.48762585296625,
20-
},
21-
"longitude": {
22-
"type": "number",
23-
"default": -0.1326724377053381,
24-
},
25-
"rotation": {
26-
"type": "number",
27-
"default": 0,
28-
},
29-
"zoom": {
30-
"type": "number",
31-
"default": 15,
32-
},
33-
"mapType": {
34-
"type": "string",
35-
"default": "Map.MapTypes.Standard",
36-
},
37-
"showsMapTypeControl": {
38-
"type": "boolean",
39-
"default": true,
40-
},
41-
"isRotationEnabled": {
42-
"type": "boolean",
43-
"default": true,
44-
},
45-
"showsCompass": {
46-
"type": "string",
47-
"default": "FeatureVisibility.Adaptive",
48-
},
49-
"isZoomEnabled": {
50-
"type": "boolean",
51-
"default": true,
52-
},
53-
"showsZoomControl": {
54-
"type": "boolean",
55-
"default": true,
56-
},
57-
"isScrollEnabled": {
58-
"type": "boolean",
59-
"default": true,
60-
},
61-
"showsScale": {
62-
"type": "string",
63-
"default": "FeatureVisibility.Adaptive",
64-
},
65-
"markers": {
66-
"type": "array",
67-
"default": [],
68-
},
69-
},
70-
"editorScript": "file:build/index.js",
71-
"editorStyle": "file:editor.css",
72-
"script": "file:build/frontend.js",
73-
"style": "file:style.css"
2+
"name":"tenup/maps-block-apple",
3+
"title":"Apple Maps",
4+
"category":"embed",
5+
"description":"Add an Apple Map to your site.",
6+
"apiVersion": 2,
7+
"keywords":[
8+
"apple",
9+
"map",
10+
"apple map"
11+
],
12+
"attributes":{
13+
"address":{
14+
"type":"string",
15+
"default":""
16+
},
17+
"height":{
18+
"type":"string",
19+
"default":"450"
20+
},
21+
"latitude":{
22+
"type":"number",
23+
"default":51.48762585296625
24+
},
25+
"longitude":{
26+
"type":"number",
27+
"default":-0.1326724377053381
28+
},
29+
"rotation":{
30+
"type":"number",
31+
"default":0
32+
},
33+
"zoom":{
34+
"type":"number",
35+
"default":15
36+
},
37+
"mapType":{
38+
"type":"string",
39+
"default":"standard"
40+
},
41+
"showsMapTypeControl":{
42+
"type":"boolean",
43+
"default":true
44+
},
45+
"isRotationEnabled":{
46+
"type":"boolean",
47+
"default":true
48+
},
49+
"showsCompass":{
50+
"type":"string",
51+
"default":"adaptive"
52+
},
53+
"isZoomEnabled":{
54+
"type":"boolean",
55+
"default":true
56+
},
57+
"showsZoomControl":{
58+
"type":"boolean",
59+
"default":true
60+
},
61+
"isScrollEnabled":{
62+
"type":"boolean",
63+
"default":true
64+
},
65+
"showsScale":{
66+
"type":"string",
67+
"default":"adaptive"
68+
},
69+
"markers":{
70+
"type":"array",
71+
"default":[
72+
73+
]
74+
}
75+
},
76+
"example":{
77+
"attributes":{
78+
"latitude":51.48762585296625,
79+
"longitude":-0.1326724377053381
80+
}
81+
},
82+
"supports":{
83+
"align":[
84+
"wide",
85+
"full"
86+
],
87+
"html":false
88+
},
89+
"editorScript":"maps-block-apple-block",
90+
"viewScript":"maps-block-apple-frontend",
91+
"script": "apple-mapkit-js"
7492
}

0 commit comments

Comments
 (0)