Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
node_modules
.idea
build/*
.phpunit.result.cache
includes/cf-pro-api-client/node_modules
ui/blocks/cform/node_modules
npm-debug.log
**/.DS_Store
includes/freemius/assets/img/caldera-forms.png
bin/caldera-forms
composer.phar

wordpress/*
wp-content/*
Expand Down Expand Up @@ -36,4 +38,4 @@ dist/caldera-hot-load/*
!dist/react.min.js
!dist/react-dom.min.js

clients/*/build
clients/*/build
37 changes: 19 additions & 18 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,20 @@ module.exports = function (grunt) {

//Include webpacked clients
[
'admin',
'admin',
'blocks',
'components',
'form-builder',
'functions',
'components',
'form-builder',
'functions',
'privacy',
'pro',
'render',
'state',
'viewer'
'pro',
'render',
'state',
'viewer'
].forEach( (client) => {
files_list.push( `clients/${client}/build/index.min.js` );
files_list.push( `clients/${client}/build/style.min.css` );
files_list.push( `clients/${client}/build/index.min.asset.json` );
files_list.push( `clients/${client}/build/index.min.asset.php` );
});

require( 'load-grunt-tasks' )( grunt );
Expand Down Expand Up @@ -133,6 +132,16 @@ module.exports = function (grunt) {
ext: '.min.js'
}]
},
i18n: {
files: [{
sourceMap: true,
expand: true,
cwd: 'assets/js/i18n',
src: '*.js',
dest: 'assets/build/js/i18n/',
ext: '.js'
}]
},
viewer: {
files: [{
sourceMap: true,
Expand Down Expand Up @@ -257,14 +266,6 @@ module.exports = function (grunt) {
flatten: true,
filter: 'isFile'
},
i18n: {
expand: true,
cwd: 'assets/js/i18n/',
src: '*',
dest: 'assets/build/js/i18n/',
flatten: true,
filter: 'isFile'
},
images: {
expand: true,
cwd: 'assets/images',
Expand Down Expand Up @@ -307,7 +308,7 @@ module.exports = function (grunt) {

});

grunt.registerTask( 'buildCopy', [ 'copy:i18n', 'copy:fonts', 'copy:images'] );
grunt.registerTask( 'buildCopy', [ 'copy:fonts', 'copy:images'] );
//register default task
grunt.registerTask( 'default', [
'js',
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Requires: git, yarn, Grunt.
- `yarn i && composer install`
- If you are wish to use [the provided local development environment](./contributing/local-dev.md)
- `composer dev:install`

### Build For Release
To create a build to ship to WordPress.org:
`yarn package`

This creates `/build/<version>` where `<version>` is the current version set in `package.json`. This creates a directory you can ZIP up for testing or whatever.

See "Release To WordPress.org" section below for more details on pushing this build to WordPress.org.
See "Release To WordPress.org" section below for more details on pushing this build to WordPress.org.

### JavaScript Development
[See automated testing docs for more information on directory structure, in regards to JavaScript test files]()
Expand Down Expand Up @@ -61,6 +61,9 @@ This is the old stuff, built with grunt.
- `yarn build:legacy`

#### CLI Commands

* npx @wordpress/scripts packages-update --dist-tag=wp-5.8

##### Composer
* `composer test:php` - Run PHP tests -- isolated unit tests and the WordPress integration tests.
* `composer dev:install` - Installs dependencies, Docker-based test environment and sets up test forms.
Expand Down
2 changes: 1 addition & 1 deletion assets/build/css/admin.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/caldera-alert.min.css

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

2 changes: 1 addition & 1 deletion assets/build/css/caldera-form.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/caldera-forms-front.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/caldera-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/caldera-modals.min.css

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

2 changes: 1 addition & 1 deletion assets/build/css/caldera-table.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/cfont.min.css

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

2 changes: 1 addition & 1 deletion assets/build/css/dashicon.min.css

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

2 changes: 1 addition & 1 deletion assets/build/css/editor-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/entry-viewer-2.min.css

Large diffs are not rendered by default.

Loading