Merge pull request 'release/v8.3.0' (#38) from release/v8.3.0 into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/38

scripts/develop/dependence.py

@@ -190,7 +190,7 @@ def check_nodejs():
   nodejs_cur_version_major = int(nodejs_version.split('.')[0][1:])
   nodejs_cur_version_minor = int(nodejs_version.split('.')[1])
   print('Installed Node.js version: ' + nodejs_version[1:])
-  nodejs_min_version = '22'
+  nodejs_min_version = '18'
   nodejs_min_version_minor  = 0
   major_minor_min_version = nodejs_min_version.split('.')
   nodejs_min_version_major = int(major_minor_min_version[0])
@@ -214,7 +214,7 @@ def check_nodejs():
       isNeedReinstall = True
 
   if (True == isNeedReinstall):
-    print('Installed Node.js version must be 22 or higher.')
+    print('Installed Node.js version must be 18 or higher.')
     if (host_platform == 'windows'):
       dependence.append_uninstall('Node.js')
       dependence.append_install('Node.js')
@@ -950,7 +950,7 @@ def install_postgresql():
   return code
 
 def install_nodejs():
-  os.system('curl -sSL https://deb.nodesource.com/setup_22.x | sudo -E bash -')
+  os.system('curl -sSL https://deb.nodesource.com/setup_18.x | sudo -E bash -')
   base.print_info("Install node.js...")
   install_command = 'yes | sudo apt install nodejs'
   print(install_command)
@@ -959,7 +959,7 @@ def install_nodejs():
 downloads_list = {
   'Windows': {
     'Git': 'https://github.com/git-for-windows/git/releases/download/v2.29.0.windows.1/Git-2.29.0-64-bit.exe',
-    'Node.js': 'https://nodejs.org/dist/v22.13.1/node-v22.13.1-x64.msi',
+    'Node.js': 'https://nodejs.org/dist/v18.17.1/node-v18.17.1-x64.msi',
     'Java': 'https://aka.ms/download-jdk/microsoft-jdk-11.0.18-windows-x64.msi',
     'RabbitMQ': 'https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.9/rabbitmq-server-3.8.9.exe',
     'Erlang': 'http://erlang.org/download/otp_win64_23.1.exe',

scripts/sdkjs_common/jsdoc/generate_docs_md.py

@@ -168,7 +168,7 @@ def generate_data_types_markdown(types, enumerations, classes, root='../../'):
 
 def generate_class_markdown(class_name, methods, properties, enumerations, classes):
     content = f"# {class_name}\n\nRepresents the {class_name} class.\n\n"
-    content += generate_properties_markdown(properties, enumerations, classes)
+    content += generate_properties_markdown(properties, enumerations, classes, '../')
 
     content += "## Methods\n\n"
     for method in methods:
@@ -191,7 +191,7 @@ def generate_method_markdown(method, enumerations, classes):
     
     # Syntax
     param_list = ', '.join([param['name'] for param in params]) if params else ''
-    content += f"## Syntax\n\n```javascript\nexpression.{method_name}({param_list});\n```\n\n"
+    content += f"## Syntax\n\nexpression.{method_name}({param_list});\n\n"
     if memberof:
         content += f"`expression` - A variable that represents a [{memberof}](../{memberof}.md) class.\n\n"
 
@@ -235,7 +235,7 @@ def generate_method_markdown(method, enumerations, classes):
 
     return escape_text_outside_code_blocks(content)
 
-def generate_properties_markdown(properties, enumerations, classes, root='../'):
+def generate_properties_markdown(properties, enumerations, classes, root='../../'):
     if properties is None:
         return ''
     
@@ -373,9 +373,7 @@ def generate(output_dir):
     generate_docs_json.generate(output_dir + 'tmp_json', md=True)
     for editor_name in editors:
         input_file = os.path.join(output_dir + 'tmp_json', editor_name + ".json")
-
-        shutil.rmtree(output_dir + f'/{editor_name.title()}')
-        os.makedirs(output_dir + f'/{editor_name.title()}')
+        os.makedirs(output_dir + f'/{editor_name.title()}', exist_ok=True)
 
         data = load_json(input_file)
         process_doclets(data, output_dir, editor_name.title())

scripts/sdkjs_common/jsdoc/generate_docs_plugins_md.py

@@ -168,7 +168,7 @@ def generate_data_types_markdown(types, enumerations, classes, root='../../'):
 
 def generate_class_markdown(class_name, methods, properties, enumerations, classes):
     content = f"# {class_name}\n\nRepresents the {class_name} class.\n\n"
-    content += generate_properties_markdown(properties, enumerations, classes)
+    content += generate_properties_markdown(properties, enumerations, classes, '../')
 
     content += "## Methods\n\n"
     for method in methods:
@@ -198,7 +198,7 @@ def generate_method_markdown(method, enumerations, classes):
     
     # Syntax
     param_list = ', '.join([param['name'] for param in params]) if params else ''
-    content += f"## Syntax\n\n```javascript\nexpression.{method_name}({param_list});\n```\n\n"
+    content += f"## Syntax\n\nexpression.{method_name}({param_list});\n\n"
     if memberof:
         content += f"`expression` - A variable that represents a [{memberof}](../{memberof}.md) class.\n\n"
 
@@ -256,7 +256,7 @@ def generate_method_markdown(method, enumerations, classes):
 
     return escape_text_outside_code_blocks(content)
 
-def generate_properties_markdown(properties, enumerations, classes, root='../'):
+def generate_properties_markdown(properties, enumerations, classes, root='../../'):
     if properties is None:
         return ''
     
@@ -309,9 +309,9 @@ def generate_enumeration_markdown(enumeration, enumerations, classes):
             for raw_t in enumeration['type']['names']:
                 # Attempt linking
                 if any(enum['name'] == raw_t for enum in enumerations):
-                    content += f"- [{raw_t}](../Enumeration/{raw_t}.md)\n"
+                    content += f"- [{raw_t}](../../Enumeration/{raw_t}.md)\n"
                 elif raw_t in classes:
-                    content += f"- [{raw_t}](../{raw_t}/{raw_t}.md)\n"
+                    content += f"- [{raw_t}](../../{raw_t}/{raw_t}.md)\n"
                 else:
                     content += f"- {raw_t}\n"
 
@@ -425,20 +425,15 @@ def process_doclets(data, output_dir, editor_name):
 def generate(output_dir):
     print('Generating Markdown documentation...')
     
-    if output_dir[-1] == '/':
-        output_dir = output_dir[:-1]
-    
-    generate_docs_plugins_json.generate(output_dir + '/tmp_json', md=True)
+    generate_docs_plugins_json.generate(output_dir + 'tmp_json', md=True)
     for editor_name in editors:
-        input_file = os.path.join(output_dir + '/tmp_json', editor_name + ".json")
-
-        shutil.rmtree(output_dir + f'/{editor_name.title()}', ignore_errors=True)
-        os.makedirs(output_dir + f'/{editor_name.title()}')
+        input_file = os.path.join(output_dir + 'tmp_json', editor_name + ".json")
+        os.makedirs(output_dir + f'/{editor_name.title()}', exist_ok=True)
 
         data = load_json(input_file)
         process_doclets(data, output_dir, editor_name.title())
     
-    shutil.rmtree(output_dir + '/tmp_json')
+    shutil.rmtree(output_dir + 'tmp_json')
     print('Done')
 
 if __name__ == "__main__":

tools/linux/deps.py

@@ -67,7 +67,7 @@ def install_deps():
     print("OK")
     base.cmd("sudo", ["apt-get", "-y", "install", "npm", "yarn"], True)
   base.cmd("sudo", ["npm", "install", "-g", "grunt-cli"])
-  base.cmd("sudo", ["npm", "install", "-g", "@yao-pkg/pkg"])
+  base.cmd("sudo", ["npm", "install", "-g", "pkg"])
 
   # java
   java_error = base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-11-jdk"], True)