Skip to content

Commit

Permalink
Move asset bundles into web
Browse files Browse the repository at this point in the history
  • Loading branch information
ttempleton committed Apr 30, 2024
1 parent e2dcf63 commit e25d51d
Show file tree
Hide file tree
Showing 57 changed files with 381 additions and 99 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

## Unreleased

### Added
- Added `benf\neo\web\assets\configurator\ConfiguratorAsset`
- Added `benf\neo\web\assets\converter\ConverterAsset`
- Added `benf\neo\web\assets\input\InputAsset`

### Removed
- Removed `benf\neo\assets\InputAsset` (`benf\neo\web\assets\input\InputAsset` is used instead)
- Removed `benf\neo\assets\SettingsAsset` (`benf\neo\web\assets\configurator\ConfiguratorAsset` and `benf\neo\web\assets\converter\ConverterAsset` are used instead)

### Fixed
- Fixed an error that occurred when eager loading Neo block content
- Fixed styling issues with block action menus
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"standard": {
"ignore": [
"src/assets/dist/*.js"
"src/web/assets/*/dist/**/*.js"
]
},
"pre-commit": [
Expand Down
10 changes: 6 additions & 4 deletions src/Field.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace benf\neo;

use benf\neo\assets\InputAsset;
use benf\neo\assets\SettingsAsset;
use benf\neo\elements\Block;
use benf\neo\elements\db\BlockQuery;
use benf\neo\enums\BlockTypeGroupDropdown;
Expand All @@ -18,6 +16,9 @@
use benf\neo\models\BlockTypeGroup;
use benf\neo\Plugin as Neo;
use benf\neo\validators\FieldValidator;
use benf\neo\web\assets\configurator\ConfiguratorAsset;
use benf\neo\web\assets\converter\ConverterAsset;
use benf\neo\web\assets\input\InputAsset;
use Craft;
use craft\base\EagerLoadingFieldInterface;
use craft\base\Element;
Expand Down Expand Up @@ -561,8 +562,9 @@ public function getSettingsHtml(): ?string
if ($this->_getNamespaceDepth() >= 1) {
$html = $this->_getNestingErrorHtml();
} else {
$viewService->registerAssetBundle(SettingsAsset::class);
$viewService->registerJs(SettingsAsset::createSettingsJs($this));
$viewService->registerAssetBundle(ConfiguratorAsset::class);
$viewService->registerAssetBundle(ConverterAsset::class);
$viewService->registerJs(ConfiguratorAsset::createSettingsJs($this));

$html = $viewService->renderTemplate('neo/settings', [
'neoField' => $this,
Expand Down
1 change: 0 additions & 1 deletion src/assets/dist/1fe2bff6b4ce4e45d64d.svg

This file was deleted.

1 change: 0 additions & 1 deletion src/assets/dist/neo-configurator.css.map

This file was deleted.

2 changes: 0 additions & 2 deletions src/assets/dist/neo-configurator.js

This file was deleted.

1 change: 0 additions & 1 deletion src/assets/dist/neo-configurator.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions src/assets/dist/neo-converter.js

This file was deleted.

Loading

0 comments on commit e25d51d

Please sign in to comment.