Skip to content

Commit e58e340

Browse files
authored
Merge pull request #2248 from siteorigin/feature/gulp5-migration
Feature/gulp5 migration
2 parents fa25fe7 + e31c8d1 commit e58e340

3 files changed

Lines changed: 39 additions & 9 deletions

File tree

.gitmodules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[submodule "build"]
22
path = build
33
url = git@github.com:siteorigin/plugin-build.git
4-
54
[submodule "base/inc/installer"]
65
path = base/inc/installer
76
url = git@github.com:siteorigin/siteorigin-installer.git

build-config.js

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,65 @@ module.exports = {
4141
},
4242
copy: {
4343
src: [
44-
'**/!(*.js|*.less|*.css)', // Everything except .js, .css and .less files
44+
// Use restrictive positive patterns instead of broad match + exclusions.
45+
// This fixes Gulp 5 exclusion pattern bug where !build/** is ignored.
46+
47+
// Root level files (excluding those handled by version task).
48+
'changelog.txt',
49+
'wpml-config.xml',
50+
51+
// Directory-based patterns.
52+
'admin/**/!(*.js|*.less|*.css)',
53+
'base/**/!(*.js|*.less|*.css)',
54+
'compat/**/!(*.js|*.less|*.css)',
55+
'css/**/!(*.js|*.less|*.css)',
56+
'icons/**/!(*.js|*.less|*.css)',
57+
'js/**/!(*.js|*.less|*.css)',
58+
'widgets/**/!(*.js|*.less|*.css)',
4559
'icons/**/*css', // Copy CSS for icon packs.
4660
'js/lib/**/*css', // Copy CSS for JS libs.
4761
'css/lib/**/*css', // Copy CSS for JS libs.
48-
'base/less/*.less', // LESS libraries used in runtime styles
49-
'base/inc/widgets/less/*.less',
62+
'base/less/*.less', // LESS libraries used in runtime styles.
63+
'base/inc/widgets/less/*.less', // Widget LESS libraries.
5064
'base/inc/installer/css/*css', // Include Installer CSS.
51-
'widgets/**/styles/*.less', // All the widgets' runtime .less files
65+
'widgets/**/styles/*.less', // All the widgets' runtime .less files.
5266
'!{build,build/**}', // Ignore build/ and contents
67+
'!{node_modules,node_modules/**}', // Ignore node_modules/ and contents.
68+
'!{tests,tests/**}', // Ignore tests/ and contents.
5369
'!{tmp,tmp/**}', // Ignore tmp/ and contents
70+
'!playwright.config.js', // Exclude playwright config file.
5471
'!so-widgets-bundle.php', // Not the base plugin file. It is copied by the 'version' task.
5572
'!readme.txt', // Not the readme.txt file. It is copied by the 'version' task.
5673
'!readme.md', // Ignore the readme.md file. It is for the github repo.
5774
'!.editorconfig', // Ignore .editorconfig file. Only for development.
5875
'!base/inc/installer/inc/github-plugin-updater.php', // Exclude Installer's Updater.
76+
'!{package.json,package-lock.json}', // Exclude node package files.
5977
]
6078
},
61-
i18n: {
79+
pot: {
6280
src: [
6381
'**/*.php', // All the PHP files.
64-
'!tmp/**/*.php', // Ignore tmp/ and contents
65-
'!dist/**/*.php' // Ignore dist/ and contents
82+
'!tmp/**/*.php', // Ignore tmp/ and contents.
83+
'!dist/**/*.php' // Ignore dist/ and contents.
6684
],
85+
textdomain: 'so-widgets-bundle',
86+
destFile: 'so-widgets-bundle.pot',
87+
package: 'SiteOrigin Widgets Bundle',
88+
bugReport: 'http://www.siteorigin.com/thread',
89+
lastTranslator: 'SiteOrigin <support@siteorigin.com>',
90+
team: 'SiteOrigin <support@siteorigin.com>'
6791
},
6892
googleFonts: {
6993
dest: 'base/inc/fonts.php',
7094
},
7195
fontAwesome: {
7296
base: 'icons/fontawesome/',
97+
version: '6.7.2',
98+
css: {
99+
dest: 'icons/fontawesome/'
100+
},
101+
fonts: {
102+
dest: 'icons/fontawesome/webfonts/'
103+
}
73104
}
74105
};

0 commit comments

Comments
 (0)