Skip to content

Commit

Permalink
Merge hotfix into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mheob committed Aug 21, 2020
2 parents e126619 + 97c3f5f commit aac3637
Show file tree
Hide file tree
Showing 9 changed files with 170 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- next
pull_request:
branches:
- master
- next

jobs:
release:
Expand Down
97 changes: 92 additions & 5 deletions .pnp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 13 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
"@yarnpkg/pnpify": "^2.1.0"
},
"devDependencies": {
"@babel/core": "^7.11.1",
"@babel/core": "^7.11.4",
"@semantic-release/changelog": "^5.0.1",
"@wordpress/babel-preset-default": "^4.17.0",
"@wordpress/browserslist-config": "^2.7.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.8.0",
Expand Down Expand Up @@ -112,7 +113,17 @@
},
"release": {
"branches": [
"master"
"master",
{
"name": "next",
"prerelease": "beta"
}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
"@semantic-release/github"
]
}
}
3 changes: 1 addition & 2 deletions src/Utils/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public static function setHost(): void {
$host = $_SERVER['HTTP_HOST'] ?? '';
// phpcs:enable

if ( ! $port || ( '80' !== $port && '443' !== $port )
|| '' === $host || 'localhost' === $host || '127.0.01' === $host ) {
if ( ! $port || ! $host || '' === $host || 'localhost' === $host || '127.0.01' === $host ) {
self::$host = 'localhost';
return;
}
Expand Down
65 changes: 62 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:>=7.2.2, @babel/core@npm:>=7.9.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.7.5, @babel/core@npm:^7.9.0":
"@babel/core@npm:>=7.2.2, @babel/core@npm:>=7.9.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.7.5, @babel/core@npm:^7.9.0":
version: 7.11.1
resolution: "@babel/core@npm:7.11.1"
dependencies:
Expand All @@ -75,6 +75,30 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.11.4":
version: 7.11.4
resolution: "@babel/core@npm:7.11.4"
dependencies:
"@babel/code-frame": ^7.10.4
"@babel/generator": ^7.11.4
"@babel/helper-module-transforms": ^7.11.0
"@babel/helpers": ^7.10.4
"@babel/parser": ^7.11.4
"@babel/template": ^7.10.4
"@babel/traverse": ^7.11.0
"@babel/types": ^7.11.0
convert-source-map: ^1.7.0
debug: ^4.1.0
gensync: ^1.0.0-beta.1
json5: ^2.1.2
lodash: ^4.17.19
resolve: ^1.3.2
semver: ^5.4.1
source-map: ^0.5.0
checksum: 3/21b40a4242f308c2ccbcc07393bc47ef1ed3f6b4f6db5081801cf4c504926e28e24130bf4afd81ff9b0d6c61cdbb873492c892d0cebdb2e5f5cfb9711b17f089
languageName: node
linkType: hard

"@babel/generator@npm:^7.11.0":
version: 7.11.0
resolution: "@babel/generator@npm:7.11.0"
Expand All @@ -86,6 +110,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/generator@npm:^7.11.4":
version: 7.11.4
resolution: "@babel/generator@npm:7.11.4"
dependencies:
"@babel/types": ^7.11.0
jsesc: ^2.5.1
source-map: ^0.5.0
checksum: 3/1244facf6e03ea120ee6f7520eb7e7347ef97a3ece7ccf5d3efd5a70e6c4f85c67d7e8b9dc533ee071c95d91fe0ff8c1b9cf1a59447f4bc1caddcace64e77dfb
languageName: node
linkType: hard

"@babel/helper-annotate-as-pure@npm:^7.10.4":
version: 7.10.4
resolution: "@babel/helper-annotate-as-pure@npm:7.10.4"
Expand Down Expand Up @@ -390,6 +425,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.11.4":
version: 7.11.4
resolution: "@babel/parser@npm:7.11.4"
bin:
parser: ./bin/babel-parser.js
checksum: 3/06337dd30f432634503542a489bc4106a7505e7551c2feae0f1d25f35dfed9d1192373b3366ffd3a9a3ee65aeec60bb9c7d0612f9e0cfc17835eae467701b42a
languageName: node
linkType: hard

"@babel/plugin-proposal-async-generator-functions@npm:^7.10.4":
version: 7.10.5
resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.10.5"
Expand Down Expand Up @@ -1908,6 +1952,20 @@ __metadata:
languageName: node
linkType: hard

"@semantic-release/changelog@npm:^5.0.1":
version: 5.0.1
resolution: "@semantic-release/changelog@npm:5.0.1"
dependencies:
"@semantic-release/error": ^2.1.0
aggregate-error: ^3.0.0
fs-extra: ^9.0.0
lodash: ^4.17.4
peerDependencies:
semantic-release: ">=15.8.0 <18.0.0"
checksum: 3/9f4620e6f68f1fdfd9322c915d7abfad0d9abb0d1af57e221d7bef6f106423ae07548fb51c256a8ad2bbde72e36447e5610711336909094e8cb2d96fe489a655
languageName: node
linkType: hard

"@semantic-release/commit-analyzer@npm:^8.0.0":
version: 8.0.1
resolution: "@semantic-release/commit-analyzer@npm:8.0.1"
Expand All @@ -1925,7 +1983,7 @@ __metadata:
languageName: node
linkType: hard

"@semantic-release/error@npm:^2.2.0":
"@semantic-release/error@npm:^2.1.0, @semantic-release/error@npm:^2.2.0":
version: 2.2.0
resolution: "@semantic-release/error@npm:2.2.0"
checksum: 3/96502012d8676def27ad904c23b4039cfcdaf2e82e86e6f51155dc391427e082da59e6d2c9eb653c87f1506af6b5c9468bc4261b476ad3bf13f310dc2245fe5d
Expand Down Expand Up @@ -10030,7 +10088,8 @@ fsevents@^1.2.7:
version: 0.0.0-use.local
resolution: "include-fussball-de-widgets@workspace:."
dependencies:
"@babel/core": ^7.11.1
"@babel/core": ^7.11.4
"@semantic-release/changelog": ^5.0.1
"@wordpress/babel-preset-default": ^4.17.0
"@wordpress/browserslist-config": ^2.7.0
"@wordpress/dependency-extraction-webpack-plugin": ^2.8.0
Expand Down

0 comments on commit aac3637

Please sign in to comment.