Skip to content

Commit 943b83b

Browse files
committed
fix: integration tests
1 parent 5ad9e8f commit 943b83b

4 files changed

Lines changed: 339 additions & 794 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
"strapi-server.js"
5656
],
5757
"peerDependencies": {
58-
"@strapi/strapi": "^5.0.0-beta.5"
58+
"@strapi/strapi": "^5.0.0-beta.2"
5959
},
6060
"devDependencies": {
6161
"@strapi/design-system": "^1.16.0",
6262
"@strapi/icons": "^1.16.0",
63-
"@strapi/utils": "5.0.0-beta.5",
64-
"@strapi/strapi": "5.0.0-beta.5",
63+
"@strapi/utils": "5.0.0-beta.2",
64+
"@strapi/strapi": "5.0.0-beta.2",
6565
"babel-eslint": "9.0.0",
6666
"eslint": "^7.32.0",
6767
"eslint-config-airbnb": "^18.2.1",

playground/__tests__/helpers.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
const fs = require('fs');
2-
const { createStrapi } = require('@strapi/strapi');
2+
const { createStrapi, compileStrapi } = require('@strapi/strapi');
33

44
let instance;
55

66
async function setupStrapi() {
77
if (!instance) {
8-
await createStrapi().load();
8+
const appContext = await compileStrapi();
9+
await createStrapi(appContext).load();
910
instance = strapi;
1011

1112
await instance.server.mount();

server/cli.js

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Table = require('cli-table');
66
const chalk = require('chalk');
77
const inquirer = require('inquirer');
88
const { isEmpty } = require('lodash');
9-
const { createStrapi } = require('@strapi/strapi');
9+
const { createStrapi, compileStrapi } = require('@strapi/strapi');
1010
const gitDiff = require('git-diff');
1111

1212
const warnings = require('./warnings');
@@ -17,31 +17,9 @@ const program = new Command();
1717
const getStrapiApp = async () => {
1818
process.env.CONFIG_SYNC_CLI = 'true';
1919

20-
try {
21-
const tsUtils = require('@strapi/typescript-utils'); // eslint-disable-line
22-
23-
const appDir = process.cwd();
24-
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
25-
const outDir = await tsUtils.resolveOutDir(appDir);
26-
const alreadyCompiled = await fs.existsSync(outDir);
27-
28-
if (isTSProject && !alreadyCompiled) {
29-
await tsUtils.compile(appDir, {
30-
watch: false,
31-
configOptions: { options: { incremental: true } },
32-
});
33-
}
34-
35-
const distDir = isTSProject ? outDir : appDir;
36-
37-
const app = await createStrapi({ appDir, distDir }).load();
38-
39-
return app;
40-
} catch (e) {
41-
// Fallback for pre Strapi 4.2.
42-
const app = await createStrapi().load();
43-
return app;
44-
}
20+
const appContext = await compileStrapi();
21+
const app = await createStrapi(appContext).load();
22+
return app;
4523
};
4624

4725
const initTable = (head) => {

0 commit comments

Comments
 (0)