Skip to content

Commit

Permalink
Move themes into standard locations
Browse files Browse the repository at this point in the history
  • Loading branch information
adamwoodnz committed Apr 17, 2024
1 parent f1edf40 commit 112c1c6
Show file tree
Hide file tree
Showing 111 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
run: |
rm -rf wp-content/mu-plugins/pub/locale-switcher/node_modules
rm -rf wp-content/plugins/wporg-learn/node_modules
rm -rf wp-content/themes/pub/wporg-learn-2020/node_modules
rm -rf wp-content/themes/wporg-learn-2020/node_modules
mv wp-content/mu-plugins/pub/locale-switcher $RUNNER_TEMP
mv wp-content/mu-plugins/pub/class-validator.php $RUNNER_TEMP
mv wp-content/mu-plugins/pub/locales.php $RUNNER_TEMP
mv wp-content/plugins/sensei-pro $RUNNER_TEMP
mv wp-content/plugins/wporg-learn $RUNNER_TEMP
mv wp-content/themes/pub/wporg-learn-2020 $RUNNER_TEMP
mv wp-content/themes/wporg-learn-2020 $RUNNER_TEMP
git rm -rfq .
rm -rf *
mkdir -p wp-content/mu-plugins/pub
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:

- name: Fetch wporg parent theme css
run: |
mkdir wp-content/themes/pub/wporg
svn export https://meta.svn.wordpress.org/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/css wp-content/themes/pub/wporg/css
mkdir wp-content/themes/wporg
svn export https://meta.svn.wordpress.org/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/css wp-content/themes/wporg/css
- name: Install NodeJS
uses: actions/setup-node@v3
Expand Down
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/wp-content/mu-plugins/pub/locale-switcher/build
/wp-content/plugins/*
/wp-content/themes/*
/wp-content/themes/pub/*

# Track our custom code.
!/wp-content/mu-plugins
Expand All @@ -26,13 +25,12 @@
!/wp-content/plugins/wporg-learn
!/wp-content/plugins/sensei-pro
!/wp-content/themes
!/wp-content/themes/pub
!/wp-content/themes/pub/wporg-learn-2020
!/wp-content/themes/wporg-learn-2020

# Ignore subfolders in our custom code.
/wp-content/plugins/wporg-learn/build

# Ignore built CSS.
/wp-content/themes/pub/wporg-learn-2020/css/print.css
/wp-content/themes/pub/wporg-learn-2020/css/style-rtl.css
/wp-content/themes/pub/wporg-learn-2020/css/style.css
/wp-content/themes/wporg-learn-2020/css/print.css
/wp-content/themes/wporg-learn-2020/css/style-rtl.css
/wp-content/themes/wporg-learn-2020/css/style.css
2 changes: 1 addition & 1 deletion blueprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"steps": [
{
"step": "activateTheme",
"themeFolderName": "pub/wporg-learn-2020"
"themeFolderName": "wporg-learn-2020"
},
{
"step": "activatePlugin",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"installer-paths": {
"wp-content/mu-plugins/{$name}/": ["type:wordpress-muplugin"],
"wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
"wp-content/themes/pub/{$name}/": ["type:wordpress-theme"]
"wp-content/themes/{$name}/": ["type:wordpress-theme"]
}
},
"repositories": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"packages": [
"wp-content/mu-plugins/pub/locale-switcher",
"wp-content/plugins/wporg-learn",
"wp-content/themes/pub/wporg-learn-2020"
"wp-content/themes/wporg-learn-2020"
],
"nohoist": [
"**/grunt-*"
Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<exclude-pattern>*/build/*</exclude-pattern>

<!-- Exclude all themes except the learn theme -->
<exclude-pattern>/wp-content/themes/pub/(?!wporg-learn-2020)</exclude-pattern>
<exclude-pattern>/wp-content/themes/(?!wporg-learn-2020)</exclude-pattern>

<!-- Exclude all plugins except the learn plugin -->
<exclude-pattern>/wp-content/plugins/(?!wporg-learn)</exclude-pattern>
Expand Down
File renamed without changes.

0 comments on commit 112c1c6

Please sign in to comment.