[pve-devel] applied: Re: [PATCH v2 1/3] ship proper nodejs module 'pve-eslint'

Thomas Lamprecht t.lamprecht at proxmox.com
Mon Aug 30 13:03:47 CEST 2021


Am 8/30/21 um 12:43 PM schrieb Dominik Csapak:
> On 8/30/21 12:36, Thomas Lamprecht wrote:
>> Am 8/30/21 um 12:06 PM schrieb Dominik Csapak:
>>> On 8/30/21 11:25, Thomas Lamprecht wrote:
>>>> Am 8/30/21 um 11:17 AM schrieb Dominik Csapak:
>>>>> On 8/25/21 18:38, Thomas Lamprecht wrote:
>>>>>> On 19/07/2021 12:31, Dominik Csapak wrote:
>>>>>>> instead of concatenating the eslint module into our app.js, ship
>>>>>>> a 'pve-eslint' module that exports the built eslint module
>>>>>>>
>>>>>>> to do this, we have to leave the module type on 'umd' instead of
>>>>>>> changing to 'var' so that nodejs can properly import it.
>>>>>>>
>>>>>>> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
>>>>>>> ---
>>>>>>>     Makefile                                |  2 +-
>>>>>>
>>>>>> Does not applies here, did not really investigated yet though:
>>>>>>
>>>>>> Applying: ship proper nodejs module 'pve-eslint'
>>>>>> Using index info to reconstruct a base tree...
>>>>>> error: removal patch leaves file contents
>>>>>> error: src/Makefile: patch does not apply
>>>>>>
>>>>>>
>>>>>
>>>>> ah yes, sorry, i created the patches with '-D'
>>>>> since the second patch would not fit on the mailing list
>>>>>
>>>>> shall i send 1/3 and 3/3 again with out -D ?
>>>>> the only conflict is that src/Makefile is deleted
>>>>> (2/3 can be done separately anyway)
>>>>>
>>>>>
>>>>
>>>> I can also pull this from a staff repo if you prefer that?
>>>>
>>>
>>> ok, its the 'nodejs' branch of my staff repo for 'pve-eslint'
>>>
>>
>> great, applied, thanks!
>>
> 
> thx, please do not forget to run 'make buildupstream' and
> commiting the eslint file before bumping :)
> (or i can do it and push to my staff repo if you want)
> 

Without that it did not build anyway (I wanted to test it), but thanks
for the reminder - updated+committed build got pushed out now.




More information about the pve-devel mailing list