diff --git a/.gitmodules b/.gitmodules index cf9c41897..753a4dfc8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "build"] path = build url = git@github.com:siteorigin/plugin-build.git - [submodule "base/inc/installer"] path = base/inc/installer url = git@github.com:siteorigin/siteorigin-installer.git diff --git a/build b/build index 7fd812fc6..0876e5b96 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 7fd812fc644879872d5ba315ad904d525de1e146 +Subproject commit 0876e5b9620196f6c9a5b58b0122886c874450d3 diff --git a/build-config.js b/build-config.js index 032953016..6a9f490fb 100644 --- a/build-config.js +++ b/build-config.js @@ -41,34 +41,65 @@ module.exports = { }, copy: { src: [ - '**/!(*.js|*.less|*.css)', // Everything except .js, .css and .less files + // Use restrictive positive patterns instead of broad match + exclusions. + // This fixes Gulp 5 exclusion pattern bug where !build/** is ignored. + + // Root level files (excluding those handled by version task). + 'changelog.txt', + 'wpml-config.xml', + + // Directory-based patterns. + 'admin/**/!(*.js|*.less|*.css)', + 'base/**/!(*.js|*.less|*.css)', + 'compat/**/!(*.js|*.less|*.css)', + 'css/**/!(*.js|*.less|*.css)', + 'icons/**/!(*.js|*.less|*.css)', + 'js/**/!(*.js|*.less|*.css)', + 'widgets/**/!(*.js|*.less|*.css)', 'icons/**/*css', // Copy CSS for icon packs. 'js/lib/**/*css', // Copy CSS for JS libs. 'css/lib/**/*css', // Copy CSS for JS libs. - 'base/less/*.less', // LESS libraries used in runtime styles - 'base/inc/widgets/less/*.less', + 'base/less/*.less', // LESS libraries used in runtime styles. + 'base/inc/widgets/less/*.less', // Widget LESS libraries. 'base/inc/installer/css/*css', // Include Installer CSS. - 'widgets/**/styles/*.less', // All the widgets' runtime .less files + 'widgets/**/styles/*.less', // All the widgets' runtime .less files. '!{build,build/**}', // Ignore build/ and contents + '!{node_modules,node_modules/**}', // Ignore node_modules/ and contents. + '!{tests,tests/**}', // Ignore tests/ and contents. '!{tmp,tmp/**}', // Ignore tmp/ and contents + '!playwright.config.js', // Exclude playwright config file. '!so-widgets-bundle.php', // Not the base plugin file. It is copied by the 'version' task. '!readme.txt', // Not the readme.txt file. It is copied by the 'version' task. '!readme.md', // Ignore the readme.md file. It is for the github repo. '!.editorconfig', // Ignore .editorconfig file. Only for development. '!base/inc/installer/inc/github-plugin-updater.php', // Exclude Installer's Updater. + '!{package.json,package-lock.json}', // Exclude node package files. ] }, - i18n: { + pot: { src: [ '**/*.php', // All the PHP files. - '!tmp/**/*.php', // Ignore tmp/ and contents - '!dist/**/*.php' // Ignore dist/ and contents + '!tmp/**/*.php', // Ignore tmp/ and contents. + '!dist/**/*.php' // Ignore dist/ and contents. ], + textdomain: 'so-widgets-bundle', + destFile: 'so-widgets-bundle.pot', + package: 'SiteOrigin Widgets Bundle', + bugReport: 'http://www.siteorigin.com/thread', + lastTranslator: 'SiteOrigin ', + team: 'SiteOrigin ' }, googleFonts: { dest: 'base/inc/fonts.php', }, fontAwesome: { base: 'icons/fontawesome/', + version: '6.7.2', + css: { + dest: 'icons/fontawesome/' + }, + fonts: { + dest: 'icons/fontawesome/webfonts/' + } } };