Skip to content

Commit ec2b6d3

Browse files
authored
Merge pull request #159 from boazpoolman/feature/update-strapi
chore: update strapi to 4.19.0
2 parents 8d57a9a + 76d70cb commit ec2b6d3

File tree

24 files changed

+253
-95
lines changed

24 files changed

+253
-95
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"eslint": "eslint --max-warnings=0 './**/*.{js,jsx,ts,tsx}'",
2424
"eslint:fix": "eslint --fix './**/*.{js,jsx,ts,tsx}'",
2525
"test:install": "mv yarn.lock tmp-yarn.lock && mv package.json tmp-package.json && yarn add @types/jest typescript jest ts-jest supertest && rm -rf package.json yarn.lock && mv tmp-package.json package.json && mv tmp-yarn.lock yarn.lock",
26-
"test:unit": "ENV_PATH=./playground/.env jest --verbose --runInBand",
27-
"test:integration": "ENV_PATH=./playground/.env jest --verbose --runInBand --testMatch **/healthcheck.test.js",
26+
"test:unit": "ENV_PATH=./playground/.env jest --verbose --runInBand --forceExit",
27+
"test:integration": "ENV_PATH=./playground/.env jest --verbose --runInBand --forceExit --testMatch **/healthcheck.test.js",
2828
"docs:generate": "cd docs && yarn generate",
2929
"docs:dev": "cd docs && yarn dev",
3030
"playground:install": "cd playground && yarn install",
@@ -58,10 +58,10 @@
5858
"@strapi/strapi": "^4.0.0"
5959
},
6060
"devDependencies": {
61-
"@strapi/design-system": "^1.13.2",
62-
"@strapi/helper-plugin": "^4.15.5",
63-
"@strapi/icons": "^1.13.2",
64-
"@strapi/utils": "^4.15.5",
61+
"@strapi/design-system": "^1.14.1",
62+
"@strapi/helper-plugin": "^4.19.0",
63+
"@strapi/icons": "^1.14.1",
64+
"@strapi/utils": "^4.19.0",
6565
"@uncinc/eslint-config": "^1.1.0",
6666
"copyfiles": "^2.4.1",
6767
"jest": "^29.5.0",

playground/.strapi/client/app.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* This file was automatically generated by Strapi.
3+
* Any modifications made will be discarded.
4+
*/
5+
import i18N from "@strapi/plugin-i18n/strapi-admin";
6+
import usersPermissions from "@strapi/plugin-users-permissions/strapi-admin";
7+
import { renderAdmin } from "@strapi/strapi/admin";
8+
9+
renderAdmin(document.getElementById("strapi"), {
10+
plugins: {
11+
i18n: i18N,
12+
"users-permissions": usersPermissions,
13+
},
14+
});
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<!--
4+
This file was automatically generated by Strapi.
5+
Any modifications made will be discarded.
6+
-->
7+
<head>
8+
<meta charset="utf-8" />
9+
<meta
10+
name="viewport"
11+
content="width=device-width, initial-scale=1, viewport-fit=cover"
12+
/>
13+
<meta name="robots" content="noindex" />
14+
<meta name="referrer" content="same-origin" />
15+
<title>Strapi Admin</title>
16+
<style>
17+
html,
18+
body,
19+
#strapi {
20+
height: 100%;
21+
}
22+
body {
23+
margin: 0;
24+
-webkit-font-smoothing: antialiased;
25+
}
26+
</style>
27+
</head>
28+
<body>
29+
<div id="strapi"></div>
30+
<noscript
31+
><div class="strapi--root">
32+
<div class="strapi--no-js">
33+
<style type="text/css">
34+
.strapi--root {
35+
position: absolute;
36+
top: 0;
37+
right: 0;
38+
left: 0;
39+
bottom: 0;
40+
background: #fff;
41+
}
42+
43+
.strapi--no-js {
44+
position: absolute;
45+
top: 50%;
46+
left: 50%;
47+
transform: translate(-50%, -50%);
48+
text-align: center;
49+
font-family: helvetica, arial, sans-serif;
50+
}
51+
</style>
52+
<h1>JavaScript disabled</h1>
53+
<p>
54+
Please
55+
<a href="https://www.enable-javascript.com/">enable JavaScript</a>
56+
in your browser and reload the page to proceed.
57+
</p>
58+
</div>
59+
</div></noscript
60+
>
61+
</body>
62+
</html>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = ({ env }) => ({
1+
export default ({ env }) => ({
22
auth: {
33
secret: env('ADMIN_JWT_SECRET'),
44
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
rest: {
33
defaultLimit: 25,
44
maxLimit: 100,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require('path');
22

3-
module.exports = ({ env }) => ({
3+
export default ({ env }) => ({
44
connection: {
55
client: 'sqlite',
66
connection: {

playground/config/env/ci/plugins.js

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
const path = require('path');
2+
3+
export default {
4+
sitemap: {
5+
enabled: true,
6+
resolve: path.resolve(__dirname, '../../../../node_modules/strapi-plugin-sitemap'),
7+
},
8+
};
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const path = require('path');
22

3-
module.exports = ({ env }) => ({
3+
export default ({ env }) => ({
44
connection: {
55
client: 'sqlite',
66
connection: {
7-
filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/test-data.db')),
7+
filename: path.join(__dirname, '../..', env('DATABASE_FILENAME', '.tmp/test-data.db')),
88
},
99
useNullAsDefault: true,
1010
},

playground/config/env/test/plugins.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)