83712[BUGFIX] Correctly resolve relative imports in page.tsconfig
Commit message
Review
-
Code review CR +2 Done
- Benjamin Franzke +2
- Stefan Bürk +1
- Christian Kuhn +1
-
Verified V +2 Done
- Benjamin Franzke +2
- Stefan Bürk +1
- Christian Kuhn +1
- core-ci +1 CI
Issues 2
Files 16
- typo3/sysext/core/Classes/TypoScript/IncludeTree/TsConfigTreeBuilder.php3+36 −12
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-10-sub.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-10.tsconfignew+2 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-11.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-12.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-13.typoscriptnew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-14.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-20-sub.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-20.tsconfignew+2 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-21.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-22.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-23.typoscriptnew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/include-target-24.tsconfignew+1 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/TsConfig/Relative/includes.tsconfignew+6 −0
- typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_typoscript_pagetsconfigfactory/Configuration/page.tsconfig+6 −0
- typo3/sysext/core/Tests/Functional/TypoScript/PageTsConfigFactoryTest.php2+27 −0
Review log 2935
Show 810 earlier messages
-
Benjamin Franzke uploaded patch set 1 04/09/24, 06:18
-
core-ci voted on patch set 1 V -1 04/09/24, 06:24 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55589
-
Christian Kuhn commented on patch set 1 04/09/24, 07:41
-
Benjamin Franzke uploaded patch set 2
V -104/09/24, 08:24 -
Benjamin Franzke commented on patch set 2 04/09/24, 08:24
TsConfigTreeBuilder.php:301Replyack, i wanted to contact you, but I'm currently quite busy with the surfcamp stuff, so I didn't maange to do that yet.. This was found by Łukasz Uznański in the context of site sets, haven't checked page.tsconfig yet. Will check that later.. -
core-ci voted on patch set 2 V +1 04/09/24, 08:30 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55591
-
Łukasz Uznański commented on patch set 2 V +1 04/09/24, 13:14
tested, works on my instance -
Łukasz Uznański commented on patch set 2 04/09/24, 14:43
Reply
that comment is related to current main, didn't test on v12 yet -
Benjamin Franzke uploaded patch set 3
V +104/26/24, 08:47 -
Benjamin Franzke commented on patch set 3 04/26/24, 08:47
TsConfigTreeBuilder.php:301ReplyAlso needed in v12, will backport.
-
core-ci voted on patch set 3 V +1 04/26/24, 08:52 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/56760
-
Christian Kuhn commented on patch set 3 04/27/24, 13:44
PageTsConfigFactoryTest.php:43maybe extract to an own test case with a dedicated name? Just to clarify the intention is a verification that relative imports do work? -
Benjamin Franzke uploaded patch set 4
V +104/29/24, 06:57 -
Benjamin Franzke commented on patch set 4 04/29/24, 06:57
PageTsConfigFactoryTest.php:43ReplyDone -
core-ci voted on patch set 4 V +1 04/29/24, 07:03 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/56951
-
Stefan Bürk voted on patch set 4 CR +1 05/11/24, 18:00
-
Stefan Bürk voted on patch set 4 V +1 05/11/24, 18:18
-
Łukasz Uznański commented on patch set 4 05/13/24, 21:51
I can't make tsconfig autoimport from Set to work, but previous version worked for me on my older setup. Does it require anything more than placing it in `Configuration/Sets/Foo/page.tsconfig`? -
Benjamin Franzke commented on patch set 4 05/15/24, 06:35
Reply
No, that should be enough. Just make sure your set "Foo" is actually loaded. I just verified it again, works here. Which setup did you use? -
André Buchmann commented on patch set 4 05/15/24, 11:38
Should there be a second test case covering the include from within a set?Reply
Tested both ways successfully: Configuration/page.tsconfig and Configuration/Set/MySet/page.tsconfig -
Stefan Bürk voted on patch set 4 CR 0 V 0 05/15/24, 14:14
-
Christian Kuhn commented on patch set 4 05/26/24, 07:46
Reply
Done -
Christian Kuhn commented on patch set 4 05/26/24, 07:48
Reply
i played around on this and changed the setup to test another permutation. -
Christian Kuhn uploaded patch set 5
V +105/26/24, 07:49 -
Christian Kuhn commented on patch set 5 CR +1 V +1 05/26/24, 07:53
tried to make the test setup a bit more clear and include further variants. -
core-ci voted on patch set 5 V -1 05/26/24, 07:54 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/58254
-
Christian Kuhn commented on patch set 5 CR -1 05/26/24, 08:23
on it again. -
Christian Kuhn uploaded patch set 6
CR -1V +105/26/24, 08:57 -
Christian Kuhn commented on patch set 6 CR +1 V +1 05/26/24, 08:59
changed test set again to verify @imports with path traversal are not loaded. -
core-ci voted on patch set 6 V +1 05/26/24, 09:04 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/58255
-
Stefan Bürk voted on patch set 6 CR +1 05/27/24, 12:56
-
Stefan Bürk voted on patch set 6 V +1 05/27/24, 13:26
-
Benjamin Franzke voted on patch set 6 CR +2 V +2 05/27/24, 13:51
-
Benjamin Franzke commented on patch set 6 05/27/24, 13:51
Reply
Thanks a lot, I've also added them to the v12 backport ❤️ -
Benjamin Franzke merged patch set 7 05/27/24, 13:51
TsConfigTreeBuilder.php:301