yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,475 Commits 122 Branches 507 Tags
Commit Graph

793 Commits

Author SHA1 Message Date
Rémi de Juvigny
b0f3024b07
Improved create-strapi-app's templates (#8627) 
* Allow template configs as functions

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Allow template shorthands

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Restore strapi-generate-new import

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* New shorthand system and updated docs

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Improved docs

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Remove duplicate merge-template file

Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-12-04 11:22:20 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
Pierre Noël
ace487ace8
update gitignore in example and in generate-new (#8707) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-25 09:54:11 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
dependabot[bot]
1c82412604
Bump @sentry/node from 5.24.2 to 5.27.3 (#8596) 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.24.2 to 5.27.3.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.24.2...5.27.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-09 10:34:38 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
DMehaffy
717a834a04
Fix project generation with wrong node engine spec (#8497) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-29 07:48:16 -07:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +02:00
Alexandre Bodin
71a2657ed8 test node v14 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:14 +02:00
Alexandre Bodin
7485de2fdf v3.2.3 2020-10-09 17:12:50 +02:00
Convly
b3d0b72198 v3.2.2 2020-10-09 11:52:09 +02:00
Thomas P
5c792ff325 ENH: Update the default favicon with the new logo 
It looks so much better 😍

Signed-off-by: Thomas P <TPXP@users.noreply.github.com>
 2020-10-08 10:40:48 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00
Dan Wendorf
bf8c17f120
Bump node-fetch to 2.6.1 (#8191) 
node-fetch < 2.6.1 has a security vulnerability
(https://github.com/advisories/GHSA-w7rc-rwvf-8q5r)

This is a major version bump for strapi-plugin-upload (from 1.7.3), but
it does not look like strapi-plugin-upload is relying on any of the
functionality that has broken from 1.x to 2.x

Signed-off-by: Dan Wendorf <dan@render.com>
 2020-10-06 17:20:57 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Rémi de Juvigny
6bc8662ff6
Handle template download error (#8179) 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-05 09:41:59 +02:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Alexandre Bodin
035ae1045f Use os tmp dir and simplify some code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 15:20:50 +02:00
Rémi de Juvigny
e64ac06af8 Better error handling 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-02 12:40:31 +02:00
Convly
564f9228ca v3.1.7 2020-10-02 11:48:42 +02:00
Alexandre Bodin
0e064d10e8 Merge branch 'master' into features/templates-cli 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 10:20:10 +02:00
dependabot[bot]
048e6fd3af
Bump mongoose from 5.8.0 to 5.10.7 (#8046) 
* Bump mongoose from 5.8.0 to 5.10.7

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.8.0 to 5.10.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.8.0...5.10.7)

Signed-off-by: dependabot[bot] <support@github.com>

* Do not use empty username or password in mongo connection

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 09:27:46 +02:00
Rémi de Juvigny
5726c36edf Fix yarn lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-30 11:19:20 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
Rémi de Juvigny
3b0e02fe00 Autofix yarn.lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-23 14:25:55 +02:00
Peter Etelej
318f20e826
Bump up minimum required Node to 10.16 (#7962) 
Updated README docs & package.json `engine` versions to bump up the
minimum required Node version from `10.10` to `10.16` (or `10.16.0+`)

Strapi no longer supports `10.10` since it updated `sharp` to `0.26.0`
( https://github.com/strapi/strapi/pull/7729 ) which requires Node 10.16.0+
(See https://github.com/lovell/sharp/blob/master/docs/changelog.md#v0260---25th-august-2020 )

` yarn create strapi-app my-project --quickstart` on 10.10 fails with error
```
error sharp@0.26.0: The engine "node" is incompatible with this module. Expected version ">=10.16.0". Got "10.10.0"
error Found incompatible module.
```

Signed-off-by: Peter Etelej <peter@etelej.com>
 2020-09-22 16:00:13 +02:00
Convly
736a580001 v3.1.5 2020-09-16 15:26:12 +02:00
Rémi de Juvigny
9a8cf2eecf
Merge branch 'master' into templates-cli 2020-09-08 10:20:58 +02:00
Rémi de Juvigny
d13c868fce Add template property to our analytics 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-08 09:56:14 +02:00
Rémi de Juvigny
24d42f385f Apply review feedback 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-04 16:07:55 +02:00
Alexandre Bodin
6905be68bc Merge branch 'documentation' 2020-09-02 17:23:41 +02:00
DMehaffy
024b337b09
Update node version requirements for v10 to v12 (#7409) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-02 17:11:59 +02:00
dependabot[bot]
46e8375cd7
Bump fs-extra from 8.1.0 to 9.0.1 (#7496) 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 8.1.0 to 9.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/8.1.0...9.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 17:16:09 +02:00
Rémi de Juvigny
81d587e11e Prevent template from overwriting uuid 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-31 12:32:21 +02:00
Rémi de Juvigny
720ab27eed Add UUID prefix 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:45:22 +02:00
Rémi de Juvigny
11c9ea17eb Add --template option to create-strapi-app 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:23:03 +02:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00