Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(setup-wp-env): action path #5

Merged
merged 11 commits into from
Jul 23, 2024
Merged

fix(setup-wp-env): action path #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
48b6d26
feat(setup-wp-env): init
Nevoss Jul 21, 2024
6532e66
wip
Nevoss Jul 21, 2024
e2af6fb
wip
Nevoss Jul 21, 2024
33410aa
wip
Nevoss Jul 21, 2024
b26c0d7
wip
Nevoss Jul 21, 2024
9de9a58
wip
Nevoss Jul 21, 2024
7bfdce3
wip
Nevoss Jul 21, 2024
1662ed5
fix(setup-wp-env): action path
Nevoss Jul 21, 2024
da71529
Merge branch 'master' into EDS-280
Nevoss Jul 21, 2024
0eec4d0
wip
Nevoss Jul 23, 2024
b8ce44c
wip
Nevoss Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .github/actions/setup-wp-env/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,22 @@ runs:
using: composite
steps:
- name: Creating wp-env config file
env:
INPUT_WP: ${{ inputs.wp }}
INPUT_PHP: ${{ inputs.php }}
INPUT_PLUGINS: ${{ inputs.plugins }}
INPUT_THEMES: ${{ inputs.themes }}
INPUT_ACTIVE_THEME: ${{ inputs.active-theme }}
INPUT_MAPPINGS: ${{ inputs.mappings }}
ACTION_PATH: ${{ github.action_path }}
run: |
npx zx@8 ./dist/setup-wp-env/create-wp-env-config.js \
--wp="${{ inputs.wp }}" \
--php="${{ inputs.php }}" \
--plugins="${{ inputs.plugins }}" \
--themes="${{ inputs.themes }}" \
--active-theme="${{ inputs.active-theme }}" \
--mappings="${{ inputs.mappings }}" \
npx zx@8 $ACTION_PATH/../../../dist/setup-wp-env/create-wp-env-config.js \
--wp="$INPUT_WP" \
--php="$INPUT_PHP" \
--plugins="$INPUT_PLUGINS" \
--themes="$INPUT_THEMES" \
--active-theme="$INPUT_ACTIVE_THEME" \
--mappings="$INPUT_ACTIVE_THEME" \
--config-dir="./.wp-env-tmp"
shell: bash

Expand Down
16 changes: 13 additions & 3 deletions dist/setup-wp-env/create-wp-env-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ async function main() {
php: { type: "string", default: null },
plugins: { type: "string", default: "" },
themes: { type: "string", default: "" },
"active-theme": { type: "string", default: "" },
"active-theme": {
type: "string",
default: "",
validate: (value) => typeof value === "string" && /^[a-z0-9-]+$/.test(value)
},
mappings: { type: "string", default: "" },
"config-dir": { type: "string", default: "./" }
});
Expand All @@ -28,7 +32,7 @@ async function main() {
afterStart: prepareCommands(
["cli", "tests-cli"],
[
activeTheme && `wp theme activate ${activeTheme}`,
activeTheme && `INPUT_ACTIVE_THEME="${activeTheme}" && wp theme activate "$INPUT_ACTIVE_THEME"`,
`wp rewrite structure '/%postname%' --hard`
]
)
Expand All @@ -39,13 +43,19 @@ async function main() {
}
function getOptions(args) {
const entries = Object.entries(args);
return minimist(process.argv.slice(2), {
const options = minimist(process.argv.slice(2), {
string: entries.filter(([, { type }]) => type === "string").map(([key]) => key),
boolean: entries.filter(([, { type }]) => type === "boolean").map(([key]) => key),
default: Object.fromEntries(
entries.map(([key, { default: value }]) => [key, value])
)
});
entries.forEach(([key, { validate }]) => {
if (validate && !validate(options[key])) {
throw new Error(`Invalid value for option --${key}`);
}
});
return options;
}
function mappingsFromString(mappings) {
const config = parseAsArray(mappings).map((mapping) => mapping.split(":")).filter(([from, to]) => from && to);
Expand Down
26 changes: 22 additions & 4 deletions src/setup-wp-env/create-wp-env-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ async function main() {
php: { type: 'string', default: null },
plugins: { type: 'string', default: '' },
themes: { type: 'string', default: '' },
'active-theme': { type: 'string', default: '' },
'active-theme': {
type: 'string',
default: '',
validate: (value) =>
typeof value === 'string' && /^[a-z0-9-]+$/.test(value),
},
mappings: { type: 'string', default: '' },
'config-dir': { type: 'string', default: './' },
});
Expand All @@ -29,7 +34,8 @@ async function main() {
afterStart: prepareCommands(
['cli', 'tests-cli'],
[
activeTheme && `wp theme activate ${activeTheme}`,
activeTheme &&
`INPUT_ACTIVE_THEME="${activeTheme}" && wp theme activate "$INPUT_ACTIVE_THEME"`,
`wp rewrite structure '/%postname%' --hard`,
],
),
Expand All @@ -43,12 +49,16 @@ async function main() {
function getOptions(
args: Record<
string,
{ type: 'string' | 'boolean'; default: string | boolean | null }
{
type: 'string' | 'boolean';
default: string | boolean | null;
validate?: (value: unknown) => boolean;
}
>,
) {
const entries = Object.entries(args);

return minimist(process.argv.slice(2), {
const options = minimist(process.argv.slice(2), {
string: entries
.filter(([, { type }]) => type === 'string')
.map(([key]) => key),
Expand All @@ -59,6 +69,14 @@ function getOptions(
entries.map(([key, { default: value }]) => [key, value]),
),
});

entries.forEach(([key, { validate }]) => {
if (validate && !validate(options[key])) {
throw new Error(`Invalid value for option --${key}`);
}
});

return options;
}

function mappingsFromString(mappings: string) {
Expand Down