Merge branch 'develop' into trunk

.distignore

@@ -5,6 +5,7 @@
 /node_modules
 /src
 /vendor
+/tests
 
 # Files
 .distignore
@@ -14,6 +15,7 @@
 .nvmrc
 .phpcs.xml
 .wp-env.json
+.wp-env.override.json
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 composer.json

.eslintrc

@@ -5,5 +5,5 @@
         "CustomEvent": "readonly",
         "Event": "readonly"
     },
-    "ignorePatterns": ["**/vendor/**"]
+    "ignorePatterns": ["**/vendor/**", "tests/**"]
 }

.github/CODEOWNERS

@@ -0,0 +1,8 @@
+# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @10up/open-source-practice or @fabiankaegy, as primary maintainers will be requested for review when someone opens a Pull Request.
+*                   @10up/open-source-practice @fabiankaegy
+
+# GitHub and WordPress.org specifics
+/.github/           @jeffpaul
+/.wordpress-org/    @jeffpaul
+CODE_OF_CONDUCT.md  @jeffpaul
+LICENSE.md          @jeffpaul

.github/workflows/cypress.yml

@@ -0,0 +1,34 @@
+name: E2E test
+
+on:
+  pull_request:
+    branches:
+      - develop
+jobs:
+  cypress:
+    name: ${{ matrix.core.name }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        core:
+          - {name: 'WP latest', version: 'latest'}
+          - {name: 'WP minimum', version: 'WordPress/WordPress#5.8'}
+          - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: npm install
+    - name: Build (optional)
+      run: npm run build
+    - name: Set the core version
+      run: ./tests/bin/set-core-version.js ${{ matrix.core.version }}
+    - name: Set up WP environment
+      run: npm run env:start
+    - name: Test
+      run: npm run cypress:run
+      env:
+        CYPRESS_MAPS_PRIVATE_KEY: ${{ secrets.MAPS_PRIVATE_KEY }}
+        CYPRESS_MAPS_KEY_ID: ${{ secrets.MAPS_KEY_ID }}
+        CYPRESS_MAPS_TEAM_ID: ${{ secrets.MAPS_TEAM_ID }}

.github/workflows/dependency-review.yml

@@ -16,5 +16,21 @@ jobs:
     steps:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v1
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v2
+        with:
+          # Possible values: "critical", "high", "moderate", "low" 
+          # fail-on-severity: critical
+
+          # You can only can only include one of these two options: `allow-licenses` and `deny-licences`
+          # ([String]). Only allow these licenses (optional)
+          # Possible values: Any `spdx_id` value(s) from https://docs.github.com/en/rest/licenses 
+          # The following list is an attempt to match exactly what's listed on https://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses as GPL Compatible (currently ignoring the FSF Free/Libre and OSI Approved column data from the SPDX License List at https://spdx.org/licenses/):
+          allow-licenses: GPL-2.0, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0, GPL-3.0-only, GPL-3.0-or-later, LGPL-3.0, LGPL-3.0-only, LGPL-2.1, LGPL-2.1-only, AGPL-3.0, AGPL-3.0-only, Apache-2.0, Artistic-2.0, Sleepycat, BSL-1.0, BSD-3-Clause, ECL-2.0, EFL-2.0, EUDatagrid, MIT, BSD-2-Clause, HPND, Intel, ISC, MPL-2.0, NCSA, UPL-1.0, Unlicense, W3C, Zlib, ZPL-2.0
+          # The following licenses fit the above criteria except they are not marked as FSF Free/Libre on the SPDX License List (https://spdx.org/licenses/):  Unicode-DFS-2016
+          # The following licenses fit the above criteria except they are not marked as OSI Approved on the SPDX License List (https://spdx.org/licenses/): ClArtistic, CECILL-2.0, BSD-3-Clause-Clear, FTL, iMatix, Imlib2, IJG, OLDAP-2.7, Ruby, SGI-B-2.0, SMLNJ, Vim, WTFPL, X11, XFree86-1.1
+          # ([String]). Block the pull request on these licenses (optional)
+          # Possible values: Any  `spdx_id` value(s) from https://docs.github.com/en/rest/licenses 
+          # The following list is an attempt to match exactly what's listed on https://www.gnu.org/licenses/license-list.html#GPLIncompatibleLicenses as GPL Incompatible:
+          # deny-licenses: AGPL-1.0, AGPL-1.0-only, AFL-1.1, AFL-1.2, AFL-2.0, AFL-2.1, AFL-3.0, Apache-1.1, Apache-1.0, APSL-2.0, BitTorrent-1.0, BSD-4-Clause, CECILL-B, CECILL-C, CDDL-1.0, CPAL-1.0, CPL-1.0, Condor-1.1, EPL-1.0, EPL-2.0, EUPL-1.1, EUPL-1.2, FDK-AAC, gnuplot, IPL-1.0, LPPL-1.3a, LPPL-1.2, LPL-1.02, MS-PL, MS-RL, MPL-1.1, NOSL, NPL-1.0, NPL-1.1, Nokia, OLDAP-2.3, OSL-1.0, OSL-1.1, OSL-2.0, OSL-2.1, OSL-3.0, OpenSSL, PHP-3.01, Python-2.0, QPL-1.0, RPSL-1.0, SISSL, SPL-1.0, xinetd, YPL-1.1, Zend-2.0, Zimbra-1.3, ZPL-1.1
+          # The following list is an attempt, additionally, to match exactly what's listedn on https://www.gnu.org/licenses/license-list.html#NonFreeSoftwareLicenses as Nonfree: Aladdin, APSL-1.0, APSL-1.1, APSL-1.2, Artistic-1.0, CPOL-1.02, RHeCos-1.1, JSON, NASA-1.3, OPL-1.0, RPL-1.1, Watcom-1.0

.github/workflows/linting.yml

@@ -14,17 +14,22 @@ jobs:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: install node v12
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
-    - name: npm install
-      run: npm install
-    - name: eslint
-      uses: icrawl/action-eslint@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+      - name: npm install
+        run: npm install
+      - name: Generate linting report
+        run: npm run lint:js -- --output-file eslint-report.json --format json
+        continue-on-error: true
+      - name: Annotate code linting results
+        uses: ataylorme/[email protected]
+        with:
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          report-json: 'eslint-report.json'
+      - name: Update summary
+        run: |
+          npm_config_yes=true npx github:10up/eslint-json-to-md --path ./eslint-report.json --output ./eslint-report.md
+          cat eslint-report.md >> $GITHUB_STEP_SUMMARY
+        if: ${{ failure() }}
   phpcs:
     name: WPCS
     runs-on: ubuntu-latest
@@ -34,3 +39,9 @@ jobs:
         uses: 10up/wpcs-action@stable
         with:
           use_local_config: true
+          extra_args: '--report-json=./phpcs-report.json'
+      - name: Update summary
+        run: |
+          npx github:10up/phpcs-json-to-md --path ./phpcs-report.json --output ./phpcs-report.md
+          cat phpcs-report.md >> $GITHUB_STEP_SUMMARY
+        if: ${{ failure() }}

.github/workflows/update-asset-readme-on-wordpress-org.yml

@@ -4,7 +4,7 @@ on:
     branches:
     - trunk
 jobs:
-  master:
+  trunk:
     name: Push to trunk
     runs-on: ubuntu-latest
     steps:

.github/workflows/wordpress-latest.yml

@@ -0,0 +1,20 @@
+name: "WordPress version checker"
+on:
+  push:
+    branches:
+      - develop
+      - trunk
+  pull_request:
+    branches:
+      - develop
+  schedule:
+    - cron: '0 0 * * 1'
+
+jobs:
+  wordpress-version-checker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: WordPress version checker
+        uses: skaut/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -30,3 +30,7 @@ Desktop.ini
 ##
 *.p8
 .env
+
+.wp-env.override.json
+tests/cypress/screenshots/
+tests/cypress/videos/

.wp-env.json

@@ -1,3 +1,10 @@
 {
-	"plugins": [ "." ]
+  "plugins": ["."],
+  "env": {
+    "tests": {
+      "mappings": {
+        "wp-cli.yml": "./tests/bin/wp-cli.yml"
+      }
+    }
+  }
 }

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.1.0] - 2023-01-23
+**Note that this release bumps the WordPress minimum version from 5.2 to 5.8.**
+
+### Added
+- Support for custom marker icons (props [@iamdharmesh](https://github.com/iamdharmesh), [@dinhtungdu](https://github.com/dinhtungdu), [@fabiankaegy](https://github.com/fabiankaegy) via [#136](https://github.com/10up/maps-block-apple/pull/136)).
+- Ability to control margin of map (props [@fabiankaegy](https://github.com/fabiankaegy), [@dkotter](https://github.com/dkotter) via [#157](https://github.com/10up/maps-block-apple/pull/157)).
+- End-to-end testing setup with Cypress (props [@cadic](https://github.com/cadic), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#126](https://github.com/10up/maps-block-apple/pull/126)).
+
+### Changed
+- Bump minimum WordPress version from 5.2 to 5.8 (props [@cadic](https://github.com/cadic), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#126](https://github.com/10up/maps-block-apple/pull/126)).
+- Update linting workflows to take advantage of GitHub Actions summaries (props [@dinhtungdu](https://github.com/dinhtungdu), [@fabiankaegy](https://github.com/fabiankaegy) via [#128](https://github.com/10up/maps-block-apple/pull/128)).
+- Update Support Level from `Active` to `Stable` (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#135](https://github.com/10up/maps-block-apple/pull/135)).
+- Update composer dependencies to avoid conflict (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@iamdharmesh](https://github.com/iamdharmesh) via [#145](https://github.com/10up/maps-block-apple/pull/145)).
+- Bump WordPress "tested up to" version to 6.1 (props [@iamdharmesh](https://github.com/iamdharmesh), [@cadic](https://github.com/cadic) via [#148](https://github.com/10up/maps-block-apple/pull/148)).
+
+### Security
+- Bump `terser` from 5.14.1 to 5.14.2 (props [@dependabot](https://github.com/apps/dependabot) via [#132](https://github.com/10up/maps-block-apple/pull/132)).
+- Bump `markdown-it` from 12.0.4 to 12.3.2 and `@wordpress/scripts` from 20.0.2 to 24.5.0 (props [@dependabot](https://github.com/apps/dependabot) via [#138](https://github.com/10up/maps-block-apple/pull/138)).
+- Bump `loader-utils` from 2.0.2 to 2.0.4 (props [@dependabot](https://github.com/apps/dependabot) via [#146](https://github.com/10up/maps-block-apple/pull/146)).
+- Bump `simple-git` from 3.10.0 to 3.15.1 (props [@dependabot](https://github.com/apps/dependabot) via [#149](https://github.com/10up/maps-block-apple/pull/149)).
+- Bump `json5` from 1.0.1 to 1.0.2 (props [@dependabot](https://github.com/apps/dependabot) via [#153](https://github.com/10up/maps-block-apple/pull/153)).
+
 ## [1.0.3] - 2022-06-27
 ### Added
 - Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#121](https://github.com/10up/maps-block-apple/pull/121)).
@@ -86,6 +108,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.1.0]: https://github.com/10up/maps-block-apple/compare/1.0.3...1.1.0
 [1.0.3]: https://github.com/10up/maps-block-apple/compare/1.0.2...1.0.3
 [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

CREDITS.md

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 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), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Crisoforo Gaspar Hernández (@mitogh)](https://github.com/mitogh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Max Lyuchin (@cadic)](https://github.com/cadic), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9).
+[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), [Crisoforo Gaspar Hernández (@mitogh)](https://github.com/mitogh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Max Lyuchin (@cadic)](https://github.com/cadic), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Darin Kotter (@dkotter)](https://github.com/dkotter).
 
 ## Libraries
 

README.md

@@ -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/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)
+[![Support Level](https://img.shields.io/badge/support-stable-blue.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
 
@@ -71,7 +71,7 @@ Yes, you can track your MapKit JS useage on the [MapKit JS Developer Dashboard](
 
 ## Support Level
 
-**Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.
+**Stable:** 10up is not planning to develop any new features for this, but will still respond to bug reports and security concerns. We welcome PRs, but any that include new features should be small and easy to integrate and should not include breaking changes. We otherwise intend to keep this tested up to the most recent version of WordPress.
 
 ## Changelog
 

block.json

@@ -84,9 +84,13 @@
       "wide",
       "full"
     ],
+    "spacing": {
+      "margin": true
+    },
     "html":false
   },
   "editorScript":"maps-block-apple-block",
   "viewScript":"maps-block-apple-frontend",
-  "script": "apple-mapkit-js"
+  "script": "apple-mapkit-js",
+  "editorStyle": "file:build/index.css"
 }

composer.json

@@ -15,11 +15,16 @@
 	],
 	"require-dev": {
 		"wp-coding-standards/wpcs": "^2.2",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0"
+		"dealerdirect/phpcodesniffer-composer-installer": "dev-master"
 	},
 	"scripts": {
 		"lint": "./vendor/bin/phpcs",
 		"lint-fix": "./vendor/bin/phpcbf --extensions=php ."
 	},
-	"minimum-stability": "dev"
+	"minimum-stability": "dev",
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
+	}
 }

maps-block-apple.php

@@ -3,8 +3,8 @@
  * Plugin Name:       Block for Apple Maps
  * Plugin URI:        https://github.com/10up/maps-block-apple
  * Description:       An Apple Maps block for the WordPress block editor (Gutenberg).
- * Version:           1.0.3
- * Requires at least: 5.2
+ * Version:           1.1.0
+ * Requires at least: 5.8
  * Requires PHP:      5.6
  * Author:            10up
  * Author URI:        https://10up.com
@@ -18,7 +18,7 @@
 namespace tenup\Maps_Block_Apple;
 
 // Useful global constants.
-define( 'MAPS_BLOCK_APPLE_VERSION', '1.0.3' );
+define( 'MAPS_BLOCK_APPLE_VERSION', '1.1.0' );
 define( 'MAPS_BLOCK_APPLE_URL', plugin_dir_url( __FILE__ ) );
 define( 'MAPS_BLOCK_APPLE_PATH', dirname( __FILE__ ) . '/' );
 define( 'MAPS_BLOCK_APPLE_INC', MAPS_BLOCK_APPLE_PATH . 'includes/' );