Merge branch 'deits/transfer-protocol' of github.com:strapi/strapi into deits/transfer-protocol

.github/workflows/tests.yml

@@ -34,6 +34,8 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
 
       - 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
         run: yarn run -s lint
 
@@ -55,6 +57,8 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
 
       - 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
         run: yarn run -s test:unit --coverage
       - name: Upload coverage to Codecov
@@ -231,6 +235,7 @@ jobs:
           SQLITE_PKG: ${{ matrix.sqlite_pkg }}
         with:
           dbOptions: '--dbclient=sqlite-legacy --dbfile=./tmp/data.db'
+
   # EE
   api_ee_pg:
     runs-on: ubuntu-latest
@@ -275,6 +280,7 @@ jobs:
         with:
           dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
           runEE: true
+
   api_ee_mysql:
     runs-on: ubuntu-latest
     needs: [lint, unit_back, unit_front]

package.json

@@ -33,6 +33,7 @@
     "clean": "lerna run --stream clean --no-private",
     "watch": "lerna run --stream watch --no-private --parallel",
     "build": "lerna run --stream build --no-private",
+    "build:ts": "lerna run --stream build:ts --no-private",
     "generate": "plop --plopfile ./packages/generators/admin/plopfile.js",
     "lint": "npm-run-all -p lint:code lint:css",
     "lint:code": "eslint .",

packages/core/admin/server/register.js

@@ -1,5 +1,6 @@
 'use strict';
 
+// eslint-disable-next-line import/no-unresolved, node/no-missing-require
 const { register: registerDataTransfer } = require('@strapi/data-transfer');
 
 const registerAdminPanelRoute = require('./routes/serve-admin-panel');

packages/core/data-transfer/package.json

@@ -27,11 +27,13 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "clean": "rimraf ./dist",
+    "build": "yarn build:ts",
+    "build:ts": "tsc -p tsconfig.json",
     "build:clean": "yarn clean && yarn build",
-    "watch": "yarn build -w --preserveWatchOutput",
-    "test:unit": "jest --verbose"
+    "clean": "rimraf ./dist",
+    "prepublishOnly": "yarn build:clean",
+    "test:unit": "jest --verbose",
+    "watch": "yarn build:ts -w --preserveWatchOutput"
   },
   "directories": {
     "lib": "./dist"

packages/core/strapi/lib/commands/transfer/export.js

@@ -4,8 +4,6 @@ const {
   createLocalFileDestinationProvider,
   createLocalStrapiSourceProvider,
   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');
 const { isObject, isString, isFinite, toNumber } = require('lodash/fp');
 const fs = require('fs-extra');

packages/core/strapi/lib/commands/transfer/import.js

@@ -7,8 +7,6 @@ const {
   DEFAULT_VERSION_STRATEGY,
   DEFAULT_SCHEMA_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');
 const { isObject } = require('lodash/fp');
 const path = require('path');