mirror of
https://github.com/strapi/strapi.git
synced 2025-09-25 16:29:34 +00:00
Merge branch 'deits/transfer-protocol' of github.com:strapi/strapi into deits/transfer-protocol
This commit is contained in:
commit
9bd3453e83
6
.github/workflows/tests.yml
vendored
6
.github/workflows/tests.yml
vendored
@ -34,6 +34,8 @@ jobs:
|
|||||||
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
|
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
|
||||||
|
|
||||||
- run: yarn install --frozen-lockfile
|
- run: yarn install --frozen-lockfile
|
||||||
|
- name: Build TypeScript packages # for lint we need to build ts, for rules checking if paths exist
|
||||||
|
run: yarn build:ts
|
||||||
- name: Run lint
|
- name: Run lint
|
||||||
run: yarn run -s lint
|
run: yarn run -s lint
|
||||||
|
|
||||||
@ -55,6 +57,8 @@ jobs:
|
|||||||
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
|
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
|
||||||
|
|
||||||
- run: yarn install --frozen-lockfile
|
- run: yarn install --frozen-lockfile
|
||||||
|
- name: Build TypeScript packages # for unit tests we need to build ts, for finding and mocking ts packages
|
||||||
|
run: yarn build:ts
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: yarn run -s test:unit --coverage
|
run: yarn run -s test:unit --coverage
|
||||||
- name: Upload coverage to Codecov
|
- name: Upload coverage to Codecov
|
||||||
@ -231,6 +235,7 @@ jobs:
|
|||||||
SQLITE_PKG: ${{ matrix.sqlite_pkg }}
|
SQLITE_PKG: ${{ matrix.sqlite_pkg }}
|
||||||
with:
|
with:
|
||||||
dbOptions: '--dbclient=sqlite-legacy --dbfile=./tmp/data.db'
|
dbOptions: '--dbclient=sqlite-legacy --dbfile=./tmp/data.db'
|
||||||
|
|
||||||
# EE
|
# EE
|
||||||
api_ee_pg:
|
api_ee_pg:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -275,6 +280,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
|
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
|
||||||
runEE: true
|
runEE: true
|
||||||
|
|
||||||
api_ee_mysql:
|
api_ee_mysql:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [lint, unit_back, unit_front]
|
needs: [lint, unit_back, unit_front]
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
"clean": "lerna run --stream clean --no-private",
|
"clean": "lerna run --stream clean --no-private",
|
||||||
"watch": "lerna run --stream watch --no-private --parallel",
|
"watch": "lerna run --stream watch --no-private --parallel",
|
||||||
"build": "lerna run --stream build --no-private",
|
"build": "lerna run --stream build --no-private",
|
||||||
|
"build:ts": "lerna run --stream build:ts --no-private",
|
||||||
"generate": "plop --plopfile ./packages/generators/admin/plopfile.js",
|
"generate": "plop --plopfile ./packages/generators/admin/plopfile.js",
|
||||||
"lint": "npm-run-all -p lint:code lint:css",
|
"lint": "npm-run-all -p lint:code lint:css",
|
||||||
"lint:code": "eslint .",
|
"lint:code": "eslint .",
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
// eslint-disable-next-line import/no-unresolved, node/no-missing-require
|
||||||
const { register: registerDataTransfer } = require('@strapi/data-transfer');
|
const { register: registerDataTransfer } = require('@strapi/data-transfer');
|
||||||
|
|
||||||
const registerAdminPanelRoute = require('./routes/serve-admin-panel');
|
const registerAdminPanelRoute = require('./routes/serve-admin-panel');
|
||||||
|
@ -27,11 +27,13 @@
|
|||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc -p tsconfig.json",
|
"build": "yarn build:ts",
|
||||||
"clean": "rimraf ./dist",
|
"build:ts": "tsc -p tsconfig.json",
|
||||||
"build:clean": "yarn clean && yarn build",
|
"build:clean": "yarn clean && yarn build",
|
||||||
"watch": "yarn build -w --preserveWatchOutput",
|
"clean": "rimraf ./dist",
|
||||||
"test:unit": "jest --verbose"
|
"prepublishOnly": "yarn build:clean",
|
||||||
|
"test:unit": "jest --verbose",
|
||||||
|
"watch": "yarn build:ts -w --preserveWatchOutput"
|
||||||
},
|
},
|
||||||
"directories": {
|
"directories": {
|
||||||
"lib": "./dist"
|
"lib": "./dist"
|
||||||
|
@ -4,8 +4,6 @@ const {
|
|||||||
createLocalFileDestinationProvider,
|
createLocalFileDestinationProvider,
|
||||||
createLocalStrapiSourceProvider,
|
createLocalStrapiSourceProvider,
|
||||||
createTransferEngine,
|
createTransferEngine,
|
||||||
// TODO: we need to solve this issue with typescript modules
|
|
||||||
// eslint-disable-next-line import/no-unresolved, node/no-missing-require
|
|
||||||
} = require('@strapi/data-transfer');
|
} = require('@strapi/data-transfer');
|
||||||
const { isObject, isString, isFinite, toNumber } = require('lodash/fp');
|
const { isObject, isString, isFinite, toNumber } = require('lodash/fp');
|
||||||
const fs = require('fs-extra');
|
const fs = require('fs-extra');
|
||||||
|
@ -7,8 +7,6 @@ const {
|
|||||||
DEFAULT_VERSION_STRATEGY,
|
DEFAULT_VERSION_STRATEGY,
|
||||||
DEFAULT_SCHEMA_STRATEGY,
|
DEFAULT_SCHEMA_STRATEGY,
|
||||||
DEFAULT_CONFLICT_STRATEGY,
|
DEFAULT_CONFLICT_STRATEGY,
|
||||||
// TODO: we need to solve this issue with typescript modules
|
|
||||||
// eslint-disable-next-line import/no-unresolved, node/no-missing-require
|
|
||||||
} = require('@strapi/data-transfer');
|
} = require('@strapi/data-transfer');
|
||||||
const { isObject } = require('lodash/fp');
|
const { isObject } = require('lodash/fp');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user