fix: integration tests
parent
5ad9e8f0f6
commit
943b83be90
|
@ -55,13 +55,13 @@
|
||||||
"strapi-server.js"
|
"strapi-server.js"
|
||||||
],
|
],
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@strapi/strapi": "^5.0.0-beta.5"
|
"@strapi/strapi": "^5.0.0-beta.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@strapi/design-system": "^1.16.0",
|
"@strapi/design-system": "^1.16.0",
|
||||||
"@strapi/icons": "^1.16.0",
|
"@strapi/icons": "^1.16.0",
|
||||||
"@strapi/utils": "5.0.0-beta.5",
|
"@strapi/utils": "5.0.0-beta.2",
|
||||||
"@strapi/strapi": "5.0.0-beta.5",
|
"@strapi/strapi": "5.0.0-beta.2",
|
||||||
"babel-eslint": "9.0.0",
|
"babel-eslint": "9.0.0",
|
||||||
"eslint": "^7.32.0",
|
"eslint": "^7.32.0",
|
||||||
"eslint-config-airbnb": "^18.2.1",
|
"eslint-config-airbnb": "^18.2.1",
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const { createStrapi } = require('@strapi/strapi');
|
const { createStrapi, compileStrapi } = require('@strapi/strapi');
|
||||||
|
|
||||||
let instance;
|
let instance;
|
||||||
|
|
||||||
async function setupStrapi() {
|
async function setupStrapi() {
|
||||||
if (!instance) {
|
if (!instance) {
|
||||||
await createStrapi().load();
|
const appContext = await compileStrapi();
|
||||||
|
await createStrapi(appContext).load();
|
||||||
instance = strapi;
|
instance = strapi;
|
||||||
|
|
||||||
await instance.server.mount();
|
await instance.server.mount();
|
||||||
|
|
|
@ -6,7 +6,7 @@ const Table = require('cli-table');
|
||||||
const chalk = require('chalk');
|
const chalk = require('chalk');
|
||||||
const inquirer = require('inquirer');
|
const inquirer = require('inquirer');
|
||||||
const { isEmpty } = require('lodash');
|
const { isEmpty } = require('lodash');
|
||||||
const { createStrapi } = require('@strapi/strapi');
|
const { createStrapi, compileStrapi } = require('@strapi/strapi');
|
||||||
const gitDiff = require('git-diff');
|
const gitDiff = require('git-diff');
|
||||||
|
|
||||||
const warnings = require('./warnings');
|
const warnings = require('./warnings');
|
||||||
|
@ -17,31 +17,9 @@ const program = new Command();
|
||||||
const getStrapiApp = async () => {
|
const getStrapiApp = async () => {
|
||||||
process.env.CONFIG_SYNC_CLI = 'true';
|
process.env.CONFIG_SYNC_CLI = 'true';
|
||||||
|
|
||||||
try {
|
const appContext = await compileStrapi();
|
||||||
const tsUtils = require('@strapi/typescript-utils'); // eslint-disable-line
|
const app = await createStrapi(appContext).load();
|
||||||
|
return app;
|
||||||
const appDir = process.cwd();
|
|
||||||
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
|
|
||||||
const outDir = await tsUtils.resolveOutDir(appDir);
|
|
||||||
const alreadyCompiled = await fs.existsSync(outDir);
|
|
||||||
|
|
||||||
if (isTSProject && !alreadyCompiled) {
|
|
||||||
await tsUtils.compile(appDir, {
|
|
||||||
watch: false,
|
|
||||||
configOptions: { options: { incremental: true } },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const distDir = isTSProject ? outDir : appDir;
|
|
||||||
|
|
||||||
const app = await createStrapi({ appDir, distDir }).load();
|
|
||||||
|
|
||||||
return app;
|
|
||||||
} catch (e) {
|
|
||||||
// Fallback for pre Strapi 4.2.
|
|
||||||
const app = await createStrapi().load();
|
|
||||||
return app;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const initTable = (head) => {
|
const initTable = (head) => {
|
||||||
|
|
Loading…
Reference in New Issue