Skip to content

Commit aa2a04d

Browse files
committed
update to 3.7.2 complete
1 parent ba29493 commit aa2a04d

File tree

6 files changed

+93
-19
lines changed

6 files changed

+93
-19
lines changed

.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ CACHE_LIFETIME=60
5151
RAVEN_DSN=
5252

5353
ENSO_API_TOKEN=adrian
54+
55+
TINY_MCE_API_KEY=

CHANGELOG.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,66 @@
11
# Laravel Enso's Changelog
22

3+
## 3.7.2
4+
5+
The main purpose of this release was to switch from using [tiptap](https://github.com/scrumpy/tiptap) to using [tinyMCE](https://www.tiny.cloud/) for our what-you-see-is-what-you-get editor VueJS component.
6+
7+
Through its dependency chain, after running `yarn upgrade` tiptap was breaking the build.
8+
9+
As a bonus, tinyMCE should be better supported and the VueJS wrapper components for it are slimmer and cleaner.
10+
11+
### front-end
12+
13+
#### wysiwyg
14+
- drops tiptap in favour of tinyMCE (see more below)
15+
16+
#### forms
17+
- updates the wyisiwyg field for the new tinyMCE powered wyisiwyg component
18+
19+
#### calendar
20+
- reverts the resizing strategy
21+
22+
### back-end
23+
24+
#### companies
25+
- within the static `owner` method the company model is resolved from the service container so that if you're extending & binding the package model to a local model, you will obtain the local instance
26+
27+
#### forms
28+
- adds support for tinyMCE customization within the form configuration and the json templates
29+
- fixes form params bug on create which caused the given parameter values to be ignored
30+
31+
#### localisation
32+
- updated a couple of translation keys and values
33+
34+
### Upgrade steps
35+
36+
This is a non breaking upgrade:
37+
38+
* run `composer update`
39+
* run `yarn upgrade && yarn` in `/client`
40+
* update the version to 3.7.2 in `config/enso/config.php`
41+
* update the `config/enso/forms.php` configuration file and add the new key:
42+
```
43+
|--------------------------------------------------------------------------
44+
| TinyMCE Api Key
45+
|--------------------------------------------------------------------------
46+
| If you're using the wysiwyg field you need to get a free api key from
47+
| https://www.tiny.cloud/get-tiny/ first.
48+
|
49+
*/
50+
51+
'tinyMCEApiKey' => env('TINY_MCE_API_KEY', null),
52+
```
53+
54+
If you were not using the `wysiwyg` component, there is nothing else for you to do.
55+
56+
If you are using it, you will need to create an account on https://www.tiny.cloud/ ,
57+
get an API key and add your application domains.
58+
59+
After obtaining your API key, add it to your `.env` file:
60+
```
61+
TINY_MCE_API_KEY=my-api-key
62+
```
63+
364
## 3.7.1
465

566
### front-end

client/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9408,9 +9408,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
94089408
inherits "^2.0.1"
94099409

94109410
rope-sequence@^1.3.0:
9411-
version "1.3.0"
9412-
resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.0.tgz#7b8bc1db96f8696f93db05282f799c6078eacce2"
9413-
integrity sha512-F+Y/pOSJn+illq+2dl2SqJYLil4lll3300mG3ISK3XNa1Ir0Kq+W1Ti0sWOeQGThm15bZsGDXyWF3osZJJ7x8Q==
9411+
version "1.3.2"
9412+
resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b"
9413+
integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg==
94149414

94159415
run-async@^2.2.0:
94169416
version "2.3.0"
@@ -11092,9 +11092,9 @@ vuex@^3.0.0, vuex@^3.1.0:
1109211092
integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==
1109311093

1109411094
w3c-keyname@^2.2.0:
11095-
version "2.2.0"
11096-
resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.0.tgz#03ac9edf49c14e1325c3abec9251b7ab2f392b1f"
11097-
integrity sha512-/IjQxaDTusd1dmPycoHN8ZowRbW9KjJ9PC/oHft3dzFMyTBeXjcWQBLMI4N4t/bFvUdCHxQ3nByvKzzxqqvEIw==
11095+
version "2.2.1"
11096+
resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.1.tgz#c4fe1a4b9e303c95e833b3d854b7d81070400db9"
11097+
integrity sha512-j5k4xGK6k8TCna/08778KUEL98WvTogiG/TN/YStl8GNeXg5tI3Dvq3+JjwJhP4l7ogs6KWo1VYEdc1Qaioy3Q==
1109811098

1109911099
watchpack@^1.6.0:
1110011100
version "1.6.0"

composer.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/enso/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'version' => '3.7.1',
4+
'version' => '3.7.2',
55
'ownerCompanyId' => env('OWNER_COMPANY_ID', 1),
66
'showQuote' => env('SHOW_QUOTE', true),
77
'defaultRole' => 'admin',

config/enso/forms.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
|--------------------------------------------------------------------------
8585
| Select Placeholder
8686
|--------------------------------------------------------------------------
87-
| Default select placeholder. Can be overriden by setting a custom one
87+
| Default select placeholder. Can be overridden by setting a custom one
8888
| in the json template.
8989
|
9090
*/
@@ -119,8 +119,19 @@
119119
|--------------------------------------------------------------------------
120120
| By default all form fields will have a conventional label. If this flag
121121
| is set to false the label will be used as placeholder. Can be
122-
| overriden in each form template
122+
| overridden in each form template
123123
*/
124124

125125
'labels' => 'true',
126+
127+
/*
128+
|--------------------------------------------------------------------------
129+
| TinyMCE Api Key
130+
|--------------------------------------------------------------------------
131+
| If you're using the wysiwyg field you need to get a free api key from
132+
| https://www.tiny.cloud/get-tiny/ first.
133+
|
134+
*/
135+
136+
'tinyMCEApiKey' => env('TINY_MCE_API_KEY', null),
126137
];

0 commit comments

Comments
 (0)