Skip to content

Commit f95c07f

Browse files
committed
Merge branch 'develop' into trunk
2 parents dcb9abe + b7fdc28 commit f95c07f

24 files changed

+2371
-7601
lines changed

.distignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@
88
/tests
99

1010
# Files
11-
.distignore
12-
.editorconfig
13-
.eslintrc
14-
.gitignore
15-
.nvmrc
16-
.phpcs.xml
17-
.wp-env.json
18-
.wp-env.override.json
11+
.*
1912
CHANGELOG.md
2013
CODE_OF_CONDUCT.md
2114
composer.json

.github/workflows/build-release-zip.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
path: node_modules
2525
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
2626

27+
- name: Install Composer dependencies
28+
run: composer install --no-dev
29+
2730
- name: Setup node version and npm cache
2831
uses: actions/setup-node@v3
2932
with:

.github/workflows/cypress.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- develop
77
jobs:
8-
build:
8+
build:
99
uses: 10up/maps-block-apple/.github/workflows/build-release-zip.yml@develop
1010
cypress:
1111
needs: build
@@ -42,7 +42,7 @@ jobs:
4242
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
4343
- name: Install dependencies
4444
run: npm install
45-
- name: Set the core version and plugins config
45+
- name: Set the core version and plugins config
4646
run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }}
4747
- name: Set up WP environment
4848
run: npm run env:start

.github/workflows/deploy-to-wordpress-org.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
steps:
1010
- name: Checkout code
1111
uses: actions/checkout@master
12+
- name: Install Composer dependencies
13+
run: composer install --no-dev
1214
- name: Build
1315
run: |
1416
npm install

.github/workflows/wordpress-latest.yml renamed to .github/workflows/wordpress-version-checker.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ on:
1010
schedule:
1111
- cron: '0 0 * * 1'
1212

13+
permissions:
14+
issues: write
15+
1316
jobs:
1417
wordpress-version-checker:
1518
runs-on: ubuntu-latest
1619
steps:
1720
- name: WordPress version checker
18-
uses: skaut/wordpress-version-checker@v1.2.0
21+
uses: skaut/wordpress-version-checker@master
1922
with:
2023
repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ tests/cypress/downloads
3636
tests/cypress/screenshots
3737
tests/cypress/videos
3838
tests/cypress/reports
39+
40+
10up-lib/

.phpcs.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
<exclude-pattern>build</exclude-pattern>
1111
<exclude-pattern>node_modules</exclude-pattern>
1212
<exclude-pattern>vendor</exclude-pattern>
13-
</ruleset>
13+
<exclude-pattern>10up-lib</exclude-pattern>
14+
</ruleset>

.wordpress-version-checker.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"readme": "readme.txt",
3+
"channel": "rc"
4+
}

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file, per [the Ke
44

55
## [Unreleased] - TBD
66

7+
## [1.1.2] - 2023-10-16
8+
### Changed
9+
- Bump WordPress "tested up to" version to 6.3 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul) via [#179](https://github.com/10up/maps-block-apple/pull/179)).
10+
11+
### Fixed
12+
- Ensure our Mapkit JS only loads when a Map block is in place (props [@jayedul](https://github.com/jayedul), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#161](https://github.com/10up/maps-block-apple/pull/161)).
13+
- Better error handling for environments that don't match our minimum PHP version (props [@rahulsprajapati](https://github.com/rahulsprajapati), [@dkotter](https://github.com/dkotter), [@ravinderk](https://github.com/ravinderk) via [#174](https://github.com/10up/maps-block-apple/pull/174)).
14+
- Ensure that the Apple Maps block works fine in WordPress 6.4 (props [@iamdharmesh](https://github.com/iamdharmesh), [@fabiankaegy](https://github.com/fabiankaegy), [@faisal-alvi](https://github.com/faisal-alvi) via [#183](https://github.com/10up/maps-block-apple/pull/183)).
15+
- Ensure that our Cypress E2E tests pass (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)).
16+
17+
### Security
18+
- Bump `word-wrap` from 1.2.3 to 1.2.4 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#173](https://github.com/10up/maps-block-apple/pull/173)).
19+
- Bump `tough-cookie` from 4.1.2 to 4.1.3 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/apps/faisal-alvi) via [#176](https://github.com/10up/maps-block-apple/pull/176)).
20+
- Bump `cypress` from 11.2.0 to 13.2.0 and `@cypress/request` from 2.88.11 to 3.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk), [@faisal-alvi](https://github.com/apps/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#176](https://github.com/10up/maps-block-apple/pull/176), [#180](https://github.com/10up/maps-block-apple/pull/180), [#181](https://github.com/10up/maps-block-apple/pull/181)).
21+
- Bump `postcss` from 8.4.23 to 8.4.31 (props [@dependabot](https://github.com/apps/dependabot), [@ravinderk](https://github.com/apps/ravinderk) via [#184](https://github.com/10up/maps-block-apple/pull/184)).
22+
- Bump `@10up/cypress-wp-utils` from 0.1.0 to 0.2.0, `@wordpress/env` from 5.6.0 to 8.7.0 and `cypress-mochawesome-reporter` from 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#181](https://github.com/10up/maps-block-apple/pull/181)).
23+
724
## [1.1.1] - 2023-06-21
825
**Note that this release bumps the PHP minimum supported version from 5.6 to 7.4.**
926

@@ -126,6 +143,7 @@ All notable changes to this project will be documented in this file, per [the Ke
126143
- Initial private release of Block for Apple Maps plugin.
127144

128145
[Unreleased]: https://github.com/10up/maps-block-apple/compare/trunk...develop
146+
[1.1.2]: https://github.com/10up/maps-block-apple/compare/1.1.1...1.1.2
129147
[1.1.1]: https://github.com/10up/maps-block-apple/compare/1.1.0...1.1.1
130148
[1.1.0]: https://github.com/10up/maps-block-apple/compare/1.0.3...1.1.0
131149
[1.0.3]: https://github.com/10up/maps-block-apple/compare/1.0.2...1.0.3

CREDITS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
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), [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), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Curtis Loisel (@csloisel)](https://github.com/csloisel)
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), [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), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu), [Rahul Prajapati (@rahulsprajapati)](https://github.com/rahulsprajapati), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk).
1414

1515
## Libraries
1616

0 commit comments

Comments
 (0)