After CR

OstafinL · OstafinL · commit bae29950b7be · 2024-11-12T15:08:31.000+01:00
diff --git a/ibexa/commerce/4.6/encore/ibexa.webpack.config.js b/ibexa/commerce/4.6/encore/ibexa.webpack.config.js
@@ -16,7 +16,6 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/commerce/4.6/encore/package.json b/ibexa/commerce/4.6/encore/package.json
@@ -21,16 +21,11 @@
     "@ckeditor/ckeditor5-widget": "^40.1.0",
     "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
-    "@svgr/webpack": "^8.1.0",
-    "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+    "@svgr/webpack": "^8.1.0"
   },
   "dependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/commerce/5.0/encore/ibexa.tsconfig.custom.json b/ibexa/commerce/5.0/encore/ibexa.tsconfig.custom.json
@@ -0,0 +1,7 @@
+{
+    "extends": "@ibexa/ts-config",
+    "compilerOptions": {
+        "typeRoots": ["node_modules/@types"]
+    },
+    "exclude": ["node_modules", "vendor/**/*", "!vendor/ibexa/**/*"]
+}
diff --git a/ibexa/commerce/5.0/encore/ibexa.webpack.config.js b/ibexa/commerce/5.0/encore/ibexa.webpack.config.js
@@ -16,7 +16,9 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
+        .enableTypeScriptLoader((tsConfig) => {
+            tsConfig.configFile = path.resolve(__dirname, 'ibexa.tsconfig.custom.json');
+        })
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/commerce/5.0/encore/package.json b/ibexa/commerce/5.0/encore/package.json
@@ -23,14 +23,14 @@
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
     "@svgr/webpack": "^8.1.0",
     "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
+    "typescript": "^5.6.3",
+    "@ibexa/ts-config": "https://github.com/ibexa/ts-config-ibexa"
   },
   "dependencies": {
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react-dom": "^18.3.1"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/experience/4.6/encore/ibexa.webpack.config.js b/ibexa/experience/4.6/encore/ibexa.webpack.config.js
@@ -16,7 +16,6 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/experience/4.6/encore/package.json b/ibexa/experience/4.6/encore/package.json
@@ -21,16 +21,11 @@
     "@ckeditor/ckeditor5-widget": "^40.1.0",
     "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
-    "@svgr/webpack": "^8.1.0",
-    "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+    "@svgr/webpack": "^8.1.0"
   },
   "dependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/experience/5.0/encore/ibexa.tsconfig.custom.json b/ibexa/experience/5.0/encore/ibexa.tsconfig.custom.json
@@ -0,0 +1,7 @@
+{
+    "extends": "@ibexa/ts-config",
+    "compilerOptions": {
+        "typeRoots": ["node_modules/@types"]
+    },
+    "exclude": ["node_modules", "vendor/**/*", "!vendor/ibexa/**/*"]
+}
diff --git a/ibexa/experience/5.0/encore/ibexa.webpack.config.js b/ibexa/experience/5.0/encore/ibexa.webpack.config.js
@@ -16,7 +16,9 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
+        .enableTypeScriptLoader((tsConfig) => {
+            tsConfig.configFile = path.resolve(__dirname, 'ibexa.tsconfig.custom.json');
+        })
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/experience/5.0/encore/package.json b/ibexa/experience/5.0/encore/package.json
@@ -23,14 +23,14 @@
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
     "@svgr/webpack": "^8.1.0",
     "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
+    "typescript": "^5.6.3",
+    "@ibexa/ts-config": "https://github.com/ibexa/ts-config-ibexa"
   },
   "dependencies": {
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react-dom": "^18.3.1"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/headless/4.6/encore/ibexa.webpack.config.js b/ibexa/headless/4.6/encore/ibexa.webpack.config.js
@@ -16,7 +16,6 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/headless/4.6/encore/package.json b/ibexa/headless/4.6/encore/package.json
@@ -21,16 +21,7 @@
     "@ckeditor/ckeditor5-widget": "^40.1.0",
     "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
-    "@svgr/webpack": "^8.1.0",
-    "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
-  },
-  "dependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "@svgr/webpack": "^8.1.0"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/headless/5.0/encore/ibexa.tsconfig.custom.json b/ibexa/headless/5.0/encore/ibexa.tsconfig.custom.json
@@ -0,0 +1,7 @@
+{
+    "extends": "@ibexa/ts-config",
+    "compilerOptions": {
+        "typeRoots": ["node_modules/@types"]
+    },
+    "exclude": ["node_modules", "vendor/**/*", "!vendor/ibexa/**/*"]
+}
diff --git a/ibexa/headless/5.0/encore/ibexa.webpack.config.js b/ibexa/headless/5.0/encore/ibexa.webpack.config.js
@@ -16,7 +16,9 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
+        .enableTypeScriptLoader((tsConfig) => {
+            tsConfig.configFile = path.resolve(__dirname, 'ibexa.tsconfig.custom.json');
+        })
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/headless/5.0/encore/package.json b/ibexa/headless/5.0/encore/package.json
@@ -23,14 +23,14 @@
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
     "@svgr/webpack": "^8.1.0",
     "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
+    "typescript": "^5.6.3",
+    "@ibexa/ts-config": "https://github.com/ibexa/ts-config-ibexa"
   },
   "dependencies": {
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react-dom": "^18.3.1"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/oss/4.6/encore/ibexa.webpack.config.js b/ibexa/oss/4.6/encore/ibexa.webpack.config.js
@@ -16,7 +16,6 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/oss/4.6/encore/package.json b/ibexa/oss/4.6/encore/package.json
@@ -20,16 +20,7 @@
     "@ckeditor/ckeditor5-widget": "^40.1.0",
     "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
-    "@svgr/webpack": "^8.1.0",
-    "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
-  },
-  "dependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "@svgr/webpack": "^8.1.0"
   },
   "license": "UNLICENSED",
   "private": true,
diff --git a/ibexa/oss/5.0/encore/ibexa.tsconfig.custom.json b/ibexa/oss/5.0/encore/ibexa.tsconfig.custom.json
@@ -0,0 +1,7 @@
+{
+    "extends": "@ibexa/ts-config",
+    "compilerOptions": {
+        "typeRoots": ["node_modules/@types"]
+    },
+    "exclude": ["node_modules", "vendor/**/*", "!vendor/ibexa/**/*"]
+}
diff --git a/ibexa/oss/5.0/encore/ibexa.webpack.config.js b/ibexa/oss/5.0/encore/ibexa.webpack.config.js
@@ -16,7 +16,9 @@ module.exports = (Encore) => {
             'prop-types': 'PropTypes',
         })
         .enableSassLoader()
-        .enableTypeScriptLoader()
+        .enableTypeScriptLoader((tsConfig) => {
+            tsConfig.configFile = path.resolve(__dirname, 'ibexa.tsconfig.custom.json');
+        })
         .enableReactPreset()
         .enableSingleRuntimeChunk();
 
diff --git a/ibexa/oss/5.0/encore/package.json b/ibexa/oss/5.0/encore/package.json
@@ -21,15 +21,15 @@
     "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
     "@ckeditor/ckeditor5-code-block": "^40.1.0",
     "@svgr/webpack": "^8.1.0",
-    "ts-loader": "^9.5.1",
-    "ts-config-ibexa": "https://github.com/ibexa/ts-config-ibexa"
+   "ts-loader": "^9.5.1",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
+    "typescript": "^5.6.3",
+    "@ibexa/ts-config": "https://github.com/ibexa/ts-config-ibexa"
   },
   "dependencies": {
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.1",
-    "typescript": "^5.6.3"
+    "react-dom": "^18.3.1"
   },
   "license": "UNLICENSED",
   "private": true,
